From f3a6413ee42cf8319824aab90b19dfd985f727d3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 22 Jul 2025 13:41:20 +0100 Subject: [PATCH] Revert "systemd: add libblkid and libfdisk PACKAGECONFIG options" The fdisk option is not enabled by default when it should be as that was the existing behaviour. Neither of the RDEPENDS are needed, as systemd doesn't call the tools directly and the library dependencies will be generated automatically. This reverts commit 4ec67113e1e7e1ecea9cde33ef4d3962dad5f2ad. (From OE-Core rev: fac80672339bce66dc551c659932aa728478ffaf) Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_257.6.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_257.6.bb b/meta/recipes-core/systemd/systemd_257.6.bb index a104e2179a..9092d02c51 100644 --- a/meta/recipes-core/systemd/systemd_257.6.bb +++ b/meta/recipes-core/systemd/systemd_257.6.bb @@ -75,7 +75,6 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', 'link-udev-shared', d)} \ backlight \ binfmt \ - blkid \ gshadow \ hibernate \ hostnamed \ @@ -136,7 +135,6 @@ 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" @@ -152,7 +150,6 @@ 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"