From patchwork Sun Nov 10 14:10:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 52261 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68D46D6409C for ; Sun, 10 Nov 2024 14:08:23 +0000 (UTC) Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by mx.groups.io with SMTP id smtpd.web10.36579.1731247696216748277 for ; Sun, 10 Nov 2024 06:08:16 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.20, mailfrom: f_l_k@t-online.de) Received: from fwd73.aul.t-online.de (fwd73.aul.t-online.de [10.223.144.99]) by mailout08.t-online.de (Postfix) with SMTP id AF01022E for ; Sun, 10 Nov 2024 15:08:11 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.154.174.121]) by fwd73.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1tA8br-0kFW0P0; Sun, 10 Nov 2024 15:08:11 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Subject: [oe-core][PATCHv2] systemd: add PACKAGECONFIG for sysupdate feature Date: Sun, 10 Nov 2024 15:10:28 +0100 Message-ID: <20241110141028.2859552-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1731247691-4CFF74D7-F7FBBFD5/0/0 CLEAN NORMAL X-TOI-MSGID: 2b1272ca-dcb7-44f5-847e-d62e410725da List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 10 Nov 2024 14:08:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206920 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 --- 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() {