Apply more chanegs from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 6 insertions, 2 deletions

diff --git a/openembedded/packages/udev/udev-084/init b/openembedded/packages/udev/udev-084/init
index d3983df6bc..3138e5554c 100644
--- a/openembedded/packages/udev/udev-084/init
+++ b/openembedded/packages/udev/udev-084/init
@@ -56,7 +56,7 @@ mount_tmpfs() {
 # I hate this hack.  -- Md
 make_extra_nodes() {
   if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
-    cp --preserve=all --recursive --update /lib/udev/devices/* /dev/
+    cp -a /lib/udev/devices/* /dev/
   fi
 
   [ -e /etc/udev/links.conf ] || return 0
diff --git a/openembedded/packages/udev/udev-084/udev.rules b/openembedded/packages/udev/udev-084/udev.rules
index b3a19cefc8..6308cb0918 100644
--- a/openembedded/packages/udev/udev-084/udev.rules
+++ b/openembedded/packages/udev/udev-084/udev.rules
@@ -95,4 +95,4 @@ KERNEL=="device-mapper",	NAME="mapper/control"
 KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
 
 # Firmware Helper
-ACTION=="add", SUBSYSTEM=="firmware", RUN+="/usr/lib/udev/firmware_helper"
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
diff --git a/openembedded/packages/udev/udev_084.bb b/openembedded/packages/udev/udev_084.bb
index b5bf464250..904f73783c 100644
--- a/openembedded/packages/udev/udev_084.bb
+++ b/openembedded/packages/udev/udev_084.bb
@@ -1,3 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
@@ -15,7 +17,9 @@ INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ."
 
 PR = "r1"
 
+FILES_${PN} += "${base_libdir}"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev"
 
 do_install () {
         install -d ${D}${usrsbindir} \