From: Denys Dmytriyenko <[email protected]> This was using a SysVinit initscript that was also called from a systemd unit file when systemd-compat-units were enabled. With systemd and SysVinit now fully separated in Arago, adjust initscripts accordingly to work for both init managers.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../arago-gpl-notice/arago-gpl-notice.bb | 16 +++++++++++----- .../arago-gpl-notice/gplv3-notice.service | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb index 33aa31f7..6cb428a5 100644 --- a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb +++ b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb @@ -15,11 +15,17 @@ SRC_URI = " file://print-gplv3-packages.sh \ file://gplv3-notice.service" do_install(){ - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/print-gplv3-packages.sh ${D}${sysconfdir}/init.d/gplv3-notice - - install -d ${D}${systemd_system_unitdir} - install -m0644 ${WORKDIR}/gplv3-notice.service ${D}${systemd_system_unitdir} + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/print-gplv3-packages.sh ${D}${sysconfdir}/init.d/gplv3-notice + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${bindir} + install -d ${D}${systemd_system_unitdir} + install -m 0755 ${S}/print-gplv3-packages.sh ${D}${bindir}/gplv3-notice + install -m 0644 ${WORKDIR}/gplv3-notice.service ${D}${systemd_system_unitdir} + fi } SYSTEMD_SERVICE:${PN} = "gplv3-notice.service" diff --git a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice/gplv3-notice.service b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice/gplv3-notice.service index 50cb8398..13aaf814 100644 --- a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice/gplv3-notice.service +++ b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice/gplv3-notice.service @@ -3,8 +3,8 @@ Description=Print notice about GPLv3 packages [Service] Type=oneshot -ExecStart=/etc/init.d/gplv3-notice -WorkingDirectory=/etc/init.d +ExecStart=/usr/bin/gplv3-notice +WorkingDirectory=/usr/bin StandardOutput=tty [Install] -- 2.35.3 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15028): https://lists.yoctoproject.org/g/meta-arago/message/15028 Mute This Topic: https://lists.yoctoproject.org/mt/102924715/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/leave/10763299/21656/89520264/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
