summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-06-16 16:59:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-29 14:46:55 +0100
commit69aac1a91f8694fb403a8331d69ea350044693fa (patch)
tree19f334ba6fb64215ae4aff6fe057d3e002796af3
parent35d84744e94bdf8e58eb0ffe578390f6f5d76304 (diff)
downloadpoky-69aac1a91f8694fb403a8331d69ea350044693fa.tar.gz
initscript: Change some order of init scripts
Move udev script to execute ealier since module autoload needs it to create device nodes. Also move sysfs before udev which has dependency on it. (From OE-Core rev: fe7cef6febdb938b535259b09690192b17074314) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb6
-rw-r--r--meta/recipes-core/udev/udev-new.inc2
-rw-r--r--meta/recipes-core/udev/udev_164.bb2
-rw-r--r--meta/recipes-kernel/modutils/modutils-initscripts.bb4
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 48b65b9000..9e535af3bc 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ SECTION = "base"
4PRIORITY = "required" 4PRIORITY = "required"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
7PR = "r126" 7PR = "r127"
8 8
9INHIBIT_DEFAULT_DEPS = "1" 9INHIBIT_DEFAULT_DEPS = "1"
10 10
@@ -119,8 +119,8 @@ do_install () {
119 ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh 119 ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
120# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom 120# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom
121# ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh 121# ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh
122 # udev will run at S04 if installed 122 ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S02sysfs.sh
123 ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs.sh 123 # udev will run at S03 if installed
124 ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh 124 ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
125 ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh 125 ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh
126 if [ "${TARGET_ARCH}" = "arm" ]; then 126 if [ "${TARGET_ARCH}" = "arm" ]; then
diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
index 1b94f1bc9b..4c4451f14b 100644
--- a/meta/recipes-core/udev/udev-new.inc
+++ b/meta/recipes-core/udev/udev-new.inc
@@ -40,7 +40,7 @@ PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
40 40
41INITSCRIPT_PACKAGES = "udev udev-cache" 41INITSCRIPT_PACKAGES = "udev udev-cache"
42INITSCRIPT_NAME_udev = "udev" 42INITSCRIPT_NAME_udev = "udev"
43INITSCRIPT_PARAMS_udev = "start 04 S ." 43INITSCRIPT_PARAMS_udev = "start 03 S ."
44INITSCRIPT_NAME_udev-cache = "udev-cache" 44INITSCRIPT_NAME_udev-cache = "udev-cache"
45INITSCRIPT_PARAMS_udev-cache = "start 36 S ." 45INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
46 46
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 76fd907ef7..567e62e3ff 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
1include udev-new.inc 1include udev-new.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f" 5SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
6SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c" 6SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb b/meta/recipes-kernel/modutils/modutils-initscripts.bb
index 5ae34b4df8..89d38cff45 100644
--- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
@@ -4,10 +4,10 @@ LICENSE = "PD"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
5SRC_URI = "file://modutils.sh \ 5SRC_URI = "file://modutils.sh \
6 file://PD.patch" 6 file://PD.patch"
7PR = "r5" 7PR = "r6"
8 8
9INITSCRIPT_NAME = "modutils.sh" 9INITSCRIPT_NAME = "modutils.sh"
10INITSCRIPT_PARAMS = "start 2 S ." 10INITSCRIPT_PARAMS = "start 4 S ."
11 11
12inherit update-rc.d 12inherit update-rc.d
13 13