diff mbox series

[wrynose,v2,04/10] systemd: move systemd-systemctl-native PACKAGE_WRITE_DEPS to systemd.bb

Message ID 20261105110930.52643-5-jaipaul.cheernam@est.tech
State New
Headers show
Series [wrynose] systemd: Upgrade 259.5 -> 259.10 | expand

Commit Message

Jaipaul Cheernam Nov. 5, 2026, 11:09 a.m. UTC 
From: Ross Burton <ross.burton@arm.com>

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

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a96f87266d63fb5ae2aca6628c35572f83c68983)
Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
 meta/classes-recipe/systemd.bbclass        | 1 -
 meta/recipes-core/systemd/systemd_259.5.bb | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/systemd.bbclass b/meta/classes-recipe/systemd.bbclass
index 26eaaf1922..5d8e6086b2 100644
--- a/meta/classes-recipe/systemd.bbclass
+++ b/meta/classes-recipe/systemd.bbclass
@@ -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")
 }
 
diff --git a/meta/recipes-core/systemd/systemd_259.5.bb b/meta/recipes-core/systemd/systemd_259.5.bb
index e924884bf9..848e12e8b0 100644
--- a/meta/recipes-core/systemd/systemd_259.5.bb
+++ b/meta/recipes-core/systemd/systemd_259.5.bb
@@ -22,6 +22,10 @@  REQUIRED_DISTRO_FEATURES += "systemd"
 # this and hence we can no longer support it
 CONFLICT_DISTRO_FEATURES += "sysvinit"
 
+# Ensure that the native tools are available when we're building a rootfs with systemd in,
+# so that systemctl can be used in postinst scripts
+PACKAGE_WRITE_DEPS += "systemd-systemctl-native"
+
 SRC_URI += " \
            file://touchscreen.rules \
            file://00-create-volatile.conf \