diff mbox series

[master/kirkstone,2/2] arago-gpl-notice: unbreak initscript

Message ID 20231201204427.19192-2-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/kirkstone,1/2] bt-enable: unbreak initscript | expand

Commit Message

Denys Dmytriyenko Dec. 1, 2023, 8:44 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

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 <denys@konsulko.com>
---
 .../arago-gpl-notice/arago-gpl-notice.bb         | 16 +++++++++++-----
 .../arago-gpl-notice/gplv3-notice.service        |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)
diff mbox series

Patch

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]