From patchwork Fri Jul 10 12:54:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 92177 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 8DA8CC44501 for ; Fri, 10 Jul 2026 12:54:39 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11844.1783688071968742179 for ; Fri, 10 Jul 2026 05:54:32 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=eqphurId; 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 21A03169C for ; Fri, 10 Jul 2026 05:54:27 -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 122753F85F for ; Fri, 10 Jul 2026 05:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783688071; bh=xRXWt5sBZyUuGe9U87IJLnYG8l40UwkH1md8/VyhzUQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=eqphurIdeYEBaUiogvqqIlG+GRek7sGGPZNxw+NXIL0fdpKmlYez+MDF/Bkc19eK7 mZW+uxkQigTku4U7xda4Gg6m5XHdsNfC1xboUrSmTzSweEfXbed0xzbTjEtLPAH01f K8oQlRx/1Qvg9dfdoPU5JyFA/u35r/6HzcsbLSTU= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/5] keymaps: remove obsolete systemd masking Date: Fri, 10 Jul 2026 13:54:23 +0100 Message-ID: <20260710125425.220975-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260710125425.220975-1-ross.burton@arm.com> References: <20260710125425.220975-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, 10 Jul 2026 12:54:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/240637 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 b7e6ef6cb1..546ebba5dc 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"