Updates against mainline OE to fix various issues and make builds work again as a couple of poky changes got lost

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

1 files changed, 2 insertions, 1 deletions

diff --git a/openembedded/packages/udev/udev.inc b/openembedded/packages/udev/udev.inc
index 9ab17e87f4..2387d07945 100644
--- a/openembedded/packages/udev/udev.inc
+++ b/openembedded/packages/udev/udev.inc
@@ -4,6 +4,7 @@ LICENSE = "GPL"
 
 SRC_URI += " \
            file://udev.rules \
+           file://devfs-udev.rules \
            file://links.conf \
            file://permissions.rules \
            file://mount.sh \
@@ -49,7 +50,7 @@ do_install () {
         install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
         install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
         if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
-                install -m 0644 ${S}/etc/udev/udev.rules.devfs ${D}${sysconfdir}/udev/rules.d/50-udev.rules
+                install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
         fi
 
         install -d ${D}${sysconfdir}/udev/scripts/