udev no longer symlinks for udevcontrol, udevsettle and udevtrigger. Modify init script to use udevadm [action]

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

2 files changed, 4 insertions, 2 deletions

diff --git a/meta/packages/udev/udev-124/init b/meta/packages/udev/udev-124/init
index 2e3019324f..0f2ffcc290 100644
--- a/meta/packages/udev/udev-124/init
+++ b/meta/packages/udev/udev-124/init
@@ -38,10 +38,10 @@ kill_udevd > "/dev/null" 2>&1
         /sbin/udevadm control env STARTUP=1
                 if [ "$not_first_boot" != "" ];then
                         /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics  --subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform
-                        (/sbin/udevsettle --timeout=3; /sbin/udevcontrol env STARTUP=)&
+                        (/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)&
                 else
                         /sbin/udevadm trigger
-                        /sbin/udevsettle
+                        /sbin/udevadm settle
                         (cd /; tar cf /etc/dev.tar /dev)
                 fi
 
diff --git a/meta/packages/udev/udev_124.bb b/meta/packages/udev/udev_124.bb
index db98c9a062..0a80af9bd0 100644
--- a/meta/packages/udev/udev_124.bb
+++ b/meta/packages/udev/udev_124.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
+PR = "r1"
+
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://noasmlinkage.patch;patch=1 \
            file://flags.patch;patch=1 \