Patchwork systemd-compat-units: run-postinsts fix script link

login
register
mail settings
Submitter Andreas Müller
Date Oct. 16, 2013, 11:27 a.m.
Message ID <1381922875-4261-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/60015/
State Accepted
Commit 7aabc9408fb382f0ae39f9932b6d9ac391528b76
Headers show

Comments

Andreas Müller - Oct. 16, 2013, 11:27 a.m.
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.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-core/systemd/systemd-compat-units.bb                 | 8 +++++++-
 .../systemd/systemd-compat-units/run-postinsts.service            | 4 ++--
 meta/recipes-devtools/opkg/opkg.inc                               | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)
Andreas Müller - Oct. 24, 2013, 7:46 a.m.
On Wed, Oct 16, 2013 at 1:27 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> 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.
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
ping - or am I the only one with nonworking postinst?

Andreas
Andreas Müller - Oct. 29, 2013, 6:42 p.m.
On Thu, Oct 24, 2013 at 9:46 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Wed, Oct 16, 2013 at 1:27 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> 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.
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ping - or am I the only one with nonworking postinst?
>
I'll do that weekly: PING

and to make it clear: commit 75a14923da1ba91eddde47f0907345c19c82d6f0
is a poky commit. So runtime postinst is broken for non-poky-boys.
Thanks for taking care

Andreas
Ross Burton - Nov. 1, 2013, noon
On 29 October 2013 18:42, Andreas Müller <schnitzeltony@googlemail.com> wrote:
> and to make it clear: commit 75a14923da1ba91eddde47f0907345c19c82d6f0
> is a poky commit. So runtime postinst is broken for non-poky-boys.
> Thanks for taking care

Remember that every commit in poky comes from oe-core, bitbake,
meta-yocto or yocto-docs:

$ git show 75a14923da1ba91eddde47f0907345c19c82d6f0
commit 75a14923da1ba91eddde47f0907345c19c82d6f0
Author: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date:   Thu Sep 5 18:04:03 2013 +0300

    run-postinsts: move script execution from S98 to S99 in rcS.d

...

    (From OE-Core rev: 882da38f226acc40c041155218549edad461b7d7)

Ross

Patch

diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
index c47c14b..6eb5ffd 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"
 do_install() {
 	install -d ${D}${systemd_unitdir}/system/basic.target.wants
 	install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
+	sed -i -e 's,@POSTINSTALL_INITPOSITION@,${POSTINSTALL_INITPOSITION},g' \
+			${WORKDIR}/run-postinsts.service
 	install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
 	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
 	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
@@ -53,4 +55,8 @@  pkg_postinst_${PN} () {
 FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
 RDPEPENDS_${PN} = "systemd"
 
-
+# Define a variable to allow distros to run configure earlier.
+# (for example, to enable loading of ethernet kernel modules before networking starts)
+# note: modifying name or default value for POSTINSTALL_INITPOSITION requires
+# changes in opkg.inc
+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 4ebc234..35cf3d3 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 @@ 
 [Unit]
 Description=Run pending postinsts
 DefaultDependencies=no
-ConditionPathExists=|/etc/rcS.d/S99run-postinsts
+ConditionPathExists=|/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
 After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
 Before=sysinit.target
 
 [Service]
-ExecStart=/etc/rcS.d/S99run-postinsts
+ExecStart=/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
 RemainAfterExit=No
 Type=oneshot
 StandardOutput=syslog
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 3d56886..78724f3 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -104,4 +104,6 @@  BBCLASSEXTEND = "native nativesdk"
 
 # Define a variable to allow distros to run configure earlier.
 # (for example, to enable loading of ethernet kernel modules before networking starts)
+# note: modifying name or default value for POSTINSTALL_INITPOSITION requires
+# changes in systemd-compat-units.bb
 POSTINSTALL_INITPOSITION ?= "98"