summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-10-16 13:27:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-30 17:33:12 +0000
commit3e629b2061b375e6bfa7feb84dded37347251009 (patch)
treee7d1d95cb47a24830fabe0ce372d428dfe49444b /meta
parentaedf3d914392df1082abdcde80880d67b34f7e77 (diff)
downloadpoky-3e629b2061b375e6bfa7feb84dded37347251009.tar.gz
systemd-compat-units: run-postinsts fix script link
in commit fe039170236080291c0220476a5809774f82ee5c Author: Muhammad Shakeel <muhammad_shakeel@mentor.com> Date: Wed Oct 2 10:55:32 2013 +0000 systemd-compat-units: Use correct run-postinsts script link OE-Core commit 75a14923da1ba91eddde47f0907345c19c82d6f0 has moved run-postinsts script execution from S98 to S99 in rcS.d. run-postinsts.service should check for this script and run it on first boot rather than S98run-postinsts, which is for opkg/dpkg. the link was corrected but the mentioned commit is not available. Instead of reverting, we use the same variable as opkg for init script ordering and drop a note in case somebody wants to change default. (From OE-Core rev: 7aabc9408fb382f0ae39f9932b6d9ac391528b76) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units.bb8
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service4
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc2
3 files changed, 11 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
index c47c14bf95..6eb5ffd985 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta/recipes-core/systemd/systemd-compat-units.bb
@@ -14,6 +14,8 @@ SRC_URI = "file://*.service"
14do_install() { 14do_install() {
15 install -d ${D}${systemd_unitdir}/system/basic.target.wants 15 install -d ${D}${systemd_unitdir}/system/basic.target.wants
16 install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ 16 install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
17 sed -i -e 's,@POSTINSTALL_INITPOSITION@,${POSTINSTALL_INITPOSITION},g' \
18 ${WORKDIR}/run-postinsts.service
17 install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system 19 install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
18 ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/ 20 ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
19 ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/ 21 ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
@@ -53,4 +55,8 @@ pkg_postinst_${PN} () {
53FILES_${PN} = "${systemd_unitdir}/system ${bindir}" 55FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
54RDPEPENDS_${PN} = "systemd" 56RDPEPENDS_${PN} = "systemd"
55 57
56 58# Define a variable to allow distros to run configure earlier.
59# (for example, to enable loading of ethernet kernel modules before networking starts)
60# note: modifying name or default value for POSTINSTALL_INITPOSITION requires
61# changes in opkg.inc
62POSTINSTALL_INITPOSITION ?= "98"
diff --git a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
index 4ebc2344cf..35cf3d32de 100644
--- a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
+++ b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
@@ -1,12 +1,12 @@
1[Unit] 1[Unit]
2Description=Run pending postinsts 2Description=Run pending postinsts
3DefaultDependencies=no 3DefaultDependencies=no
4ConditionPathExists=|/etc/rcS.d/S99run-postinsts 4ConditionPathExists=|/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
5After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount 5After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
6Before=sysinit.target 6Before=sysinit.target
7 7
8[Service] 8[Service]
9ExecStart=/etc/rcS.d/S99run-postinsts 9ExecStart=/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
10RemainAfterExit=No 10RemainAfterExit=No
11Type=oneshot 11Type=oneshot
12StandardOutput=syslog 12StandardOutput=syslog
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index ec0771635f..fb99fb5076 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -105,4 +105,6 @@ BBCLASSEXTEND = "native nativesdk"
105 105
106# Define a variable to allow distros to run configure earlier. 106# Define a variable to allow distros to run configure earlier.
107# (for example, to enable loading of ethernet kernel modules before networking starts) 107# (for example, to enable loading of ethernet kernel modules before networking starts)
108# note: modifying name or default value for POSTINSTALL_INITPOSITION requires
109# changes in systemd-compat-units.bb
108POSTINSTALL_INITPOSITION ?= "98" 110POSTINSTALL_INITPOSITION ?= "98"