diff mbox series

systemd: include sysvinit in default PACKAGECONFIG only if in DISTRO_FEATURES

Message ID 20240910150903.597409-1-rasmus.villemoes@prevas.dk
State New
Headers show
Series systemd: include sysvinit in default PACKAGECONFIG only if in DISTRO_FEATURES | expand

Commit Message

Rasmus Villemoes Sept. 10, 2024, 3:09 p.m. UTC 
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

The sysvinit PACKAGECONFIG knob enables various legacy/compatibility
code that may not be needed or even desired. If DISTRO_FEATURES
includes systemd (as it must for this recipe to build) but not
sysvinit, there is no point building and installing that legacy
support.

As most other changes, this can cause breakage, but given that
sysvinit not being in DISTRO_FEATURES requires explicit opt-out (due
to backfill), I think the risk is low. Moreover, it is generally
easier to add to than to remove from PACKAGECONFIG.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
 meta/recipes-core/systemd/systemd_256.5.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/systemd/systemd_256.5.bb b/meta/recipes-core/systemd/systemd_256.5.bb
index db053b4542..85c7fc743d 100644
--- a/meta/recipes-core/systemd/systemd_256.5.bb
+++ b/meta/recipes-core/systemd/systemd_256.5.bb
@@ -73,7 +73,7 @@  PACKAGECONFIG ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', 'link-udev-shared', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', 'link-udev-shared', d)} \
     backlight \
     binfmt \
     gshadow \
@@ -95,7 +95,6 @@  PACKAGECONFIG ??= " \
     resolved \
     set-time-epoch \
     sysusers \
-    sysvinit \
     timedated \
     timesyncd \
     userdb \