udev: repair stupidity introduced by last patch

diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 00abd36..0b51df4 100644 (file)
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -12,6 +12,7 @@ inherit update-rc.d
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 04 S ."
 
+export CROSS = "${TARGET_PREFIX}"
 export HOSTCC = "${BUILD_CC}"
 export udevdir ?= "/dev"
 export usrbindir := "${bindir}"
@@ -21,7 +22,7 @@ LD = "${CC}"
 bindir = "/bin"
 sbindir = "/sbin"
 
-UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/"
+UDEV_EXTRAS = "<override me>"
 FILES_${PN} += "${usrbindir} ${usrsbindir}"
 EXTRA_OEMAKE = "-e \
                'EXTRAS=${UDEV_EXTRAS}' \
@@ -39,4 +40,3 @@ do_install () {
        install -d ${D}${sysconfdir}/udev/rules.d/
        install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/
 }
-

diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb
index 539e7ae..bab87e6 100644 (file)
--- a/packages/udev/udev_058.bb
+++ b/packages/udev/udev_058.bb
@@ -7,4 +7,4 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 include udev.inc
 
 PR = "r3"
-# CFLAGS += -I${STAGING_INCDIR}/sysfs
+UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/"

diff --git a/packages/udev/udev_063.bb b/packages/udev/udev_063.bb
index 083a6bf..83e237e 100644 (file)
--- a/packages/udev/udev_063.bb
+++ b/packages/udev/udev_063.bb
@@ -7,7 +7,8 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r1"
+PR = "r2"
+UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
 #FIXME UDEV MIGRATION PLAN:
 #FIXME      a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old)
@@ -15,8 +16,6 @@ PR = "r1"
 #FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append()
 #FIXME      d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules
 
-EXTRA_OEMAKE = "EXTRAS=extras/run_directory/"
-
 do_install_append() {
        install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/
        echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules