[oe-commits] Tom Rini : udev 141/151/154: Move rm'ing /tmp/uname, etc, to udev-cache
git version control
git at git.openembedded.org
Fri Aug 20 23:00:45 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4bbc0df43bc27e51aa5f4410693389003aec9ae1
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4bbc0df43bc27e51aa5f4410693389003aec9ae1
Author: Tom Rini <tom_rini at mentor.com>
Date: Fri Aug 20 15:59:09 2010 -0700
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 at mentor.com>
---
recipes/udev/udev-141/cache | 20 ++++++++++++--------
recipes/udev/udev-141/init | 5 -----
recipes/udev/udev-151/cache | 20 ++++++++++++--------
recipes/udev/udev-151/init | 5 -----
recipes/udev/udev-154/cache | 20 ++++++++++++--------
recipes/udev/udev-154/init | 5 -----
recipes/udev/udev_141.bb | 2 +-
recipes/udev/udev_151.bb | 2 +-
recipes/udev/udev_154.bb | 2 +-
9 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/recipes/udev/udev-141/cache b/recipes/udev/udev-141/cache
index 4db1466..c0d400b 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 efd9c23..9f7b2c4 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 4db1466..c0d400b 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 c282372..4dcb241 100644
--- a/recipes/udev/udev-151/init
+++ b/recipes/udev/udev-151/init
@@ -65,11 +65,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=8; /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-154/cache b/recipes/udev/udev-154/cache
index 4db1466..c0d400b 100644
--- a/recipes/udev/udev-154/cache
+++ b/recipes/udev/udev-154/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-154/init b/recipes/udev/udev-154/init
index fea2ca6..e9ecf97 100644
--- a/recipes/udev/udev-154/init
+++ b/recipes/udev/udev-154/init
@@ -65,11 +65,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_141.bb b/recipes/udev/udev_141.bb
index 3ef9f7d..798590c 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
require udev.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI += "file://mount.blacklist \
file://run.rules \
diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index 8760946..038fec7 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 = "r14"
+PR = "r15"
# Untested
DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/udev/udev_154.bb b/recipes/udev/udev_154.bb
index a02a369..6698566 100644
--- a/recipes/udev/udev_154.bb
+++ b/recipes/udev/udev_154.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 = "r1"
+PR = "r2"
# Untested
DEFAULT_PREFERENCE = "-1"
More information about the Openembedded-commits
mailing list