Skip to contentSkip to conversation

systemd: move systemd-systemctl-native PACKAGE_WRITE_DEPS to systemd.bb

PATCH Superseded Ross Burton 1 participant 5 messages Jul 10

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 systemd: move systemd-systemctl-native PACKAGE_WRITE_DEPS to systemd.bb

PACKAGE_WRITE_DEPS[1] is used to define package dependencies that are needed at rootfs time, for example when a postinst can use a native tool.

We allow distros to build recipes that support both systemd and sysv at the same time, and the post-install script generated by systemd.bbclass will use systemctl (via systemd-systemctl-native) at rootfs time to install the units and thus generate the required symlinks.

Presently the dependency on systemctl-native is added to recipes via systemd.bbclass but this results in all recipes that inherit that class having the dependencies. This is actually suboptimal: at rootfs time the key requirement is to install the units if and only if systemd is being used.

We can move the PACKAGE_WRITE_DEPS dependency on systemd-systemctl-native from each recipe (via the class) to systemd itself so units are installed if systemd is present, and not otherwise.

This means recipes don't depend on systemd-systemctl-native (which has non-trivial build dependencies itself), and the units are not installed in non-systemd deployments.

[1] https://docs.yoctoproject.org/ref-manual/variables.html#term-PACKAGE_WRITE_DEPS

---
 meta/classes-recipe/systemd.bbclass        | 1 -
 meta/recipes-core/systemd/systemd_259.5.bb | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
meta/classes-recipe/systemd.bbclass +0 -1
index 26eaaf1922..5d8e6086b2 100644
@@ -22,7 +22,6 @@ python __anonymous() {
     # redundant init files.
     if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
         d.appendVar("DEPENDS", " systemd-systemctl-native")
-        d.appendVar("PACKAGE_WRITE_DEPS", " systemd-systemctl-native")
         d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
 }
 
meta/recipes-core/systemd/systemd_259.5.bb +2 -0
index f3ec0edae7..594a716812 100644
@@ -22,6 +22,8 @@ REQUIRED_DISTRO_FEATURES += "systemd"
 # this and hence we can no longer support it
 CONFLICT_DISTRO_FEATURES += "sysvinit"
 
+PACKAGE_WRITE_DEPS += "systemd-systemctl-native"
+
 SRC_URI += " \
            file://touchscreen.rules \
            file://00-create-volatile.conf \
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/5 classes/systemd: remove obsolete DEPENDS

Recipes that use systemd don't need systemctl at build time, so this dependency can be removed.

It was added in [1] but no rationale was given or is obvious.

[1] oe-core e9444649f4 ("systemd: Restore mask and preset targets, fix instance creation")

---
 meta/classes-recipe/systemd.bbclass | 1 -
 1 file changed, 1 deletion(-)
meta/classes-recipe/systemd.bbclass +0 -1
index 5d8e6086b2..df464baddd 100644
@@ -21,7 +21,6 @@ python __anonymous() {
     # Inhibit update-rcd from doing any work so that systemd images don't have
     # redundant init files.
     if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
-        d.appendVar("DEPENDS", " systemd-systemctl-native")
         d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
 }
 
Signature · 1 line
2.43.0
#2 lore raw

PATCH 3/5 keymaps: remove obsolete systemd masking

In reply to Ross Burton

systemd no longer has sysvinit compatibility[1], so it won't try and run the init script in this recipe that is also implemented by systemd.

Remove the explicit systemd unit masking, effectively reverting [2].

[1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility")
[2] oe-core 8cfba07e24 ("keymaps: mask keymap when necessary")

---
 meta/recipes-bsp/keymaps/keymaps_1.0.bb | 17 -----------------
 1 file changed, 17 deletions(-)
meta/recipes-bsp/keymaps/keymaps_1.0.bb +0 -17
index b7e6ef6cb1..546ebba5dc 100644
@@ -11,13 +11,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
-# manually to avoid unnecessary postinst/preinst generated.
-python __anonymous() {
-    if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-        d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
-}
-
 inherit update-rc.d
 
 SRC_URI = "file://keymap.sh"
@@ -36,14 +29,4 @@ do_install () {
     fi
 }
 
-PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}"
-pkg_postinst:${PN} () {
-	if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then
-		if [ -n "$D" ]; then
-			OPTS="--root=$D"
-		fi
-		systemctl $OPTS mask keymap.service
-	fi
-}
-
 ALLOW_EMPTY:${PN} = "1"
Signature · 1 line
2.43.0
#3 lore raw

PATCH 4/5 initscripts: remove obsolete systemd masking

In reply to Ross Burton

systemd no longer has sysvinit compatibility[1], so it won't try and run the init script in this recipe that is also implemented by systemd.

Remove the explicit systemd unit masking, effectively reverting [2].

[1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility")
[2] oe-core 844f897710 ("initscripts: mask initscripts from systemd")

---
 .../initscripts/initscripts_1.0.bb            | 26 -------------------
 1 file changed, 26 deletions(-)
meta/recipes-core/initscripts/initscripts_1.0.bb +0 -26
index 23411b6a71..ae386a6281 100644
@@ -41,7 +41,6 @@ S = "${UNPACKDIR}"
 KERNEL_VERSION = ""
 
 DEPENDS:append = " update-rc.d-native"
-PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
 
 PACKAGES =+ "${PN}-functions ${PN}-sushell"
 RDEPENDS:${PN} = "initd-functions \
@@ -154,32 +153,7 @@ do_install () {
 	update-rc.d -r ${D} dmesg.sh start 38 S .
 }
 
-MASKED_SCRIPTS = " \
-  banner \
-  bootmisc \
-  checkfs \
-  checkroot \
-  devpts \
-  dmesg \
-  hostname \
-  mountall \
-  mountnfs \
-  populate-volatile \
-  read-only-rootfs-hook \
-  rmnologin \
-  sysfs \
-  urandom"
-
 pkg_postinst:${PN} () {
-	if type systemctl >/dev/null 2>/dev/null; then
-		if [ -n "$D" ]; then
-			OPTS="--root=$D"
-		fi
-		for SERVICE in ${MASKED_SCRIPTS}; do
-			systemctl $OPTS mask $SERVICE.service
-		done
-	fi
-
     # Delete any old volatile cache script, as directories may have moved
     if [ -z "$D" ]; then
         rm -f "/etc/volatile.cache"
Signature · 1 line
2.43.0
#4 lore raw

PATCH 5/5 modutils-initscripts: remove obsolete systemd masking

In reply to Ross Burton

systemd no longer has sysvinit compatibility[1], so it won't try and run the init script in this recipe that is also implemented by systemd.

Remove the explicit systemd unit masking, effectively reverting [2].

[1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility")
[2] oe-core 8fc304a59b ("modutils-initscripts: mask modutils in case of systemd")

---
 .../modutils-initscripts/modutils-initscripts.bb       | 10 ----------
 1 file changed, 10 deletions(-)
meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +0 -10
index fb7b09393a..89ef8bd600 100644
@@ -18,13 +18,3 @@ do_install () {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${S}/modutils.sh ${D}${sysconfdir}/init.d/
 }
-
-PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
-pkg_postinst:${PN} () {
-	if type systemctl >/dev/null 2>/dev/null; then
-		if [ -n "$D" ]; then
-			OPTS="--root=$D"
-		fi
-		systemctl $OPTS mask modutils.service
-	fi
-}
Signature · 1 line
2.43.0