diff options
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units.bb | 8 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 2 |
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" | |||
14 | do_install() { | 14 | do_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} () { | |||
53 | FILES_${PN} = "${systemd_unitdir}/system ${bindir}" | 55 | FILES_${PN} = "${systemd_unitdir}/system ${bindir}" |
54 | RDPEPENDS_${PN} = "systemd" | 56 | RDPEPENDS_${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 | ||
62 | POSTINSTALL_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] |
2 | Description=Run pending postinsts | 2 | Description=Run pending postinsts |
3 | DefaultDependencies=no | 3 | DefaultDependencies=no |
4 | ConditionPathExists=|/etc/rcS.d/S99run-postinsts | 4 | ConditionPathExists=|/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts |
5 | After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount | 5 | After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount |
6 | Before=sysinit.target | 6 | Before=sysinit.target |
7 | 7 | ||
8 | [Service] | 8 | [Service] |
9 | ExecStart=/etc/rcS.d/S99run-postinsts | 9 | ExecStart=/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts |
10 | RemainAfterExit=No | 10 | RemainAfterExit=No |
11 | Type=oneshot | 11 | Type=oneshot |
12 | StandardOutput=syslog | 12 | StandardOutput=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 | ||
108 | POSTINSTALL_INITPOSITION ?= "98" | 110 | POSTINSTALL_INITPOSITION ?= "98" |