v2: Do what is normally done in the recipe with packageconfigs that
depend on other packageconfigs to avoid possible issues with the order
of options
On Sun, Nov 10 2024 at 03:10:28 PM +01:00:00, Markus Volk
<f_...@t-online.de> wrote:
sysupdate links with libfdisk and depends on libblkid, libfdisk and
libopenssl
[<https://www.freedesktop.org/software/systemd/man/latest/systemd-sysupdate.html>]
Additionally add a PACKAGECONFIG for fdisk which can be activated
separately
Signed-off-by: Markus Volk <f_...@t-online.de
<mailto:f_...@t-online.de>>
---
meta/recipes-core/systemd/systemd_256.7.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_256.7.bb
b/meta/recipes-core/systemd/systemd_256.7.bb
index af810c0fcd..484c118d81 100644
--- a/meta/recipes-core/systemd/systemd_256.7.bb
+++ b/meta/recipes-core/systemd/systemd_256.7.bb
@@ -149,6 +149,7 @@ PACKAGECONFIG[default-compression-zstd] =
"-Dzstd=true -Ddefault-compression=zst
PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus"
PACKAGECONFIG[efi] = "-Defi=true -Dbootloader=true,-Defi=false
-Dbootloader=false,python3-pyelftools-native"
PACKAGECONFIG[elfutils] =
"-Delfutils=true,-Delfutils=false,elfutils,,libelf libdw"
+PACKAGECONFIG[fdisk] = "-Dfdisk=enabled,-Dfdisk=disabled,util-linux"
PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false"
PACKAGECONFIG[repart] = "-Drepart=true,-Drepart=false"
PACKAGECONFIG[homed] = "-Dhomed=true,-Dhomed=false"
@@ -208,6 +209,7 @@ PACKAGECONFIG[seccomp] =
"-Dseccomp=true,-Dseccomp=false,libseccomp"
PACKAGECONFIG[selinux] =
"-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell"
PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false"
PACKAGECONFIG[sysext] = "-Dsysext=true, -Dsysext=false"
+PACKAGECONFIG[sysupdate] = "-Dsysupdate=enabled,-Dsysupdate=disabled"
PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false"
PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d
-Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path=
-Dsysvrcnd-path=,,systemd-compat-units update-rc.d"
# When enabled use reproducible build timestamp if set as time epoch,
@@ -833,6 +835,9 @@ python __anonymous() {
if bb.utils.contains('PACKAGECONFIG', 'homed', True, False, d)
and not bb.utils.contains('PACKAGECONFIG', 'userdb openssl
cryptsetup', True, False, d):
bb.error("PACKAGECONFIG[homed] requires
PACKAGECONFIG[userdb], PACKAGECONFIG[openssl] and
PACKAGECONFIG[cryptsetup]")
+
+ if bb.utils.contains('PACKAGECONFIG', 'sysupdate', True, False,
d) and not bb.utils.contains('PACKAGECONFIG', 'fdisk openssl', True,
False, d):
+ bb.error("PACKAGECONFIG[sysupdate] requires
PACKAGECONFIG[fdisk] and PACKAGECONFIG[openssl]")
}
python do_warn_musl() {
--
2.47.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#206921):
https://lists.openembedded.org/g/openembedded-core/message/206921
Mute This Topic: https://lists.openembedded.org/mt/109497172/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
