diff mbox series

[1/4] systemd: add ukify packageconfig

Message ID 20261023-systemd-optimisations-v1-1-0cce103e54df@9elements.com
State New
Headers show
Series systemd: add packageconfigs for storage optimisation | expand

Commit Message

Tan Siewert Oct. 23, 2026, 10:51 a.m. UTC
systemd gates ukify via allowed(), so it is built and installed unless
explicitly disabled.

Add a packageconfig option that is enabled by default when the efi
DISTRO_FEATURE is set. It can still be removed if wanted, which may be
useful when using meta-tpm, which may include ukify implicitly.

Signed-off-by: Tan Siewert <tan.siewert@9elements.com>
---
 meta/recipes-core/systemd/systemd_262.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Paul Barker Oct. 23, 2026, 11:34 a.m. UTC | #1
On Fri, 2026-10-23 at 12:51 +0200, Tan Siewert wrote:
> systemd gates ukify via allowed(), so it is built and installed unless
> explicitly disabled.
> 
> Add a packageconfig option that is enabled by default when the efi
> DISTRO_FEATURE is set. It can still be removed if wanted, which may be
> useful when using meta-tpm, which may include ukify implicitly.
> 
> Signed-off-by: Tan Siewert <tan.siewert@9elements.com>

[snip]

> @@ -405,7 +407,7 @@ PACKAGE_BEFORE_PN += "\
>      ${PN}-networkd \
>      ${PN}-rpm-macros \
>      ${PN}-udev-rules \
> -    ${PN}-ukify \
> +    ${@bb.utils.contains('PACKAGECONFIG', 'ukify', '${PN}-ukify', '', d)} \

Does the package really need to be removed here? If it is empty then
do_package should not create it. If there are still files that would
otherwise end up in ${PN}-ukify then removing the package entry may
cause them to be silently included in a later package.

Best regards,
diff mbox series

Patch

diff --git a/meta/recipes-core/systemd/systemd_262.bb b/meta/recipes-core/systemd/systemd_262.bb
index d70053182f..24797e2e08 100644
--- a/meta/recipes-core/systemd/systemd_262.bb
+++ b/meta/recipes-core/systemd/systemd_262.bb
@@ -52,6 +52,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', 'efi', 'ukify', '', d)} \
     link-udev-shared \
     backlight \
     binfmt \
@@ -197,6 +198,7 @@  PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0"
 PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false"
 PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false"
 PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true"
+PACKAGECONFIG[ukify] = "-Dukify=enabled,-Dukify=disabled"
 PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false"
 PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false"
 PACKAGECONFIG[valgrind] = "-DVALGRIND=1,,valgrind"
@@ -405,7 +407,7 @@  PACKAGE_BEFORE_PN += "\
     ${PN}-networkd \
     ${PN}-rpm-macros \
     ${PN}-udev-rules \
-    ${PN}-ukify \
+    ${@bb.utils.contains('PACKAGECONFIG', 'ukify', '${PN}-ukify', '', d)} \
     ${PN}-vconsole-setup \
     ${PN}-zsh-completion \
     libsystemd-shared \