[oe-commits] Koen Kooi : udev 141: move creation of /etc/dev.tar to after checkroot
git version control
git at git.openembedded.org
Fri Jan 15 00:17:11 UTC 2010
Module: openembedded.git
Branch: shr/merge
Commit: 2b835db69e6b838fa8628dd85b11b4f930d5f5f9
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2b835db69e6b838fa8628dd85b11b4f930d5f5f9
Author: Koen Kooi <koen at openembedded.org>
Date: Tue Jan 12 14:48:59 2010 +0100
udev 141: move creation of /etc/dev.tar to after checkroot
* / isn't always mounted rw when udev runs, so lets create /etc/dev.tar after checkroot has run
Acked-by: Graeme Gregory <dp at xora.org.uk>
Acked-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
---
recipes/udev/udev-141/cache | 18 ++++++++++++++++++
recipes/udev/udev-141/init | 8 --------
recipes/udev/udev_141.bb | 10 ++++++++--
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/recipes/udev/udev-141/cache b/recipes/udev/udev-141/cache
new file mode 100644
index 0000000..4db1466
--- /dev/null
+++ b/recipes/udev/udev-141/cache
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+export TZ=/etc/localtime
+
+[ -f /etc/default/udev ] && . /etc/default/udev
+
+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
+
+exit 0
diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init
index a0bdf40..24ca9d8 100644
--- a/recipes/udev/udev-141/init
+++ b/recipes/udev/udev-141/init
@@ -68,14 +68,6 @@ kill_udevd > "/dev/null" 2>&1
else
/sbin/udevadm trigger
/sbin/udevadm settle
- 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
fi
exit 0
diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb
index 00ba971..df5e346 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
# Untested
DEFAULT_PREFERENCE = "-1"
-PR = "r19"
+PR = "r20"
# needed for init.d script
RDEPENDS_${PN} += "udev-utils"
@@ -24,7 +24,9 @@ SRC_URI += " \
file://network.sh \
file://local.rules \
file://default \
- file://init"
+ file://init \
+ file://cache \
+"
SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
PACKAGE_ARCH_h2200 = "h2200"
@@ -70,6 +72,7 @@ do_install () {
oe_runmake 'DESTDIR=${D}' INSTALL=install install
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+ install -m 0755 ${WORKDIR}/cache ${D}${sysconfdir}/init.d/udev-cache
install -d ${D}${sysconfdir}/default
install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
@@ -112,7 +115,10 @@ do_install_append_bug() {
install -m 0644 ${WORKDIR}/bmi_eventpipe.sh ${D}${sysconfdir}/udev/scripts/bmi_eventpipe.sh
}
+# Create the cache after checkroot has run
pkg_postinst_${PN}_append() {
+update-rc.d $OPT udev-cache start 12 S .
+
if [ -d $D/lib/udev/rules.d ] ; then
echo "$D/lib/udev/rules.d is not a symlink, fixing that"
mv $D/lib/udev/rules.d/* $D${sysconfdir}/udev/rules.d/
More information about the Openembedded-commits
mailing list