From 6b87673a9be3b2f7d491b2659efe3631d9962a54 Mon Sep 17 00:00:00 2001
From: Tom Rini <tom_rini@mentor.com>
Date: Fri, 20 Aug 2010 15:59:09 -0700
Subject: [PATCH] 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
---
 recipes/udev/udev-141/cache | 20 ++++++++++++--------
 recipes/udev/udev-141/init  |  5 -----
 recipes/udev/udev-151/cache | 20 ++++++++++++--------
 recipes/udev/udev-151/init  |  7 +------
 recipes/udev/udev_151.bb    |  2 +-
 5 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/recipes/udev/udev-141/cache b/recipes/udev/udev-141/cache
index 4db1466817..c0d400b448 100644
--- 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 66705e6767..f3a3493593 100644
--- 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 4db1466817..c0d400b448 100644
--- 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 f4dc5de2f5..b8ace53350 100644
--- 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 10eafda80c..5f44d23ef6 100644
--- 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"
-- 
2.39.5