From patchwork Fri Jul 17 15:46:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92746 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 E15E3C44515 for ; Fri, 17 Jul 2026 15:46:43 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.84.1784303203360611321 for ; Fri, 17 Jul 2026 08:46:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=h8Lu+6R0; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 917E61477 for ; Fri, 17 Jul 2026 08:46:38 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 771DB3F905 for ; Fri, 17 Jul 2026 08:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784303202; bh=cDDzC85AS9At9L+bBTTALngvoK3eR7wUBrmWXYRleRk=; h=From:To:Subject:Date:From; b=h8Lu+6R0zPGVeu0xHofjBYX5ROes/K32DMwNfGt+z44naX2Zj3XVmrgabact5qdXf 8Qe4MZ5K9wctukJ8Cn9oGPkmhotd5NkiaewcolRpEg72gyuRoevIdTiCDNK3S1CERi FNbjQ/lMUr77WV818rlnTHDpXIWU2AAr6fCq8III= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 1/7] systemd: move systemd-systemctl-native PACKAGE_WRITE_DEPS to systemd.bb Date: Fri, 17 Jul 2026 16:46:08 +0100 Message-ID: <20260717154614.3701267-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Jul 2026 15:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241208 PACKAGE_WRITE_DEPS[1] is used to define package dependencies that are needed at rootfs time, for example when a postinst can use a native tool. We allow distros to build recipes that support both systemd and sysv at the same time, and the post-install script generated by systemd.bbclass will use systemctl (via systemd-systemctl-native) at rootfs time to install the units and thus generate the required symlinks. Presently the dependency on systemctl-native is added to recipes via systemd.bbclass but this results in all recipes that inherit that class having the dependencies. This is actually suboptimal: at rootfs time the key requirement is to install the units if and only if systemd is being used. We can move the PACKAGE_WRITE_DEPS dependency on systemd-systemctl-native from each recipe (via the class) to systemd itself so units are installed if systemd is present, and not otherwise. This means recipes don't depend on systemd-systemctl-native (which has non-trivial build dependencies itself), and the units are not installed in non-systemd deployments. [1] https://docs.yoctoproject.org/ref-manual/variables.html#term-PACKAGE_WRITE_DEPS Signed-off-by: Ross Burton --- meta/classes-recipe/systemd.bbclass | 1 - meta/recipes-core/systemd/systemd_259.5.bb | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/systemd.bbclass b/meta/classes-recipe/systemd.bbclass index 26eaaf1922f..5d8e6086b26 100644 --- a/meta/classes-recipe/systemd.bbclass +++ b/meta/classes-recipe/systemd.bbclass @@ -22,7 +22,6 @@ python __anonymous() { # redundant init files. if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): d.appendVar("DEPENDS", " systemd-systemctl-native") - d.appendVar("PACKAGE_WRITE_DEPS", " systemd-systemctl-native") d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } diff --git a/meta/recipes-core/systemd/systemd_259.5.bb b/meta/recipes-core/systemd/systemd_259.5.bb index 27722f97bbb..25d9c8a6379 100644 --- a/meta/recipes-core/systemd/systemd_259.5.bb +++ b/meta/recipes-core/systemd/systemd_259.5.bb @@ -22,6 +22,10 @@ REQUIRED_DISTRO_FEATURES += "systemd" # this and hence we can no longer support it CONFLICT_DISTRO_FEATURES += "sysvinit" +# Ensure that the native tools are available when we're building a rootfs with systemd in, +# so that systemctl can be used in postinst scripts +PACKAGE_WRITE_DEPS += "systemd-systemctl-native" + SRC_URI += " \ file://touchscreen.rules \ file://00-create-volatile.conf \ From patchwork Fri Jul 17 15:46:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92749 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 5873FC44523 for ; Fri, 17 Jul 2026 15:46:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.86.1784303204053250031 for ; Fri, 17 Jul 2026 08:46:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=mAXOcwZu; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4BC0B16A3 for ; Fri, 17 Jul 2026 08:46:39 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 27F7A3F905 for ; Fri, 17 Jul 2026 08:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784303203; bh=jtvCkP9SqWIcyXEtq/0Ka7gPCWbt8NhziEODy+OYebc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mAXOcwZuLTGZm5fbHrHbTSQKqu+X1XvpA1CTgyTqqhflRPeRDMVzG+wKrEpZo53Ed hyB/crpk5VLeURsCJq0+82asL4w01JtTefsLC3t+UK3Zw9fbKQx0fU3GAmtfWbypLc Pqh02KyUZiuwCxOHQ7n2+1pzzWrDPnMF4Uhtpo6M= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 2/7] classes/systemd: remove obsolete DEPENDS Date: Fri, 17 Jul 2026 16:46:09 +0100 Message-ID: <20260717154614.3701267-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717154614.3701267-1-ross.burton@arm.com> References: <20260717154614.3701267-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Jul 2026 15:46:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241209 Recipes that use systemd don't need systemctl at build time, so this dependency can be removed. It was added in [1] but no rationale was given or is obvious. [1] oe-core e9444649f4 ("systemd: Restore mask and preset targets, fix instance creation") Signed-off-by: Ross Burton --- meta/classes-recipe/systemd.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes-recipe/systemd.bbclass b/meta/classes-recipe/systemd.bbclass index 5d8e6086b26..df464badddf 100644 --- a/meta/classes-recipe/systemd.bbclass +++ b/meta/classes-recipe/systemd.bbclass @@ -21,7 +21,6 @@ python __anonymous() { # Inhibit update-rcd from doing any work so that systemd images don't have # redundant init files. if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): - d.appendVar("DEPENDS", " systemd-systemctl-native") d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } From patchwork Fri Jul 17 15:46:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92748 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 148B8C44515 for ; Fri, 17 Jul 2026 15:46:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.89.1784303204630067597 for ; Fri, 17 Jul 2026 08:46:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=TBu8LW9h; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0078C1477 for ; Fri, 17 Jul 2026 08:46:40 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D6B0B3F905 for ; Fri, 17 Jul 2026 08:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784303204; bh=gF+blKWjVE0s4vAC/JcYSmOGSkA4qZOKT6YNmo/fpkI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=TBu8LW9hV1Um7WqwtrAz5CnUE6fcJr3AHFi7HStofLS+fXK4RcEDWUce4PG8iAACn +QunFuTnPlJyt2melA3/u+kOtP1Qv7zigpi+I2m+0Z4RcAHKX3DYoBfpeZuthCHMmx 5/W5hjn0XhhCbl2CgYZmsuURm+4G5UHrA/Ui0sQU= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 3/7] keymaps: remove obsolete systemd masking Date: Fri, 17 Jul 2026 16:46:10 +0100 Message-ID: <20260717154614.3701267-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717154614.3701267-1-ross.burton@arm.com> References: <20260717154614.3701267-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Jul 2026 15:46:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241210 systemd no longer has sysvinit compatibility[1], so it won't try and run the init script in this recipe that is also implemented by systemd. Remove the explicit systemd unit masking, effectively reverting [2]. [1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility") [2] oe-core 8cfba07e24 ("keymaps: mask keymap when necessary") Signed-off-by: Ross Burton --- meta/recipes-bsp/keymaps/keymaps_1.0.bb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index b7e6ef6cb11..546ebba5dcc 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb @@ -11,13 +11,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" -# As the recipe doesn't inherit systemd.bbclass, we need to set this variable -# manually to avoid unnecessary postinst/preinst generated. -python __anonymous() { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} - inherit update-rc.d SRC_URI = "file://keymap.sh" @@ -36,14 +29,4 @@ do_install () { fi } -PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" -pkg_postinst:${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask keymap.service - fi -} - ALLOW_EMPTY:${PN} = "1" From patchwork Fri Jul 17 15:46:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92751 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 35CE0C4451B for ; Fri, 17 Jul 2026 15:46:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.90.1784303205380927869 for ; Fri, 17 Jul 2026 08:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=AIef9Str; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A008316A3 for ; Fri, 17 Jul 2026 08:46:40 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 87B7B3F905 for ; Fri, 17 Jul 2026 08:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784303204; bh=/o/E2i/f1dhk8HncFgHdWDQ908VLpR5wbqSgeMCkfl0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=AIef9StrfYEudT4obTDRsvw1/jaVaP4qv+f6LCnG31hI0qfEXzCb/oO7nWQkFIBwj VytHg+l58Tq0tu5DBsrjvubd+VKLzhX8mVMS+evkLamO+cC3wtMPi7Uk9hQMno2cgP yqm+cRP/Vn9hp2wypmbhmRU/IAhileTd3Kwl+p+k= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 4/7] initscripts: remove obsolete systemd masking Date: Fri, 17 Jul 2026 16:46:11 +0100 Message-ID: <20260717154614.3701267-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717154614.3701267-1-ross.burton@arm.com> References: <20260717154614.3701267-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Jul 2026 15:46:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241211 systemd no longer has sysvinit compatibility[1], so it won't try and run the init script in this recipe that is also implemented by systemd. Remove the explicit systemd unit masking, effectively reverting [2]. [1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility") [2] oe-core 844f897710 ("initscripts: mask initscripts from systemd") Signed-off-by: Ross Burton --- .../initscripts/initscripts_1.0.bb | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 23411b6a714..ae386a62818 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -41,7 +41,6 @@ S = "${UNPACKDIR}" KERNEL_VERSION = "" DEPENDS:append = " update-rc.d-native" -PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions ${PN}-sushell" RDEPENDS:${PN} = "initd-functions \ @@ -154,32 +153,7 @@ do_install () { update-rc.d -r ${D} dmesg.sh start 38 S . } -MASKED_SCRIPTS = " \ - banner \ - bootmisc \ - checkfs \ - checkroot \ - devpts \ - dmesg \ - hostname \ - mountall \ - mountnfs \ - populate-volatile \ - read-only-rootfs-hook \ - rmnologin \ - sysfs \ - urandom" - pkg_postinst:${PN} () { - if type systemctl >/dev/null 2>/dev/null; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - for SERVICE in ${MASKED_SCRIPTS}; do - systemctl $OPTS mask $SERVICE.service - done - fi - # Delete any old volatile cache script, as directories may have moved if [ -z "$D" ]; then rm -f "/etc/volatile.cache" From patchwork Fri Jul 17 15:46:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92750 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 59670C44525 for ; Fri, 17 Jul 2026 15:46:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.91.1784303206080882442 for ; Fri, 17 Jul 2026 08:46:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=KhwckMiP; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5CA7C1477 for ; Fri, 17 Jul 2026 08:46:41 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 38BCB3F905 for ; Fri, 17 Jul 2026 08:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784303205; bh=vmOimp/uA51Ecg9vbQEI3J406ZdrqtnL9t5/iyi1ONQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=KhwckMiPCIUtfUZ0cMb71zs0kHTQ0VyNwXq8ayFbWKg6xODZEpV0KwBDFi7qNlFje aByr9t3CjGKJukqNNxY1hbk7P39cDH6trSkGjUhcHfXZPfVJgMtRSXPJGJ/fGVqcmc jDRRprAJ/spSU4VM2zgjXbIhXzS+lekRVE+INiHw= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 5/7] modutils-initscripts: remove obsolete systemd masking Date: Fri, 17 Jul 2026 16:46:12 +0100 Message-ID: <20260717154614.3701267-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717154614.3701267-1-ross.burton@arm.com> References: <20260717154614.3701267-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Jul 2026 15:46:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241212 systemd no longer has sysvinit compatibility[1], so it won't try and run the init script in this recipe that is also implemented by systemd. Remove the explicit systemd unit masking, effectively reverting [2]. [1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility") [2] oe-core 8fc304a59b ("modutils-initscripts: mask modutils in case of systemd") Signed-off-by: Ross Burton --- .../modutils-initscripts/modutils-initscripts.bb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index fb7b09393a3..89ef8bd600b 100644 --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb @@ -18,13 +18,3 @@ do_install () { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${S}/modutils.sh ${D}${sysconfdir}/init.d/ } - -PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst:${PN} () { - if type systemctl >/dev/null 2>/dev/null; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask modutils.service - fi -} From patchwork Fri Jul 17 15:46:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92747 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 1CFA7C4451C for ; Fri, 17 Jul 2026 15:46:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.92.1784303206895585692 for ; Fri, 17 Jul 2026 08:46:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=SXLqw7Z2; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0936D1477 for ; Fri, 17 Jul 2026 08:46:42 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E6AC83F905 for ; Fri, 17 Jul 2026 08:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784303206; bh=KjQUMlbyRQ5xItL1Pf9ZSqNe0I3lW9LqyN5Jeers8vI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=SXLqw7Z2iwllZTt1rYeg2nktLW3cMIpwhgpqZ3dAM6jQLT1DUzdAfcwSA+2luy0H7 3YbYxVQJ5lf7MgrPyrCoSKA/hZOjOYKZ2vRXVonvgs2b4NIPUpTJ04X30VzA+0iPXW x41LuRBoyW+PSpSs1HdCQCwfU2fg5VI9LRSU6YIk= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 6/7] systemd-systemctl-native: rename to systemd-tools-native Date: Fri, 17 Jul 2026 16:46:13 +0100 Message-ID: <20260717154614.3701267-6-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717154614.3701267-1-ross.burton@arm.com> References: <20260717154614.3701267-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Jul 2026 15:46:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241213 We plan on building more than just systemctl in this recipe, so rename it to -tools-. Signed-off-by: Ross Burton --- meta/conf/distro/include/maintainers.inc | 2 +- ...-systemctl-native_259.5.bb => systemd-tools-native_259.5.bb} | 2 +- meta/recipes-core/systemd/systemd_259.5.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-core/systemd/{systemd-systemctl-native_259.5.bb => systemd-tools-native_259.5.bb} (93%) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4c6307086cf..53a274c0a22 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -833,7 +833,7 @@ RECIPE_MAINTAINER:pn-systemd-bootconf = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-conf = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-machine-units = "Chen Qi " RECIPE_MAINTAINER:pn-systemd-serialgetty = "Chen Qi " -RECIPE_MAINTAINER:pn-systemd-systemctl-native = "Chen Qi " +RECIPE_MAINTAINER:pn-systemd-tools-native = "Chen Qi " RECIPE_MAINTAINER:pn-systemtap = "Victor Kamensky " RECIPE_MAINTAINER:pn-systemtap-native = "Victor Kamensky " RECIPE_MAINTAINER:pn-sysvinit = "Ross Burton " diff --git a/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb similarity index 93% rename from meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb rename to meta/recipes-core/systemd/systemd-tools-native_259.5.bb index bf9c9f47763..7212ed97507 100644 --- a/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb +++ b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb @@ -1,6 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" -SUMMARY = "Systemctl executable from systemd" +SUMMARY = "native tools from systemd" require systemd.inc diff --git a/meta/recipes-core/systemd/systemd_259.5.bb b/meta/recipes-core/systemd/systemd_259.5.bb index 25d9c8a6379..858605d9a4d 100644 --- a/meta/recipes-core/systemd/systemd_259.5.bb +++ b/meta/recipes-core/systemd/systemd_259.5.bb @@ -24,7 +24,7 @@ CONFLICT_DISTRO_FEATURES += "sysvinit" # Ensure that the native tools are available when we're building a rootfs with systemd in, # so that systemctl can be used in postinst scripts -PACKAGE_WRITE_DEPS += "systemd-systemctl-native" +PACKAGE_WRITE_DEPS += "systemd-tools-native" SRC_URI += " \ file://touchscreen.rules \ From patchwork Fri Jul 17 15:46:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92752 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 759A6C44526 for ; Fri, 17 Jul 2026 15:46:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.87.1784303207357713502 for ; Fri, 17 Jul 2026 08:46:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=oXVP/10b; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B0AF416A3 for ; Fri, 17 Jul 2026 08:46:42 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 973813F905 for ; Fri, 17 Jul 2026 08:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1784303206; bh=lYKSvYDBCBzwq0prTPVacKHiHA5N0JH7ULxEt1rKqtM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=oXVP/10bi41pMiOItEoRtfj/FC5T4q4HGk2ivcSqmfrLys0kLbukjSG/0WtePZvMf bvxs8dHHEyO/4ka4Oko0xXcqwChqJJA1iD9s3PTb0buFUShkb7Ie9Fdc8kM1A0cpTU PV9E6tpGn/TsSEYVIRb9G2hX/P7j5UnKEo3t3iYQ= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 7/7] systemd-tools-native: reduce dependencies, add comments Date: Fri, 17 Jul 2026 16:46:14 +0100 Message-ID: <20260717154614.3701267-7-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717154614.3701267-1-ross.burton@arm.com> References: <20260717154614.3701267-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Jul 2026 15:46:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241214 Pass "--auto-features disabled" to disable all optional dependencies by default, and remove build dependencies that are not needed. Reorganise the recipe to make logical sense and so that the SUMMARY isn't overwritten by systemd.inc, and add comments. Signed-off-by: Ross Burton --- .../systemd/systemd-tools-native_259.5.bb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb index 7212ed97507..d25e36ff3c0 100644 --- a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb +++ b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb @@ -1,19 +1,27 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" -SUMMARY = "native tools from systemd" - require systemd.inc -DEPENDS = "gperf-native libcap-native util-linux-native python3-jinja2-native" +SUMMARY = "native tools from systemd" + +# We don't actually need jinja to generate code, but it's checked for at configure time +DEPENDS = "gperf-native python3-jinja2-native" inherit pkgconfig meson native -MESON_TARGET = "systemctl" -MESON_INSTALL_TAGS = "systemctl" +# Disable everything that is auto-detected by default +EXTRA_OEMESON += "--auto-features disabled" + +# Link systemctl statically EXTRA_OEMESON += "-Dlink-systemctl-shared=false" + +# Ensure unused build paths are not in the binary EXTRA_OEMESON += "-Dsysvinit-path= -Dsysvrcnd-path=" # Systemctl is supposed to operate on target, but the target sysroot is not # determined at run-time, but rather set during configure # More details are here https://github.com/systemd/systemd/issues/35897#issuecomment-2665405887 EXTRA_OEMESON += "--sysconfdir ${sysconfdir_native}" + +MESON_TARGET = "systemctl" +MESON_INSTALL_TAGS = "systemctl"