From 462b0c114af1a1650b90d8d20458669d15cda3a0 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Tue, 10 Sep 2024 17:09:03 +0200 Subject: systemd: include sysvinit in default PACKAGECONFIG only if in DISTRO_FEATURES 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. (From OE-Core rev: 3668235fd60a9027608f37251c4b453ed21b3687) Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_256.5.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 \ -- cgit v1.2.3-54-g00ecf