udev 141/151/154: Move rm'ing /tmp/uname, etc, to udev-cache

Otherwise we'll remove these files before udev-cache is run.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Conflicts:

	recipes/udev/udev-151/init
	recipes/udev/udev-154/cache
	recipes/udev/udev-154/init
	recipes/udev/udev_141.bb
	recipes/udev/udev_151.bb
	recipes/udev/udev_154.bb

diff --git a/recipes/udev/udev-141/cache b/recipes/udev/udev-141/cache
index 4db1466..c0d400b 100644 (file)
--- a/recipes/udev/udev-141/cache
+++ b/recipes/udev/udev-141/cache
@@ -6,13 +6,17 @@ export TZ=/etc/localtime
 
 echo "Caching udev devnodes"
 
-                       if [ "$DEVCACHE" != "" ]; then
-                               echo -n "Populating dev cache"
-                               (cd /; tar cf $DEVCACHE dev)
-                               mv /tmp/uname /etc/udev/saved.uname
-                               mv /tmp/cmdline /etc/udev/saved.cmdline
-                               mv /tmp/atags /etc/udev/saved.atags
-                               echo
-                       fi
+if [ "$DEVCACHE" != "" ]; then
+       echo -n "Populating dev cache"
+       (cd /; tar cf $DEVCACHE dev)
+       mv /tmp/uname /etc/udev/saved.uname
+       mv /tmp/cmdline /etc/udev/saved.cmdline
+       mv /tmp/atags /etc/udev/saved.atags
+       echo
+else
+       rm -f /tmp/uname
+       rm -f /tmp/cmdline
+       rm -f /tmp/atags
+fi
 
 exit 0

diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init
index 66705e6..f3a3493 100644 (file)
--- a/recipes/udev/udev-141/init
+++ b/recipes/udev/udev-141/init
@@ -60,11 +60,6 @@ kill_udevd > "/dev/null" 2>&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/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)&
-                       if [ "$DEVCACHE" != "" ]; then
-                               rm -f /tmp/uname
-                               rm -f /tmp/cmdline
-                               rm -f /tmp/atags
-                       fi
                else
                        /sbin/udevadm trigger
                        /sbin/udevadm settle

diff --git a/recipes/udev/udev-151/cache b/recipes/udev/udev-151/cache
index 4db1466..c0d400b 100644 (file)
--- a/recipes/udev/udev-151/cache
+++ b/recipes/udev/udev-151/cache
@@ -6,13 +6,17 @@ export TZ=/etc/localtime
 
 echo "Caching udev devnodes"
 
-                       if [ "$DEVCACHE" != "" ]; then
-                               echo -n "Populating dev cache"
-                               (cd /; tar cf $DEVCACHE dev)
-                               mv /tmp/uname /etc/udev/saved.uname
-                               mv /tmp/cmdline /etc/udev/saved.cmdline
-                               mv /tmp/atags /etc/udev/saved.atags
-                               echo
-                       fi
+if [ "$DEVCACHE" != "" ]; then
+       echo -n "Populating dev cache"
+       (cd /; tar cf $DEVCACHE dev)
+       mv /tmp/uname /etc/udev/saved.uname
+       mv /tmp/cmdline /etc/udev/saved.cmdline
+       mv /tmp/atags /etc/udev/saved.atags
+       echo
+else
+       rm -f /tmp/uname
+       rm -f /tmp/cmdline
+       rm -f /tmp/atags
+fi
 
 exit 0

diff --git a/recipes/udev/udev-151/init b/recipes/udev/udev-151/init
index f4dc5de..b8ace53 100644 (file)
--- a/recipes/udev/udev-151/init
+++ b/recipes/udev/udev-151/init
@@ -64,12 +64,7 @@ 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/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)&
-                       if [ "$DEVCACHE" != "" ]; then
-                               rm -f /tmp/uname
-                               rm -f /tmp/cmdline
-                               rm -f /tmp/atags
-                       fi
+                       (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
                else
                        /sbin/udevadm trigger
                        /sbin/udevadm settle

diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index 10eafda..5f44d23 100644 (file)
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,7 +3,7 @@ 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."
 LICENSE = "GPLv2+"
 
-PR = "r20"
+PR = "r21"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"