From 4ec67113e1e7e1ecea9cde33ef4d3962dad5f2ad Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Thu, 17 Jul 2025 18:16:21 -0300 Subject: [PATCH] systemd: add libblkid and libfdisk PACKAGECONFIG options Introduce new PACKAGECONFIG options in systemd for both libblkid and libfdisk [1][2]. Set blkid as enabled by default because the bootctl command depends on it to be built. For example, images like core-image-sato-sdk rely on bootctl and have specific tests for it. Previously this worked implicitly because the upstream Meson option defaulted to auto, which enabled the dependency if libblkid was present. Now, without explicitly enabling it via PACKAGECONFIG, the feature would be disabled, which triggers testimage errors. [1] https://github.com/systemd/systemd/blob/main/README#L219 [2] https://github.com/systemd/systemd/blob/main/README#L228 Signed-off-by: Hiago De Franco Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_257.6.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_257.6.bb b/meta/recipes-core/systemd/systemd_257.6.bb index 9092d02c51..a104e2179a 100644 --- a/meta/recipes-core/systemd/systemd_257.6.bb +++ b/meta/recipes-core/systemd/systemd_257.6.bb @@ -75,6 +75,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', 'link-udev-shared', d)} \ backlight \ binfmt \ + blkid \ gshadow \ hibernate \ hostnamed \ @@ -135,6 +136,7 @@ PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit" PACKAGECONFIG[apparmor] = "-Dapparmor=enabled,-Dapparmor=disabled,apparmor" PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" +PACKAGECONFIG[blkid] = "-Dblkid=enabled,-Dblkid=disabled,util-linux,util-linux-libblkid util-linux-blkid" PACKAGECONFIG[bpf-framework] = "-Dbpf-framework=enabled,-Dbpf-framework=disabled,clang-native bpftool-native libbpf,libbpf" PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" @@ -150,6 +152,7 @@ PACKAGECONFIG[default-compression-zstd] = "-Dzstd=true -Ddefault-compression=zst PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" PACKAGECONFIG[efi] = "-Defi=true -Dbootloader=enabled,-Defi=false -Dbootloader=disabled,python3-pyelftools-native" PACKAGECONFIG[elfutils] = "-Delfutils=enabled,-Delfutils=disabled,elfutils,,libelf libdw" +PACKAGECONFIG[fdisk] = "-Dfdisk=enabled,-Dfdisk=disabled,util-linux,util-linux-libfdisk util-linux-fdisk" PACKAGECONFIG[fido] = "-Dlibfido2=enabled,-Dlibfido2=disabled,libfido2" PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false" PACKAGECONFIG[repart] = "-Drepart=enabled,-Drepart=disabled" -- 2.47.2