summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-06-09 12:04:51 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-09 12:04:51 +0100
commit1c803f3ffb9effa53dc97478bea301b2dda3e4e6 (patch)
tree17fbba6f3c8dd733429b10f1d7789e76ae56c9f2 /meta/packages
parentefc47a89990aa7fd4f57b42a1d4f21725ae99fee (diff)
downloadpoky-1c803f3ffb9effa53dc97478bea301b2dda3e4e6.tar.gz
Fix the boot process udev warning
Phenomena: there is udev warning in boot process tar: can't open '/etc/dev.tar': Read-only file system The reason is that the init script /etc/rcS.d/S04udev will try to tar the /dev as cache to speed up udev at next boot time. Unfortunately, S04udev is too early and the filesystem is not writable yet. To fix it, this patch split the cache action to another init script, and register it as /etc/rcS.d/S36, which is after the S35mountall, and the filesystem is already writable. Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/udev/files/udev-cache20
-rw-r--r--meta/packages/udev/udev-115/init1
-rw-r--r--meta/packages/udev/udev-124/init1
-rw-r--r--meta/packages/udev/udev-141/init1
-rw-r--r--meta/packages/udev/udev-145/init1
-rw-r--r--meta/packages/udev/udev.inc14
-rw-r--r--meta/packages/udev/udev_092.bb1
-rw-r--r--meta/packages/udev/udev_115.bb1
-rw-r--r--meta/packages/udev/udev_124.bb1
-rw-r--r--meta/packages/udev/udev_141.bb3
-rw-r--r--meta/packages/udev/udev_145.bb3
11 files changed, 36 insertions, 11 deletions
diff --git a/meta/packages/udev/files/udev-cache b/meta/packages/udev/files/udev-cache
new file mode 100644
index 0000000000..a4e91915bd
--- /dev/null
+++ b/meta/packages/udev/files/udev-cache
@@ -0,0 +1,20 @@
1#!/bin/sh -e
2
3### BEGIN INIT INFO
4# Provides: udev-cache
5# Required-Start: mountall
6# Required-Stop:
7# Default-Start: S
8# Default-Stop:
9# Short-Description: cache /dev to speedup the udev next boot
10### END INIT INFO
11
12[ -d /sys/class ] || exit 1
13[ -r /proc/mounts ] || exit 1
14[ -x /sbin/udevd ] || exit 1
15
16if [ ! -e /etc/dev.tar ]; then
17 (cd /; tar cf /etc/dev.tar /dev)
18fi
19
20exit 0
diff --git a/meta/packages/udev/udev-115/init b/meta/packages/udev/udev-115/init
index 5711d74b40..c882c75607 100644
--- a/meta/packages/udev/udev-115/init
+++ b/meta/packages/udev/udev-115/init
@@ -42,7 +42,6 @@ kill_udevd > "/dev/null" 2>&1
42 else 42 else
43 /sbin/udevtrigger 43 /sbin/udevtrigger
44 /sbin/udevsettle 44 /sbin/udevsettle
45 (cd /; tar cf /etc/dev.tar /dev)
46 fi 45 fi
47 46
48echo 47echo
diff --git a/meta/packages/udev/udev-124/init b/meta/packages/udev/udev-124/init
index b78a07b20f..32ab370aa9 100644
--- a/meta/packages/udev/udev-124/init
+++ b/meta/packages/udev/udev-124/init
@@ -53,7 +53,6 @@ kill_udevd > "/dev/null" 2>&1
53 else 53 else
54 /sbin/udevadm trigger 54 /sbin/udevadm trigger
55 /sbin/udevadm settle 55 /sbin/udevadm settle
56 (cd /; tar cf /etc/dev.tar /dev)
57 fi 56 fi
58 57
59echo 58echo
diff --git a/meta/packages/udev/udev-141/init b/meta/packages/udev/udev-141/init
index f38a0aa36e..eb5e50758b 100644
--- a/meta/packages/udev/udev-141/init
+++ b/meta/packages/udev/udev-141/init
@@ -53,7 +53,6 @@ kill_udevd > "/dev/null" 2>&1
53 else 53 else
54 /sbin/udevadm trigger 54 /sbin/udevadm trigger
55 /sbin/udevadm settle 55 /sbin/udevadm settle
56 (cd /; tar cf /etc/dev.tar /dev)
57 fi 56 fi
58 57
59echo 58echo
diff --git a/meta/packages/udev/udev-145/init b/meta/packages/udev/udev-145/init
index f38a0aa36e..eb5e50758b 100644
--- a/meta/packages/udev/udev-145/init
+++ b/meta/packages/udev/udev-145/init
@@ -53,7 +53,6 @@ kill_udevd > "/dev/null" 2>&1
53 else 53 else
54 /sbin/udevadm trigger 54 /sbin/udevadm trigger
55 /sbin/udevadm settle 55 /sbin/udevadm settle
56 (cd /; tar cf /etc/dev.tar /dev)
57 fi 56 fi
58 57
59echo 58echo
diff --git a/meta/packages/udev/udev.inc b/meta/packages/udev/udev.inc
index 58aa118602..0afd817b8f 100644
--- a/meta/packages/udev/udev.inc
+++ b/meta/packages/udev/udev.inc
@@ -10,20 +10,25 @@ SRC_URI += " \
10 file://mount.sh \ 10 file://mount.sh \
11 file://network.sh \ 11 file://network.sh \
12 file://local.rules \ 12 file://local.rules \
13 file://udev-cache \
13 file://init" 14 file://init"
14 15
15UDEV_DEVFS_RULES ?= "0" 16UDEV_DEVFS_RULES ?= "0"
16 17
17PACKAGES =+ "udev-utils libvolume-id" 18PACKAGES =+ "udev-utils libvolume-id udev-cache"
18FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest" 19FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
19FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" 20FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
21FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
20 22
21RRECOMMENDS_${PN} = "udev-extraconf" 23RRECOMMENDS_${PN} += "udev-extraconf udev-cache"
22 24
23inherit update-rc.d autotools pkgconfig 25inherit update-rc.d autotools pkgconfig
24 26
25INITSCRIPT_NAME = "udev" 27INITSCRIPT_PACKAGES = "udev udev-cache"
26INITSCRIPT_PARAMS = "start 04 S ." 28INITSCRIPT_NAME_udev = "udev"
29INITSCRIPT_PARAMS_udev = "start 04 S ."
30INITSCRIPT_NAME_udev-cache = "udev-cache"
31INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
27 32
28export CROSS = "${TARGET_PREFIX}" 33export CROSS = "${TARGET_PREFIX}"
29export HOSTCC = "${BUILD_CC}" 34export HOSTCC = "${BUILD_CC}"
@@ -48,6 +53,7 @@ do_install () {
48 oe_runmake 'DESTDIR=${D}' INSTALL=install install 53 oe_runmake 'DESTDIR=${D}' INSTALL=install install
49 install -d ${D}${sysconfdir}/init.d 54 install -d ${D}${sysconfdir}/init.d
50 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 55 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
56 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
51 57
52 install -d ${D}${sysconfdir}/udev/rules.d/ 58 install -d ${D}${sysconfdir}/udev/rules.d/
53 59
diff --git a/meta/packages/udev/udev_092.bb b/meta/packages/udev/udev_092.bb
index cce65d83da..c8669c3e6f 100644
--- a/meta/packages/udev/udev_092.bb
+++ b/meta/packages/udev/udev_092.bb
@@ -31,6 +31,7 @@ do_install () {
31 oe_runmake 'DESTDIR=${D}' INSTALL=install install 31 oe_runmake 'DESTDIR=${D}' INSTALL=install install
32 install -d ${D}${sysconfdir}/init.d 32 install -d ${D}${sysconfdir}/init.d
33 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 33 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
34 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
34 35
35 install -d ${D}${sysconfdir}/udev/rules.d/ 36 install -d ${D}${sysconfdir}/udev/rules.d/
36 37
diff --git a/meta/packages/udev/udev_115.bb b/meta/packages/udev/udev_115.bb
index 6d9eede57c..835d02b379 100644
--- a/meta/packages/udev/udev_115.bb
+++ b/meta/packages/udev/udev_115.bb
@@ -30,6 +30,7 @@ do_install () {
30 oe_runmake 'DESTDIR=${D}' INSTALL=install install 30 oe_runmake 'DESTDIR=${D}' INSTALL=install install
31 install -d ${D}${sysconfdir}/init.d 31 install -d ${D}${sysconfdir}/init.d
32 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 32 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
33 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
33 34
34 install -d ${D}${sysconfdir}/udev/rules.d/ 35 install -d ${D}${sysconfdir}/udev/rules.d/
35 36
diff --git a/meta/packages/udev/udev_124.bb b/meta/packages/udev/udev_124.bb
index 32f1cd2452..dad25f5253 100644
--- a/meta/packages/udev/udev_124.bb
+++ b/meta/packages/udev/udev_124.bb
@@ -31,6 +31,7 @@ do_install () {
31 oe_runmake 'DESTDIR=${D}' INSTALL=install install 31 oe_runmake 'DESTDIR=${D}' INSTALL=install install
32 install -d ${D}${sysconfdir}/init.d 32 install -d ${D}${sysconfdir}/init.d
33 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 33 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
34 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
34 35
35 install -d ${D}${sysconfdir}/udev/rules.d/ 36 install -d ${D}${sysconfdir}/udev/rules.d/
36 37
diff --git a/meta/packages/udev/udev_141.bb b/meta/packages/udev/udev_141.bb
index 25c6057910..393c9f8778 100644
--- a/meta/packages/udev/udev_141.bb
+++ b/meta/packages/udev/udev_141.bb
@@ -16,8 +16,6 @@ PACKAGE_ARCH_h2200 = "h2200"
16 16
17require udev.inc 17require udev.inc
18 18
19INITSCRIPT_PARAMS = "start 03 S ."
20
21FILES_${PN} += "${base_libdir}/udev/*" 19FILES_${PN} += "${base_libdir}/udev/*"
22FILES_${PN}-dbg += "${base_libdir}/udev/.debug" 20FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
23UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" 21UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
@@ -33,6 +31,7 @@ do_install () {
33 oe_runmake 'DESTDIR=${D}' INSTALL=install install 31 oe_runmake 'DESTDIR=${D}' INSTALL=install install
34 install -d ${D}${sysconfdir}/init.d 32 install -d ${D}${sysconfdir}/init.d
35 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 33 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
34 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
36 35
37 install -d ${D}${sysconfdir}/udev/rules.d/ 36 install -d ${D}${sysconfdir}/udev/rules.d/
38 37
diff --git a/meta/packages/udev/udev_145.bb b/meta/packages/udev/udev_145.bb
index 1d04be1af0..d6cc9909d9 100644
--- a/meta/packages/udev/udev_145.bb
+++ b/meta/packages/udev/udev_145.bb
@@ -31,6 +31,7 @@ do_install () {
31 oe_runmake 'DESTDIR=${D}' INSTALL=install install 31 oe_runmake 'DESTDIR=${D}' INSTALL=install install
32 install -d ${D}${sysconfdir}/init.d 32 install -d ${D}${sysconfdir}/init.d
33 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 33 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
34 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
34 35
35 install -d ${D}${sysconfdir}/udev/rules.d/ 36 install -d ${D}${sysconfdir}/udev/rules.d/
36 37
@@ -64,4 +65,4 @@ do_install_append_h2200() {
64 65
65do_stage () { 66do_stage () {
66 autotools_stage_all 67 autotools_stage_all
67} \ No newline at end of file 68}