From patchwork Tue Nov 17 11:51:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104619 Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.84.4]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16002.1794916293062564636 for ; Tue, 17 Nov 2026 03:51:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=cl6cAf7i; spf=pass (domain: est.tech, ip: 52.101.84.4, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Pkufb5+RRvlClCu9C4LuxfpksvGSXirwFzZe/+tyjYQr6X6TwaSirqxhBzcUylHiSE4ZdA3Ws3/4sJiU4KUK3070lToBtwxUL3WVQ5/Ti0kmh9oa4mp8Qo+4X4ZisUhDJs1fda+zIFadBGtBpfXT01nzxSIw1/MvUjVi4XJquQMf1TN7FkAA7MQ1qnoWzNz1UP7zdY48pNL/PfaPSE2hiirUxhu5tHmh0aK77eV/ZO51G6bOakoSgJLf0DFfAxe3gs7wEDrgUyFkYQfEszSpZ6cWvKJ8KIVXLq+xlBN9k3aZJzieip/YY+oC5j6m+z7GFL5pgELdp/U4QV8ebxnEQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9XxAORb3tgJ0R/IuMrMWwR0kbAgQWPTxEOUMxQqzUtE=; b=izk6OhmrHN1W1cjOu2SkFNR0qQWafiuGH4m4RLCfbbSKujGPZsyAOFd6uozil3ofawW8c0vv2Bply5XV3iUxyfOpaWYED8jRsPDo065+v0RKZ1OHC8h/+y9pVmW70uKmTLDxE8O2aWc0xGwSZWVW5CJpXwMMF30rdskV8B8N1PdFFD0xwJv2zwnreGKNxLc4cWZHZWUE8924Y/RreH2g28byrEmB2C6saKot2nNMvYRr4ZcKC+Z0P1knYRcHzabx8PaPvMxnatMs/hMc+mn50hp1b/ftafokSBK700DUhvu+HBkmdWjxoAVPH1xmJ0n5GXbTECaPOh1lrbT03WBZmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9XxAORb3tgJ0R/IuMrMWwR0kbAgQWPTxEOUMxQqzUtE=; b=cl6cAf7ih3I/BsO2LNO6QJd+41GJwyCzBnqDBYqvVKt2D4b5qC4eZbTxrkzhFsSl4cBv3Uo7eYV6Mvhs/YcpHU5oimHjVuVtbyxvxrC7xrDeUQFsS/42xKIm4uGqnS+3p81JY3GDncs4wiXKMg3gfQULeCwHxbIOsqjpp6NM56AQ6oBpQJyOSixQySxA+iXkEzNVYintYopGcbij3EbpRGckeYRoCf4C500OBx7vl/vtbitxid7UhkIqBdk1iGbD9KEl7yQiOwVS7c2VcXf5ZgkNGtsltYUvlFVuUN+tj6m//+ZZSB58tukD5eriENEIf4H0YL7Z32Ofk9xIjMVa1Q== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:30 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:30 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 1/8] keymaps: remove obsolete systemd masking Date: Tue, 17 Nov 2026 12:51:19 +0100 Message-ID: <20261117115126.14374-2-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P123CA0554.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:33b::9) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: 0bf408f7-0364-4215-9cb7-08df44a11e4f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|261009221727099003|261009221227099003|261009223027099003|261009223327099003|261009220027099003|11063799006|56012099006|261028144727099003|261021123027099003|261022105027099003|261026140227099003|261022075727099003|261026121527099003|10067099003; X-Microsoft-Antispam-Message-Info: 99z8SFs04ONMc1qFNsh3BTBg6+6F3wIeDeUdmwcXvnv6A7JzbuJ576SbV/u1QCh5k5Y8tXdGXJVVRGwTJcqbbEkJJmYfq9EI1vYz2anNlkywZ19+stNomqxNkhLPuuFbxBE9bn51vePMnyHZE+SBH/IrQ72RzyRXhmCJaOzapI5TpydPcCHursMmOq65vnP5lJkvqaN7DWRUs4wjEJV6yYJOYgoHAQ7UIobIelaNfEEH3QlN9rAqGsDopYQ1CK5i6h5O0ohJzICZNACzt7aZ757npjitYiRwhXl45DZpDBiFjjqYRAROUfGid+ujkKqxINAsUokeijXM1Ui/NRIxCw/a0fnJMKsEp1y5UHlURilUJRW/Fku4DW5h7W54CoGGG+vm/UDCQJNkPeDvcxsjnbuBW9KmvFu546iHcmJ/jiz5eZqGhUruAZ/4GyWcH9Etl3pTIMZaSn0bJKgmS81owPphovK6OUu3OM0bSPJgkCliDQV90086tfTyNGuD1VgAhNl8hddGkeksOKS1NJLU9nu2esh9xzqIjpzp+8raRk4ynHDgpY2vmfb6oVxZG+lGCkn2dSbTjsnRrLF3x8UPWI2VDsKorRBOWO+8F7LziCXI5HO6ZVJGKK9ILgPrmymikBVabAANR27aI7ErP0gMaCryh+MgxwVwmfiGLM0HCKw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(261009221727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261009220027099003)(11063799006)(56012099006)(261028144727099003)(261021123027099003)(261022105027099003)(261026140227099003)(261022075727099003)(261026121527099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AYRb2uBcBW5pfahln3P/jai3O70ky4LeoOXsqVzDhTSYpxJczLHpTvNLi5qDoUp9bdEvQ49qZTt+oqUgRz1vbhBYLLH5qpQIBB9Gq90S+JOz0NvPLL5WMTnHExuUAlQvFKwVI/LtCb+KYc33Xf9/Ml/aYcQF7WIh1MPFvqc3VfGAT6t4RxGGa0lAtBDRtI6sPXwSvSbbz14sEty/X5885HtPekMbe6la7qf4Aj6R030fQhE9Vv+rQki4KF9ih8gGom2JIPOySgMaKwjOF6DdYxuKXl41MSC4uV4sUO63Z3+wjU4BbdeO09yd8JinRe09N5FQJzUtjoqtXvUvOZs5aDqMQjlNqyjSfQR7pkWCQhr0SX1LSmxPcuTy08/scoPtcBbBAMjyOoLB+gliUx7Q8EmGBJ71CXMk6+KCfXwUsvzZPPgzrRtRc+ZZX6+++cOyUSeiYpVQ+Qtx1hT5fqCQ5Cl5ycQhwkc3H+Dq4l6yk16as/tw9ZtDnSbYyuwty9rdo75Ow/u5Z5qlUti2EWnOpUYMO2+VE53F/66ViYVMfUrcz02JRiYW/dRlNlNih9/fkqt3BeAucGaWTlTX347lhwFEFooTjGj56USHd8NMZ1f72bgxeY+UnOBVidsHWDWHKkwWdmMl7G4jztSM5RFtvxlUTkuqp1uYnn+gK5cN6nopLI16YGDLZrj5t89MUiry7iH4oEPtu0dtgKMyzZZh1GBHgCUtt1EGmlKDqArEls3zq6E3Bl9c3n8EG32pGdNo42FhquvunMBnpgTB6QXxCeA5WxBxuKBlO9bo6RBwNAfQUjCKUWK5MYhOEcVx/Y5g5p5oaCvwo0HKujs4wapQHZt0u2Nz6denRcz/sbt5XtVYamv3PA+KXrWDTiTk//tUE7t4ec+pc+P2WxjjaOu/jig3/b9R7kgXpGoEpcoDZPNHIw1CbS+6vP9GxhRP0qA8M1m/Vw1NEKDuNI0+M6ElyCWcM3HKwpG6pUShkb+AbuEqDl8NtjF+uGYzrP/vWt9mQe2kD/bBAi/YaJr2j/v3i2HnagnPPaiD9+Iu26na3PI6ZzwSrjCNrKZkiYOJBGd57KGMcLSt6ZII7h6Fbz+86MG/OTsYSrcEKuVxcEm4tNioZcNQ0716DR/OESiUMq99Ow9lSAgh9ohk+F6X4ukWSb3/NM2r9JeVCLjcnWCGfUkDivQX3BSc0GlAsNhzZk1Y8hLMVMncXMPfaC7XKPfmf5BBfA0SInWpye9PeOtly8c0FpDcAQ3/LlpnFQuL8SrNUgjHWKbs416ogsVY0ZNqSjwI8dP+lzqlVljaOKre3wRudNH1wPiIv4AN3W2OmAKLEkhH0yNzMqRONDyKaMWVtvcBAvfIfxwwNA6IUPiN+3C9aaaA5wLhxurqKaXOQC4+Xs+UlZLhV2ecEQCvqqPiFCQnti+4GtuPcwgYN+D8pJeTttgb6z4FMCZ6jnVwpF5ivvZCpevbG/KkFoEOJidqbKv0xnh/Fj5ecAlNmtBdoITI+iCp1OlWRsVSDM1lV6R/9viW4clZuDAj/17J7W+SwKiVvXRXzs4xTFIN3GkA/ZGaYeGFKG9Hh4NSkZW0sU3cPzEFr1eI+MFp3W9DeufrZuL6qKh2pz96jqLVRjGB4V+LbPYQx0lTgJv4ry1EFF232LzNHFG5cZvcLTyQg4R52K405GKujMIuaMzHP/MkTb6o8wVjGLRtceM8jeZX6MiiVCqoMvdeaH8KRyWGy3xhqQ== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 0bf408f7-0364-4215-9cb7-08df44a11e4f X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:30.0306 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ViF50F+7xiPEy2hOkGj5VCi27j+dmMHE1Hx/5892qT4sOHj2Euvux18e1ImoHNOeXCy/0EvISiyO1Zlr/xFJgq/0ed47I3lCjy/oYLOT0zg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:51:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250425 From: Ross Burton 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 5107c33bc6d81cac5fedf865d84a3742c6437d2e) Signed-off-by: Jaipaul Cheernam --- 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" From patchwork Tue Nov 17 11:51:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104620 Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.84.4]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16002.1794916293062564636 for ; Tue, 17 Nov 2026 03:51:34 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=iq9O2Y1V; spf=pass (domain: est.tech, ip: 52.101.84.4, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y6z4UT/KNmbP19jz1xLHdav0KtJ8MT7W3ff0LMKeGz0nUVg17v8DMIhxeSXwO2aIvE7Do5/vGPWtMGtCHvS615+bvT93T2xKhTtV7Yw7JFiDHS1Rhy4+0BhwLlg2VpeoctLOVG6zFuC0uEIMgMuUEuVUKsAt7uL2i57GX5MAlRloTr+5MsJcXeDLmYerwxTM/9gNkZ42h86KRHDQgd6uNYp+sEl+7UY6QUbQ/rzrFn+NSogLCAbmmJfOZeKGKO8w2LWD+lmHi+mra09LygfLbL1Gc8pqBAUk2+sITpFgKlwgPsvodntt2RDwqNKlpZGu1kFEAj3ma37llk9TuXS82g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=o9yVGVy/6mU/yuSZ3UVdjniW/xxqpDyk3BSd1QIBVpE=; b=MpsyNSTxCCNR+HD1hpLjhgQhpchsr6ePGOm6fUah0kAoYq5tDpoaN1o6otCstPh2H//6mesuHCh7e3+s9HD6UGMf21VBexjmBHGiljQoVVZnmZB+nogBtt0RD5+aUeAg+3zaJ1U1Kdqx0ESjQ1CFl1ovQ4Ytq7twIzmntG+QFQ754Nbs7Tp/UXXobR9gExpZJ6eqNz9aa5hMUsOwEAoHY/yxO4Ddu7KS3rtpF0vFVSJ3nfysK+heCa2e+/rNW8NMQU9zvMVjiHMdWtxgY9JHJHRfNm10btSLkGBUPcPM5treSfk0ylevvOu9qAJO9XJER5t3jKMR8HZ2JOgsZwsnrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o9yVGVy/6mU/yuSZ3UVdjniW/xxqpDyk3BSd1QIBVpE=; b=iq9O2Y1VrEKf/31ON5/hFUPlCkuZ8qQvS5rmytJwblHPXqnqnpC78Jo27AtZZK+9omaemGODr2GOE3ecGggfHeMEBl+7VoUwwkLKqQVLO1BMwWpp6FVSvjG6UeaSBX8zVDvwjCaQoKXc6zdy3GWXyyjarVKUdFqeRTf5Lq9VS9EJmknWR20ze/ElpJmOaoDRG/9BV6HySDlCzEWqPnNKB28tWVNhejVug1gNjlc3v5xLsRbTQ56HWhoYu7fe4WdJoyUtJN5/mYHq2anEFZ3C10C5RhUViJPbf6T7Ssx83wjeZZ8BvbNxE3k21ZIaqK7GQBd3qay0RmNt+jxqILbRHA== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:31 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:31 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 2/8] initscripts: remove obsolete systemd masking Date: Tue, 17 Nov 2026 12:51:20 +0100 Message-ID: <20261117115126.14374-3-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO0P123CA0005.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:354::17) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: 51858b41-1d2d-4451-f1d6-08df44a11f51 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|6133799003|261009221727099003|261009221227099003|261009223027099003|261009223327099003|261009220027099003|11063799006|56012099006|261028144727099003|261102123227099003|261021123027099003|261022105027099003|261026140227099003|261022075727099003|261026121527099003|261021121427099003|10067099003; X-Microsoft-Antispam-Message-Info: VtXlKjrr0AUruID0rqEzxRzSRWzTz1+RO2Yf4PEqdE+d6SpZUWb3uVMQRCJ2TUQIclpDimdYTAD9tpnuYjoKjE/Zx4Pjjn1mM1TLQSxXrTBw578fkAQ9RCRsqyquo+amaDhZoUAEquc3nl0K0HH5qk+F7JPWcrJAun3+mFlluKtT69ydFeD3y4ltVDu9JpRWG3Tj2RPdbgI3II5dDSrJNVYg8Qk0IfnfbF1feUvhxcriJdXq/4EETkGzb/sv0Gxxyef4ZmRFdAjSJ8h0vrCex/kWO25dSqulxT5eRkpQqb/VpuXdCd22GQQv3kaoKlCobYgK/Gujd+AEJ8yKId3nNd3A8g/fimSqJYaWr8B7hPFEGUKaplfLzaM7+OG7eQyrr9fZa3LrDS9J2q9NMhuWwuoEQHt2m+fhkzD5fFw1+QQQKReNvKd2bf/avDxJ9zyRugbNxMkMh2RuwTGTdwg/bpbs80wrcblQ3rl4CPuCJJFG53sKh08OXEnArnpMCWo0yptNjj+KhTMZWH+t6UbH6ADAIkO7rhR6KfNLbe/8NQLCBPHPCg4uvYih73CLtaDW3ZRxZC4G1bb1afcXagEA2rpzjTTDhBofaJdL1EYboEv9wcsHeln0HzHsjzhqh83M4ECBXswN6E/Dv1FeNNbB8LSYlpnXMXiQDyxMPgaMeOc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(6133799003)(261009221727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261009220027099003)(11063799006)(56012099006)(261028144727099003)(261102123227099003)(261021123027099003)(261022105027099003)(261026140227099003)(261022075727099003)(261026121527099003)(261021121427099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nlDxV795WlkOfPLHHfPIkFrkZqbzR0gqgQVDR4DjY3wytbQONnBPCCWj5zIH45+te4Rgn8bXxrngk2WNK+LvDe6zK31B19uOR1o1lDvCp08ATVSgyknoFGUgfQdoZVRtB2Sb63d6/pMtJ02/9J/P6Y7CUXocwjfPOSnqbRK+yKKsQJ4lsygnrOuO7oQ1PUUoiC8vLK4JcptewJfTXIxhHhOIWyaJzTpo/J7ExLPV3u7SZmGAYMxorW9gR7lUGey5R3bHLV+KU5wWhNkV5fHb0J3GRRbZbGfiPycBjrOaW4ukkgNfiR/mDknFsUBTCM7852fUR0qY1kfoCBlnFqrboi2V+C+IF2UCpoVZ83fR/v9gf6tR3mrvEIxF/HUyoxKjUAbTDv9XwWzc6byFJPrMzOmZ9JO1yXSBJfJcHDXlen3mTdIGMmzdmCYeZnkQyWy2XnFJgN5fEeFhwGJ0Y95qnqmfIcy1H9xl+am590U5aGsevXGHpMfLMQeSwYjJEDOolGPwVFNTgI7tndXlZg6Wy2lrNE3V4ONfnDUEipYz3N7LwLzFJWVgB8x1EVMcKkjWZwv9vHoE4PKajcKtfcYUxUVRu1+4oQVi+2Zi81rSptf/YnaG2fi4bsmG/FGvmmcZS6XJ7W+ullwgdEzu6iRqhBiBmu/mztxH/sEpfAjIMKcfI/9gKw+388OsZsse7kcWXqr/MqWN0mzpykT82hXSChMo/5yTbWWNjBbN58WyHT7E2mJf7sOgnTBOZ3WLqj0AgSftov1wdxccMqfjwQRD9gkEtDSUwOmO5j5Y89gCCA0aNV4GvEaEg1xJydFjpl7JKyR9Aqi6v5RfjdLYQ1LqvpBl2DRJj4ibNiTdz8h1sked1aDn5O1nd862PlGeB3OzwtR5aYfhTYrT1gy/GXAjhFbnuZXZegjJF2D9VcTHE5pP4lFwuFneiH6zcm7lNqAzgg17TkxdQ3fgIH2TBaWNTh8SWDpZVA8HXCRLzYHZGoNgB/YR/gbkV3OB4v1QIepmERgACRKTjU+97GL8IJ4kqI9sV8m2PI6lb9wyqdXrUbtdb9FXNDmXUGeqJrjIzrJje8+rkrao00pGK/oBLhOa+ywXP/+XLzOX7taGtMdWb9/YBoG66NQkaw2yWdfKaCFIZZ+4e2+8mPozwhvlkC8Jk4LIim0Gn7F2axx4NuOz0hfz3utcpTIiK+XtvnBoF1JYuzSQxCCQ9Q06XuQA5N6sHFMYcePNqesxBjVP58UoHGuQeQLmCqtlzt9lj3zayJrptsrOtYEAL3vWWhGghCiwVTGX2R2d+Je7KWJ0kBGfBsRuGWlxagDYDqGJtKOJVkqXgCgOsjfvNDj+WX1q3YjyubeSzHi98r4oAwx/PPGXYliIwxo2vJz6D2BYRdc+ubGUf19Kq8ci8jODyNIF6h7yWqLJcfWvGhla9wpiLiqi/QXOfgcK3Gg/YwYzXkGgfca9PjoQYtGKf5/vc2NR9yCK9r+v4w7N/JWPsox6NbWxPryvwLNt259OYRO4Qfy6+oU6zcvhsiZAddKa9BQGkc2hRq5fMdemc4JZf6IxNCQL4lyZ2wNv0eIvFDLUwgrlEnfvvX4IwT9J+8qh72IgiIZWPkGIkRgaZirl07lfNXW3iaz0qLZ0rqvUyIJt8jW38adL1gxHYMZ8+F4f7O12VMhexG5Nza5gYxWGcvD9aIrd7X1Fle4ifHCI1YSEbuYumoUPpO9vjzSGjRVN3qRRZ3bTzw== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 51858b41-1d2d-4451-f1d6-08df44a11f51 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:31.6951 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tBBUMVhHwKEbvrE2fUTVp+COZ0YRRfGgzkaQAtXKjLN4Nsynx1WtmmZNmJ6d35sL85oIa67iISQJKoxI/SsCJTn9/GEsgUTmMDajlpIZDuE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:51:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250426 From: Ross Burton 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 2ace925cc4a23ff33a9bced602212fda06e4c5a9) Signed-off-by: Jaipaul Cheernam --- .../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 23411b6a71..ae386a6281 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 Tue Nov 17 11:51:21 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104618 Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.84.4]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16002.1794916293062564636 for ; Tue, 17 Nov 2026 03:51:35 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=MHUmQYKp; spf=pass (domain: est.tech, ip: 52.101.84.4, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=V9YE68RDUHy+xmUV7rxUpzAjSfmo6W7U3ajKvhV8hcwS/IX20eXDggpKpXCySXRZ1SSW05+96pf+SmgwczvDA5uyw7/Kg95Dz/5Ntc95XYSnj4ugRzL9q3QXBAgqUnzF17NjZqo1S/61TeYm41arvXIUY4BzeAAfQwNpj6yCyH/bnc310rSaxqe2MAvdBDGkWMPylTIZdmBeJU/esq00hoi4zu5A0iy3S6oEEDebxIOBn/WhOccoVHI2Rivkr9Q4y2Pbl9WgrcD+bcs/3vtg7dz8Axt49UinpTBPh0u63SZ3AFlVA5W/b4JN3NyD7kbjd8/OSq7hBurbuPTu4SjhjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uDDVmxeOL2U7Gp8l7G34I6/set7x2P/sL8/nc8W2+qM=; b=K6Q+IldAG/nBdh7d4xt3B00rg432Sp0gMLYcuPxtJQMHtko6ZAE3TqnXwYV238LjC8/Hisj2pxwzAnWu2NILfLVspV5pkwW4of8+ZsPPfk2wLMuBxozBeOYQ+M6BWiPGURPXjykjRB20++VA5sPwz9s24tLWa8AM5vAiB3KQ3wQvdfGc/gMjxBGYMe0eY8Uai59zu6v0KOYtk5PPak8ncuYHrSQ3EPtRBu6CibOwQIs5fdSL53Qqn6//XT0KSmW1b4KfiY014IVCdqt5t5RLK+zxMuEWfKs0tLN3O9LS5enxBdKRcKRi9P8XZ7rjzZrs4DIL7jO8xvIK9AV9yvKJ6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uDDVmxeOL2U7Gp8l7G34I6/set7x2P/sL8/nc8W2+qM=; b=MHUmQYKpOlyQrc5Dy/LZjEzUCkuUbVu+5z3Drl6XekZap2jW/wxoivh3AR9ZI2s4uRMcZ5MV9Y0T0Bz80PM6V7kZFhlh5RTKhGqOzS2KkZ1e47ObjKKVa/ROimCgWgI2oqoq6yp8PAXHLiDfrtmpOY9qdoedUsO6MVC9KWbiQ7ra5Bo/5tc0P0t8EXokLfvvKU1M3crjmGd83keH72QxDZSQKngNbXBlpR6nrBgOwQGLzE2fT65KayeX/3J6uIkklnSAqFUVcPIeL10nlqYa8ZKYZjFnYbRgwA5M6Q7UgXX847v2efnXaWCoQl7/Tfmu3fdX/Ks2aLTeofL5Qmx52w== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:33 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:33 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 3/8] modutils-initscripts: remove obsolete systemd masking Date: Tue, 17 Nov 2026 12:51:21 +0100 Message-ID: <20261117115126.14374-4-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P123CA0265.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:194::18) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: 916b1f3f-784f-4027-0d89-08df44a1204e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|261009221727099003|261009221227099003|261009223027099003|261009223327099003|261009220027099003|11063799006|56012099006|261028144727099003|261021123027099003|261022105027099003|261026140227099003|261022075727099003|261026121527099003|10067099003; X-Microsoft-Antispam-Message-Info: UMRbCledZf6kzO8UrhVWnFWqp+TeDUkke3W65M09bwmmQSTUirPkdDgVXF2DA/S75iLuFqxLbCAJ+Wzpg4kKA8z3pj5pEl7/je72aK7lNmnnV6YonltTnhvplneFDNBADTmUIabM+x0trVrZqwFCARJLUNduPa4rHdzRTd5HAYTOu3N1yCQFJ6f+h8U1n9VNPCJf2zMfwIkXGlkf+Vg8yUnd2WHv/A1QvJqUGicigvKYi4Yn2GTt9I4vTRN/rgPXn6BcHIikD2fzbR9StTwZnf2Fq5IlRzC2m4iXF4dqcp5zMKlQVU0ogzTOLZqatN7pIaahlWtRDxsGD47QP+QUIejc/IJyO2usLoXyewEwqz9mI/J18H6Ig5rY5oU5u+ByJWylYLF4skh9y4VS1B7YWqIWAAqe1cyYkakVnDsvzlw+NnAB5dRNizPr2mr3V+Pp/MmGx1mmVklh/Y0+5EJV4ZLH53+tFGiymK5Moky88+8SoTjB46UI+BrHvBTDHBO+qq5ZEKCdiubp5Z2ms7O7KAs4SjRyFSIL7TTFZS49fN1e9hcvImkZKKDsyAKABYd0k7RgnkmIeYA79PObA7Z8IwkLXu17nE2pxkiw76+Hh5n13LK44HkDWFMv2GOonrYEU5wLJA8SjNWM+v0x4MCB1J8iV7p+tJsuCMbeanKogO8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(261009221727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261009220027099003)(11063799006)(56012099006)(261028144727099003)(261021123027099003)(261022105027099003)(261026140227099003)(261022075727099003)(261026121527099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JVltlXXmnYAH0wSUQpOFAIqysjwQcZZydWheWpq7ZI8a1FQI62FNIkCFLKYKph14GicEqJFWGJVE8b6FS7DZ/898dQpTdAHLvr2EC9CQUm00+LkPr4dtFny/1e3FI8fy3jgZ4O24yeoGBjLE0qPkBYNE1PNMpMcgT5TKxjdGsHCaplK241m5Xhobr0qQ5FzttbzBB/Rel70Wu/aWLlc8HWSfRfRilTJmsflnG+RahpZHSKMpNtcU1oaklbaUqvpC/PT9IOVuAzF/3Ro7+AEVCsPXQuKT7rDIyMlps94JwOOySr9Dp+LXBkp8qntGuSfJAeVW9v7fXoIwA+FIgw4j1Lr0rHp/K/zkupWo28sjSfF8pKWMKTnVwjHKBl6J2OGHgyxoZRTlDXo6o2dh+fgAWeMuiGOY5jp7DpeiC+WMVZLdGaqfKjIL8hcK3mA64nHD1V+1puGF9bT2s5axSC6gvzRmsmH5lg+43dvPN4NShvL9QvXFzWDWMMK9Orek50IloDtV8DxUWNbu3uVq3e43apTSetK2r/nRwKSDsQ7Nalf/QY1lXSx/BAWDVAMdpWMVGyDY1GbVA56W4mgm3rnMsxrQMv9Fp3dipxjizD33rjaZ9/lsprxQ71Ew1pyGQwYtwbujps2z8fkCORZTsq9fyicy/i1FIcw8jtqN3mUvdfdysBAFeDlToP3ofyWMl6E6uCWXJvBbJNbErcMMaBb8RIGGotXZvVswlAV827a1KzQ3OAQP0TzKROTK4K5lC7wzp0ieA4rZsKKlZkOE6zeT3j3R3k2UXYi819M9xK0aK345E3qCSNwR1BH7R90Ak2h+0aCLX3N+Y8yS38m9K64j+WsuohuWABXyYLr1kzoJYjxqBkqx3J32Bf/Ovd/m8/qWM0nN/1m366lB2CHxPOEWhTziFChgNtLhfyVRAQkU4UrjZpHrFykAhyZpRam10bQOCSD746EIS4KzVhKV8QTEwXJiU1x/tCZ18lhKAe9Jx/77KYAkPbbya2E3QvIrrx1TeJ3ElfwVih096r8h825uLAh9A1nLj4QtxwtG2Jo5TC4svBBkH+T+OUDwlKG14CWNIbF9atx/fEMhSJMZ+lVL8Knq6E8dCcpTIH0HwwkX1N6QpGFGJgcQF/RIwJ40M5fKxZvjkPfeO68ouOwzZ5s2PTrlXw47scW7yM1DqcMX06C1NH6Eg+xGpjx1v0ti+MWwRE0dPM1kKg0bv3lrrruBGyF831WBVlZw3t9KcMRTNBkvEYBaNcoMwkll9CP/uZuFf+Mzhpa/+OpzyjIk4NHi47TKfmHfHuaUDybIR0dMENVHI1gipZwRzAEMhMSTcU9XORdH/7Zk1EekOY873sNJPFbc8QokCos3KiKGx7pP4ymnGELIfyLA+3bLjkzG3Gtg1LnkaSK4JVAwfEY6+jQv7qvqDONqSwdJ+N8exF2LNVoUUpL5gscITntETewwK+x/YEmyLaTgELJWUSuyv0mEXCvQgwdet/Xdgdm+1xBVU/CHW5uFAis/St/o7F++7VXud45rmSmC8Et8syBxUH9hejZ/id9vSeAZmzLAQ4OemnyB3xd1ikYjPs3XGRAx0SjElSZguj3/K0nHMp7LQnGHRkp+7rTy8VAhkwr2CBStbyo/omw1K8YvuKOp/OK7Fyf59zDFv3axZgidI+/TX88j+BSqgLWnG2NTiV14RcAkt9s2rHghqGCKT7THz87L7sqdvCihswNGDAQ5P4kTqhlNqQ== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 916b1f3f-784f-4027-0d89-08df44a1204e X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:33.3469 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iElFKp7cXoi60pYvTRGEze4H5Jdpn4cA/hGiKD0Np13lzGxjabyo39knwjf8fJuZBt1+uVHtiRVNDSubyi6u2Uzp/j7I65p6NThu9PvkonA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:51:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250427 From: Ross Burton 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit d8e6b86d89ffe9b16d1a9aff423940446ece0f5b) Signed-off-by: Jaipaul Cheernam --- .../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 fb7b09393a..89ef8bd600 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 Tue Nov 17 11:51:22 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104621 Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.19]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16118.1794916298633238925 for ; Tue, 17 Nov 2026 03:51:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=KhfWX0bn; spf=pass (domain: est.tech, ip: 52.101.70.19, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ea1EBV0yzQJyLM0JH5ULAhVbO6FfFUIEtIGNFVYYoxU5Hr4/H8+HZOQZ08TTiY/fmsN7P0L4cIqYOKpJ09ZFWoOzzGH1+ddy9shUr7b/GFu6RY+x4V86Zho+MkOSFJLAOYNLo/8yxsJ3zC3xHdlzGStNJQ7c6qvSncekPqN9CEkDULfx+5TX+asgwOYAKxRP5a4Ez+cNghDTKD6QRDtdo39wwkryNf2IxufY4XzANfoL3VM+5ZkoY745tYFL510VTLb+/Ui/6MAWiuB+3inhxc0XkPaBX4kizWCcNXyGah4ah9eZ2z1ICCoR0rifnMJ7/As93cpwhVel2nXkSw6brw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WHL/21uKE2wu+iWkqHcek107T4ajuGhTuo2LMWd284o=; b=Q2XXbl4zrmyfI3dlnYSbEZOQEMdORkxwf1d8sgvPiWhq3Wq/V5470PXTsHSeLpO7tSMe3X3iBECjwOcTqkDBtn7NE+rybE9D3Y78aZYfpP+7b2wf4LVf9Vlm26MvrTzBDPREmtgN5Y/w7v8BzswqpYmdIQabLzU/F48xI7m76SqBPs3Kuv//95zgSNLXu4NXRY+cNhhM7jyaQr/NyCViw1N6+pMjIubPE4SLbF2C6Qne/rIMlJHz2G5GqS9fA6Vmot4We//DOaA99+4wdNFxYNIaw5p60lRuyJRFC4LaMQeKhSit5d1hzqn/CecCyBD4dmTfhTXSbLSW0u4nVOmBMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WHL/21uKE2wu+iWkqHcek107T4ajuGhTuo2LMWd284o=; b=KhfWX0bngAN8dFY5TpGxrWgHBBvRUyATVNQJQKq/SXypRGnHadb2pv37x40jhRsJCHIlxeh650GZEZvubjAnV4J2HR8brpc0KDVZ5MoYG1fUJXWcffukq0lYy53yiXJR6pj76sGl2N4TEGRQ1Slv+UkBtUBEYcdUKL+3L5BR7PMq8TbiQJANOZKsvLKV+Efsrcn/NjQgvtR0k0LKwQhELZer4L8TYOtdkfgwU0O9HWhYqiRlf8H7AYTURCCisP7sy0TAPyiR3b08dd2XyX0iOj27XWPJvq3OfBYOWDSPbyt4h5gc7Dn//9lKZPaG3dPTppdyNBkJ6Y0VClMQkBuVOQ== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:34 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:34 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 4/8] systemd: move systemd-systemctl-native PACKAGE_WRITE_DEPS to systemd.bb Date: Tue, 17 Nov 2026 12:51:22 +0100 Message-ID: <20261117115126.14374-5-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P302CA0021.GBRP302.PROD.OUTLOOK.COM (2603:10a6:600:2c1::12) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fef55bd-a7c4-49b1-d81f-08df44a12131 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|6133799003|261009221727099003|261009221227099003|261009223027099003|261009223327099003|261009220027099003|11063799006|56012099006|261028144727099003|261102123227099003|261021123027099003|261022105027099003|261026140227099003|261022075727099003|261026121527099003|261021121427099003|10067099003; X-Microsoft-Antispam-Message-Info: s/+4GQFIzZdAQw9YDccOcjEJiO7LeusvAt5mVsupodwWKmdUKDrFM2xKxzSxDwxyAm/mIJWORI5L0EJxFCVywNtyViOlp2vTsA1F2FhHDbEy6ZqZzVU8Sye6ZMnqUqNcvPKr63Wi/6hl5GUqYAbXF4LnMt1SVKLmagyc9t0e8Xu4L4KgVe9Qo0yFvFzQ2YtEx6laiVfiIwZM8OU5In2/yjy1uQwOiehTSQ970apArYs1jjRVQFEsi6TTtS9vkyEZI/XcvPsCCdQSEJpfS+4BzclrW6SK+k+zFcnijQL1YqmfVQvmh+cLMI4Q2u1M9WZNjPoV9SQhOYQ9gd/ezgshy0NlL4ljIimDShNw2kY5rKxRAmhMRTQrsOyWw1AR60+s39oGd6NDa+o5x+ncsXinnhZ3D6x2ZKmeQ+QYUCPBk67hbYBNOaL4zPbnDb46lXuveABNOcJ0JoPYm7SWvGoitBcQ8SimAbQe14pGqDmH65QgjJP4xDscJV2i8p0dCQymez3MbEABq/l/0duMh+Ulmc2WqNaSMu80HIPCAkd+Rpr4iaWjPFJzB/XZks6u0R18nuBAM3+Fg0JYREdP+/lOyWQRm/KxU+CSMKHDvqYo7Spp9jDefrBJTTrymDsFqhLz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(6133799003)(261009221727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261009220027099003)(11063799006)(56012099006)(261028144727099003)(261102123227099003)(261021123027099003)(261022105027099003)(261026140227099003)(261022075727099003)(261026121527099003)(261021121427099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j+w861ZYNJaRx/MRbpDALrOI/VlkoYBeGyZWbbtKeSdydQ44a2VEO/1DSX5r1HMCNtg22m+l5GsbVSLfaUuWXQzb6etyuTDh48XW4ov+u2T/PMQELLuXTjrQosMECy6CVng+E/ioLK16EFdiqwpjZz+vqmjKO6S14bLPIwvkg1cyrMWJJMcdDi92VTv4ZDRtDMl+1dSd89IB/UhHU3XRgkUxHoB+KeVGQV392PrUe8ovetnMHYjNzGKNPgmhVfI6SKPhlvuVACRkahUuaY3JbSYAt7H/DHUyfwnOeadlucXwjglj9A/wI+eiZWC3i94yjS8QJOc0oCTF7JjcaShr65biGrI1E2FQJK6SURwL+LMthcCDDEx0/iqDCQ06agz/Dodu8X87oiHKn/GcHsYcLmJG9Fzt5uEzT73HeZphki6p5twDs1hrJn+zISlURIFBORVd7khW+yrCJNIq2OtTv2JxanW1nWtZd8ltYElCL3/iqiwQuEeIT4zjzfSIv1Jopa7w/xEbTG0P32S8Jh5pWPRMx5ZC6oiEciLfRhH+eqCcUqoRiXlj06MyezknYhW6AwVki5z8fJMPFzuBwF+7NMvvLRJq3kMun33mRfhBdK8rCkLB2Gnc5Fi2FAF/95K+4REaLMRNSyeUHGCYpHzqAnoaFo3yXWB90+uIS6a7EOUEOI9FL3Ob9rtiR/Sz1FnV9mp6ZX7FoZ3mRAiNSoncc6iGu6emS/zq2pHPsiV4BFXPhl6Qw8ekRsGSEmOawmM8hrHMmGI62LPFrPV6GqZpipOC/pF0lwUDE7AoHuqc/EcFIcUQ8elAIXXzdMK+r7hYFTFIa6zOEcuHPRPbC1Mw+GUWBcsgiFIAkdggFaUyE1aY6EA3tR9JJ+uxqhN7WxC0cVyp30AUS9kEdNwqoY4WZbYVcuPwhnviqVAa+6Ki//ZnUV4vJOQ2ghvsnK29hXiDZimp4A3Pej5fwZXc1AqRVyVnV7JgRN04UBDPmNgChZK13dtv5sC9jfUNdDOsu3UPLHG3+BOyKBLT1wgpPrZlkgFThQH3rAToHC+csDErPgKTAGDCtOC8RoOrksUDjKfUD/a5epNkJKLG27KMbW/hljXSarceZ7MFbPz/jL/olngaNtttqZFP2AhHA5GadwhMzy4gRH5kMI0r2SnQHKG+Hz1+IH2hk64hS7TmRYLJ4Mjxdbo4af9AFygkKHT1lssI+szJWer3aEdo2fFWiqDSo6hvv1IIjK0Zxu7xbGcLQMH9GySQ7ftBkE6dZmoZG4hA7nj9yTySnbhGTiw401DWN72kjE5AGCaZmBxSTcpihXOpTSCNIXHKHcfcZYGkBnPGAsZsOF1zNQTjVBhqtc5KTQXwd2qU6ix3cbnldU/jXORQ48T8YevJapoAQ83J3zMHcmFEDzbecuy/hJApIv3ocEweAImujloIXdouDXPBp4VB3r7nO5Ya8QWEjiP4OpfmvfJY27TfF40TP3ZnMAMqLO8Rpn3ah9mMpPD9tmDzzpy1vcWpLLsEaullgVpvCiAA8SeWIUbH1SW4oetu7MegoT0MnyT2h+c4kybWUkDS6oJ/QHFjdAdcN4h1J1ycGQEQGfpKZzNWp0R7SYm1ctLOuZhOW8GhPTI8BD8sn9HljxBtOITzcAbwb/Xi3zkLzyyXMun81FsJlcEnia89t7P1+UcbIJBXRml79v4BpojEZWNzDE1YellIlbCDt/ZiYVnYFcSXWrQIAbePLFn1zOKZnw== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 4fef55bd-a7c4-49b1-d81f-08df44a12131 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:34.8656 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oJkkN04g+UHIu27ihBOLeS5TnUmHWrfZupwblQrW+4BZE7hs9LS8qqed/hSN/4eX1qewUwZ48HmORU3ESTaPUBf815kBSUlVs5yHVAq0KAk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:51:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250428 From: Ross Burton 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit a96f87266d63fb5ae2aca6628c35572f83c68983) Signed-off-by: Jaipaul Cheernam --- 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 26eaaf1922..5d8e6086b2 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 e924884bf9..848e12e8b0 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 Tue Nov 17 11:51:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104617 Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.19]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16118.1794916298633238925 for ; Tue, 17 Nov 2026 03:51:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=IWu6XUIU; spf=pass (domain: est.tech, ip: 52.101.70.19, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OVHYqdQfefH2Vm0AceOyIxA+AcnBI5gPNwVHoNv97JnwBy84Altkgggu8zaFqbG7/xmqtju1n4vhi857RgXd0VZtgXIgOOYWWZo6AM+mQcWbTwkPIG2a9fVy1aRE6EDmnprs0N1Zu91PjhjM68bAGSUIsGdVF4n4X6I9GSrKyfMG2YRvCweSGNd69sfy8IUsCEWPDCvqNX4u1PA+IBPE4AbzNdkoPbBck2SYUy0PLB7Gr3VlTV4Hj1mtXTAPkgCQ+d3uZ6MaqxMRLiJxteuZW0SPNBBORPZYH4DSKSkDeRSyGYbF90+Ik3dfD8ntSrLHUGvYyK/cXazfuTH/7KnnTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tNZqvv60Oh1VCXUurJP3a5D/sv50ktuByWwMgHFX54k=; b=S7B0/CnegbMKLs9wEzbxp+IiDllZfHA7w2FIO46KVLAJmZPZuhv/QHhywwBgiCWlGQ92sOmLDQ6RKS5cASLvOWSMaAsOomrYdhpZcdMU3Hg+0sVeffWx6T6waqctlA5SajQW0wp8eKTtGJOD8TR1h4aBiCkPVn44vn/wKN3VhSszwNqKwce5UZfRVA1qL/tX1TOaTmkzFNTrTfKOcfe34ehBqKLX/Uqn/Gk2Eqi7g4yF/fh3M3Q3H4s4M3PT5Q4fktQV6sGjF/e0aR98dStJKrAWiQ1au/bVesigQoVbcGbll25gT25icpMiyKuplwJA9ZYyncwSQcibaPx9Ea0HPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tNZqvv60Oh1VCXUurJP3a5D/sv50ktuByWwMgHFX54k=; b=IWu6XUIUV6oqZhfbvfPTI/J93cofc4wA+L7Vuub2HRpNCpC/E0zIscv5MNgrxJfDohjjYzJoa0XZrILAKwdBJ5qFHnqkndE1QxDHV7cMcKqczKC+VEMGwz8W7qGeRp++2rrtZu+Ot9XQMWSlO/XvvaHFK1Y/ALfEK7TaMqpcbaQ+N3lyFkE5094JSSt4P+XC/fQga9Uh6j2WH8lOJ/VgSFnKd0D9FRXm4fc/ZdEYcMyKLLyo0NMcjPocpz719x1VacaRkhKm+MNohr1GXgjpxQA/fP6WANM7hm04l+5IigutHw+n7A2kqGGnq5+wIshpkGKsSxwPFP4232WJ9lkYnQ== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:36 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:36 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 5/8] classes/systemd: remove obsolete DEPENDS Date: Tue, 17 Nov 2026 12:51:23 +0100 Message-ID: <20261117115126.14374-6-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P302CA0026.GBRP302.PROD.OUTLOOK.COM (2603:10a6:600:2c1::18) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: 3bc78fbc-8000-4f7b-fbc2-08df44a12230 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|261009221727099003|261009221227099003|261009223027099003|261009223327099003|261009220027099003|11063799006|56012099006|261028144727099003|261102123227099003|261022115727099003|261021123027099003|261022105027099003|261026140227099003|261022075727099003|261026121527099003|261021121427099003|10067099003; X-Microsoft-Antispam-Message-Info: IyJywL7lTJ0y/DawRVI7SPBue+AOpKk493hauvHQDTIYaz7nU2l7LX8biE92oK/dzAr/qHmVpU4D0+DpKFX9mvPw/5mYJd1VgAv6tfDTSpltKahomT5xQX1p0SQuGLNEGjdbMCrwqZH88Vd3snPNTx70ui9Sy8+jE4sPYGje762J1npTavtqzJoAQT87aJo2o+0Nq9k/JLpwi5/t/mR7hiPtTp21iTtbnDBNbubaxG5nUXGEi9tvGoUC6W0CB/+kB9eRuhrf4qaJrhRpLdhPtbwkjp37Cx3RqWSFC9sTIDxdt5hrJVVPPBcsK0j/UzCCo9iIGtjzM+aLwOBod1yoGxhd6WLlD98zfj984esoKAe+DfRnMmWv2ZJ/4i6DSZ58kwx9WLjRQIYwz6jarEDagc1thUvxuqV7io0sEKl3TwGI3c9TvuOQIHxdJY1gnEPQA2Xcxu/dzMAF9R2lkDxxyntsvvwwnDyy5a9B2SZGbQSfY65JEayTC3CS6sz4CcYr12s5F0mnfGdyLU7XlZMIgyy8TRZ0RaWtE1ocbGW5G+WjrfN8QjfKFP18HYGgfqnl2gpwhF01C3zMqy/Br0eOfuhag0jCxWrzcKuZvfXe7OfPmTeUMMdHUSbYYRpyfrLRRFTac7X96XVQFYAsHvBH5s8fDJeF0jYi+cXodRhkPV0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(261009221727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261009220027099003)(11063799006)(56012099006)(261028144727099003)(261102123227099003)(261022115727099003)(261021123027099003)(261022105027099003)(261026140227099003)(261022075727099003)(261026121527099003)(261021121427099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WpMe03z9UBUcWexHLIBvIFn2apqVlwi6NmES4kYYVjuHrVeTi2u1oD/fFYkJbwWlm0FccjeMKOgTWNX3otfg4rf9KBjkJ2uOSjyX7rNTCDSel4lIG+/TgZbkIJtp5RqweAVBFJSYLcq6LHIHOmgLPfF+PYdZbyQqRc6K1EwQuypKiBvWIZ7rP9BXWbtzYSyzLK7KsTTVe7dAkEiO49YQoY+fTDGZsKvDS8FomBFTa2fRvXPejnGang7rC+8H2l33Zohlb2xeW//R0n8BO8g61drcsCzUCx6u/cNbmZAHkCcGLfdx0RiWEJFQHwjQSSeqRSCcxjvpsYV0FXqGXUuhkSFBiGXSmCpy+MmbKtUNqmxhS2ENeWYc21U8gMQ6QUiTg7N/Op2B6gJXpVxtddzqz9q4e7xNITk01HFjRYPNiCXNEKvy1yGCupzUpm8AV99TVXnfnGdSHYmvP+rdl1R4aqcR0kYFpL/BHThlwhj5r5exui4ksKmE0L62EReUxuV0jGjPf3HgloXriW1Mu/ZdgsBAJZ1vUoGHAi1lpbSCQPuYX17STzz+sR0ZbswHHV0KTK5B6J48oq2ybRsSn42tBdULuaiAVCS+uRalecGCGBH9SO6BQrQ4CJaddY2q4GEEqWBdPCXPmSXAawKj6W01FbPAaAF5F14o7hYWn18rgggvTVXGE3Y/I1opi4hYQHV/oKOG8IWABCpWo1tf/2/sdCnMvXCoC9JDx4SpzfnmwmJOWIBkccxvO11DFMPzeJhNP5ICJtMwj96QiousKiyLMDqqDXpTmK07WncrhajfuYz/MEVsYDBYi5wJiggffEhYQdCfiDAHgAfZ3e0s8v3aTvzTiEjZ2sB6EfdD/2dtE59zRVcsJlOfpo5qqVadLv3alcft37tAuGjMl933NOf2nFD5PYykwEBK7j/1taqA6+BSpaO659U+htg0kcuhkWneP81IY/eC2jFLzxXF29NH4aHvHPUfRcuPmVHBRewhChGR+CZfHcKx3RIqSbF2jl5VefnZ+rYJKObv2bnACReURrG2AaRUCXxxizYr4w0sIARO9GrbQ22kIacTm2nv95rdwxaiYeknJx6iu3dTjtcHAQvQARendS2NBvs82GCC0mazVHOv6MhQewPdOX0aabBLLKekUSdX+7l9IwTekKSHbmEa6rJEtcnIICh/l5x1brYkliIszuccI5VF2E8zpt2SWOdRza00KFoN/BsvF4Bw0cNpdT0AKvGdd/p0tkyRxeNFggVzB6ujGaXh17cB9aR4iMdB8NfEDaJDM6njCPrIluTWEa5UbwG07ql3EikWtDInGSOS+RTz8kf6/14PEUPJrw5GhGm+kfKQi83mNfzj1FD3jBU5RZiG4fgwHWkbifOSEYHlTbYCVYEoyrda+syeh22TVxnGS/Wvg3bo5vA9X5KToNcvbcMNbowjh3GFylqdelwAHrLVzAt3O/PEMeve+7p/tHwQV5ghSLMEI2fiq6l1i/W2kDzG7TVXzX+0F+DQS5FI7b+uMK+iVCbZxQ330dYr0XiKoB6DLHfhCvD2zvYtQxKkjVLoxh6jvO3mEo4aJ5dN14r5g7pPFwwhj09SKxlwHminN8sIBW/5/Zqb0ayzAuVmNK+KdTI3rgTtwNGcqe/AItI6pdJkbkojt5DyY0hCzMURWwcEkY+FEgFuSc6u5Z8usgQm3dF0TbmywhTHv9as2E81I7M4VBpJC16PKyDDq6ypPuTigfME67QfQw== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 3bc78fbc-8000-4f7b-fbc2-08df44a12230 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:36.5373 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RzIux3BJ0C1jpPu0681Ww8jc1vMQSf5lwdUIlVDQDVN7678zHVEUzs8bU8vzsnmYVRnI7efoZlAO/bRFD319AZ1ch+U1BFZbSAAgfMWsPQk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:51:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250429 From: Ross Burton 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 4e91abb261257abfc23acbb87f3d08ae5dbfbb5a) Signed-off-by: Jaipaul Cheernam --- 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 5d8e6086b2..df464baddd 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 Tue Nov 17 11:51:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104622 Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.1]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16008.1794916312290085460 for ; Tue, 17 Nov 2026 03:51:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=fwFz5+ym; spf=pass (domain: est.tech, ip: 52.101.72.1, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jwz+dWMsVoKL7jjJeD3o3m1BtgDzu60CwdHyXcif0SbLjjNoEgwJMuq2zDBRzxFPjDFu5kcKKN7TNGqpLrvtSv0e1MIy0i2mz0yMqS3eyinX9J/FyAeDZkEa4bGJRIvUsBE0/W7ZrRBrBEO2TgQIvBtkBGVvzcRY//AL00zHOBre6Mqyh2Bn2PR3rZsnrYaO9/GxEfNrzQAgE+83p058cocCwVrsMzOwNtOT+r6rZaFoN4eDyVbytFvROBUus0630dVYOnBYs/+Wj4uAbl3Lzeagb68nbaiJmCDe/qGnsu7bkhmbQNoKhohMs8tn9Jf3A7dEh//aDuea4KeJRvTRTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2muKaHGixE0KKEH/0yR5GyPM+ozIjyW0wAgxPqSPJqA=; b=k2MQ1P49nrOkmxKp+KxXfcTO5HcNutm+4hZXPlG5yLBiEHN4SvZB264vFt3VadoxtPLfmLmJECLc3oIPj8fDNZyvWUjPRR6oOUMxPCxmwKPRP/KJDK0IGuntZ90yzgpFrsSb72q1syxBZYHpucc+/DpyORGa2ziizwc4k4yKr07d/iCFUeIyXAOTPITlca+OMu6K+iU3IZ7LjznCbZSu2s1s8HydGXCQFplPS5r+GDzR1ckL8sQvxNtr2z7nHYtzRiK6cFPim8h79virEY0Hdu6a+yISNQOCeYjU7bUBkoTQS9pN1QOvVxrg4PpLlw2V58xBIoN1P1YYA3HDlQgD2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2muKaHGixE0KKEH/0yR5GyPM+ozIjyW0wAgxPqSPJqA=; b=fwFz5+ymh23fpDOo3ScrObv5FJ2qXOy6v9FwA70D6M/hLJmERvlWuwVrs7YMaZNXvWqTmBuKaa3ZZwovsnk9XN4jqqELZALTtWRtmT7XlED3dljglWRZQRuhLegHBBr+gcRtVhR61KWobPujTt2eM34X/vUiyASrGx/jbsnLxn6nd0PoYjWFYQsBWXJLiKKLDemxJ9Uk+yWwY72ARUyde5YauGUImOZMOUEPPVnwCrSd+22a0MMYjhSgkZvjJCNJpDfKx0goCawXVv2JI9fEog1fv7G1MDXULh6k9Yzw9UcsVcWKoQHOfr/fMFj84/qdzU4z/Pizhu/jgjHrmeOX/Q== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:38 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:38 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 6/8] systemd-systemctl-native: add systemd-hwdb Date: Tue, 17 Nov 2026 12:51:24 +0100 Message-ID: <20261117115126.14374-7-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P302CA0029.GBRP302.PROD.OUTLOOK.COM (2603:10a6:600:2c1::20) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: b72c040c-5c2c-4bad-31e2-08df44a12312 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|6133799003|261009221727099003|261009221227099003|261009223027099003|261009223327099003|261009220027099003|13003099007|260925022911599003|11063799006|260925021911599003|56012099006|260925021311599003|261028144727099003|261102123227099003|261022115727099003|261021123027099003|261022105027099003|261026140227099003|261022075727099003|261026121527099003|261021121427099003|10067099003; X-Microsoft-Antispam-Message-Info: p9h7eosbLa+Vk3nNmiYgWoV8IrDrfO4mQTOWAQIWTYhLw7iyV5gdvPlO/AORfcUNhJ1OvjH8PlX81zl0Qf4Q921tDS6GsC5g8XMg9J5+n6XLO+nWSMYyS65IOn0X1MaTmEJY1BWD6nh2fzJAT53uqYfP1CK64Q5Ns+A6O+mi6gc94hcw67IYp/de2WyDFQflifKYHaDY3Um0ozFd3KvRp6WOhzlosGkE4JKox8Tk1YD+x29sgoZIDaMQxKX8Y2HFh94g69dRHR4YAAFNIn6XK66hv7gXlfVxgI81jmRTDQrocifFrHUSeIb0kIhktfmRHFjw4eFvNds+FETU+yOzZtfnCLkHMX3pbAj24bDJlepeoF4zJyswNSt5agoHeUGFXn7LcXjvAG7kebLkpviBOJsblhY/DiMW0HG9p6PnZHqinfJRgBUfiEDUE4b/FpxdzMM6iZSL0acAWhDAkWVtJjmV5FtDYG0umIr0NbeylYVECUyD51/lbJETthp8L85oVEhqOcb71kjqSB3+AmP+ouU5usmZ3BjF3zp4/9iRPnNt//kr2FH6Oqy+UHogq8GlCQ/JpiEeUpT26RY172lzkmFuAfdtfWiA/f63qZgZs+LnW3FgIsjeoZ5RzUYfKpo7hp2m2b8S/9iTpf9EaHinHNl64RKHBltbRZarMLC6HkI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(6133799003)(261009221727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261009220027099003)(13003099007)(260925022911599003)(11063799006)(260925021911599003)(56012099006)(260925021311599003)(261028144727099003)(261102123227099003)(261022115727099003)(261021123027099003)(261022105027099003)(261026140227099003)(261022075727099003)(261026121527099003)(261021121427099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VBSJHGE3udvP6KxUftwfzGn77VDFN513cTWhD4kgxfR49wyqzKXVPb+JEIOc7b9Zt2TiiTXWjahwQeptzASOQTF60ilQd6aSaCtSBIGt0DQhbG/hYi3GCqXyxYjR6gFIZhHfO9E9rBeKaEUXSoBX0aMHy9zJFt0j1QM1Y/378unX69Xl8FZhX4hYlahezuDEBIRLNHEyowX1ZPMBt36YFAo9ltcyJ2346RWseV8Po7W7qig8yjGUqzX3HjkoEhLbqMJknzWsi0jcy86kb5YfS7fOdwbmH0HvtJkF1gzc4demN4XUj7u3uv9XHSw1bVxBMYiscDT7K2cl9kNca40+ydVX+g10ykuPg45ENb0o7DZJ/ULxikvFU4v8+9cswYc0Q2zSP9qRK9i4HL1cswRwIxXa3O5fmGf8G4SS/nfQDicALOhp40928TEogQvFPzfjvXhKjezJSF2C/QKDjO0p5t9MTSTcz9CChoW0TA+Rz8Ytkwtwp/A3Rxweri8aXtXFF2GhI7+zNfc8/NwIYerWeSBcpDvhLbBJjNPyysAqpLtFMjGRS8QK0Ga3j3e8kTT1MXHjUSil0e/IsSm/gaS/z5TMh0+31AuFDJKWu6ry8Tgx9fY8MrgLJ39a587F3Tic7cg7c2xJS4oaP0rNFZzASZLSKllzk/errl7TEwSGA+2E9Rk6o70KCbQe5eGRP3cWLnteNaOhUvuq/7ICagoGpRRVyS6YOUJUz/djT4Uxmdv+JXTWTqgV+gRtzSj4kbQ9DnreAh28yiuGNqVVVyOgjJQ1kctYmN/8ZHjFeqCBbcxXa4zBcQ6Zvn8z7kdX0jPdbXneGO2CC474QkiXIgT2GoW6Lkm+qpW7ZodO4WDSm2sbQnfc5oI+oTGXa9+8KYVkEyEW0+K4zIRE5Cz1BqILqlc656uJej3Klw0+mQ+CejU7qBP3lqs+UNbnegbxdraYP7I4ivMRfZoicgQrZFFS5Am5psqcSyk5jvaUkVYbjwFBf2nxX1wVDBlg54UcRx0dwqFgAPN9i+k9ij9ZkNcSpaLoxdH/IbIQMwpwQ/2To2hH/9Bb0fFCn4rugzOmixpd4t52+H+Tpxaxo2HMy5ax2PExp6x9Kv/uBkXZfsC5ncfKy6mcXwHT+4aGBOQqZd2ZlMzr8uX3vUfv0M833IiSlXcpkyeaKbj+d/f4zleFyGhbizfohXOfJYio/Z2VyNsFp9KHymCh0v9dpysaXUvObaMO6POHzAKbzX1c7o10Cihsm0Fr5yYUK1ka0EAnVsTdvf+iPgKWnlqzEG+jdm18qm8EiPX6ToN0gpnBvFzd6fSpNqUwUFsbPK9wH8R3JLYtdgeg1sCylGe0xb8GMy1UE65Vp+QWlpHLkVvZz1W+68kjVKkEp9YXfcbBfDF1HEozU6jYOC6Skh7EK+VKenGBz2HDhFFCqWdViM9CDWRJpXp7lQ57pUwaIMj6ZJYQ/DuFQvNARG0QuL8d8i6B+JFDwuOrS+vJOw6B50UPjSGMwLa5DD80F0o1v/rF4Hnn1rexDBp1RUfjO97MaAaW/bjawsCCEm6IaDtFyhNb/52NdG44MPYwpyc8lFeyJvjEgDcdgOFUKkTA4QHsUA6N1EdxeiP6ekNZi81Fx9vTtp2OXUqXTJPDJxIuQ5UKhZSGWUxLfsqnvenyPZxEHZBN1MYPmKELV5lgP1XqAQIOVc0Tgr1Xr3LackPLqgRSjwtxMoAR7rJfC3tUW4n26YRW8DkLng== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: b72c040c-5c2c-4bad-31e2-08df44a12312 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:38.0092 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FN1u9fzMmhtMgkFpoK3rrK6k3RHR1DSesqJGBmloOKr6V9mXTnAvTaOrXldkUxjCSiB3Q1Van/dsJFj7YskpyxfFoP+zFFZL9ZbtMiKD6d0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:52:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250430 From: Ross Burton Also build systemd-hwdb so that we can generate hwdb.bin at rootfs time with native code instead of using qemu-user. I've verified that the hwdb.bin format is word-size and endian agnosic, so we don't need to use qemu. Add a patch so that source file names in the hwdb.bin have the rootfs prefix stripped, so that build paths don't appear in the final image. This does mean we have to hardcode prefix=/usr sysconfdir=/etc as the target paths, but systemd effectively mandates these so hopefully this is not a problem in the real world. Partially based on work by Daniel Turull. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 2a7c2ddd739db59bc14d781aa919bdd4724b365e) Note: applied to the wrynose systemd-systemctl-native recipe (not renamed to systemd-tools-native). Kept our MESON_TARGET ":executable" qualifier, -Dpam=disabled and the systemd-sysv-install do_install; DEPENDS is left as-is. The strip-the-root patch is only needed on 259.5 and is dropped again in the 259.10 uplift, where it is already upstream. Signed-off-by: Jaipaul Cheernam --- .../systemd/systemd-systemctl-native_259.5.bb | 24 ++++++++--- ...oot-from-filenames-when-generating-h.patch | 40 +++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch diff --git a/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb b/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb index 3c0dcd35a3..34f64e2eb9 100644 --- a/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb +++ b/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb @@ -4,20 +4,28 @@ SUMMARY = "Systemctl executable from systemd" require systemd.inc +SRC_URI += "file://0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch" + DEPENDS = "gperf-native libcap-native util-linux-native python3-jinja2-native" inherit pkgconfig meson native -MESON_TARGET = "systemctl:executable" +MESON_TARGET = "systemctl:executable systemd-hwdb:executable" MESON_INSTALL_TAGS = "systemctl" -EXTRA_OEMESON += "-Dlink-systemctl-shared=false" + +# Link the binaries statically as we don't install libsystemd-shared.so +EXTRA_OEMESON += "-Dlink-systemctl-shared=false -Dlink-udev-shared=false" EXTRA_OEMESON += "-Dsysvinit-path= -Dsysvrcnd-path=" EXTRA_OEMESON += "-Dpam=disabled" -# 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}" +# Target-absolute paths that satisfy both tools from one meson configure: +# - systemd-hwdb needs prefix=/usr so the compiled-in UDEVLIBEXECDIR +# (/usr/lib/udev) matches the target rootfs layout, letting +# "update --root $D --usr" find hwdb.d sources and write hwdb.bin there. +# - systemctl needs sysconfdir=/etc; it operates on the target rootfs but the +# sysroot is fixed at configure time rather than run time. +# See https://github.com/systemd/systemd/issues/35897#issuecomment-2665405887 +EXTRA_OEMESON += "--prefix /usr --sysconfdir /etc" do_install:append() { # Install systemd-sysv-install in /usr/bin rather than /usr/lib/systemd @@ -26,4 +34,8 @@ do_install:append() { # with version 259 of systemd and then this, and everything that was # added along with it, should be reverted. install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${bindir}/systemd-sysv-install + + # Can't install this with a tag "hwdb" also tries to install the hwdb + # itself, and there's no separate tag for systemd-hwdb. + install ${B}/systemd-hwdb ${D}${bindir}/systemd-hwdb } diff --git a/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch b/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch new file mode 100644 index 0000000000..f11199c553 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch @@ -0,0 +1,40 @@ +From 0031715c560e8138cc320f017a0a2c7160b1f7fe Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 17 Jul 2026 17:25:31 +0100 +Subject: [PATCH] hwdb: strip the root from filenames when generating hwdb.bin + +The modern hwdb.bin format contains the filenames of the input data that +makes up the database. This is useful but in offline builds where +--root is used, the filenames are the full build paths including the +specified root. This introduces build paths and thus information +leakage and non-reproducible data. + +Solve this by stripping the root prefix off the original path when +passing to import_file. + +Upstream-Status: Backport [https://github.com/systemd/systemd/pull/43062] +Signed-off-by: Ross Burton +--- + src/shared/hwdb-util.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c +index b42681a289..5386b4e9f4 100644 +--- a/src/shared/hwdb-util.c ++++ b/src/shared/hwdb-util.c +@@ -632,9 +632,11 @@ int hwdb_update(const char *root, const char *hwdb_bin_dir, bool strict, bool co + + FOREACH_ARRAY(i, files, n_files) { + ConfFile *c = *i; ++ char *path_in_root; + + log_debug("Reading file \"%s\" -> \"%s\"", c->original_path, c->resolved_path); +- RET_GATHER(ret, import_file(trie, c->fd, c->original_path, file_priority++, compat)); ++ path_in_root = path_startswith_full(c->original_path, empty_to_root(root), PATH_STARTSWITH_RETURN_LEADING_SLASH); ++ RET_GATHER(ret, import_file(trie, c->fd, path_in_root, file_priority++, compat)); + } + + strbuf_complete(trie->strings); +-- +2.43.0 + From patchwork Tue Nov 17 11:51:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104623 Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.1]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16008.1794916312290085460 for ; Tue, 17 Nov 2026 03:51:53 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=CCngK8Lc; spf=pass (domain: est.tech, ip: 52.101.72.1, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kduYayzbXuQNrO5ORfMmwqRM0oJooHfzKwyB0k6HNg5RfMyPbxalWslTqzQR6jGIxizpQz65GRu5VjLa4hHFNR+0jtqqi2Lz1TSKTSJ+ll3E4GfUqWswbnFlf3OhAyF6UmikZuuepdgBT8IEe2AlxZQfVGVGOSucUceL3jdtbve2VApwLw2nuhjiRLSXrumD+xJNkPd1+kgwKn3m6IwwlLohCW+7CyF+SekwvKeb4PEnhYZOWVcEMPGNptztkFw+rQV9erN1y5tocGFIdQngrJiPA45btSX1ZgeHYjcr/xs0N5lhyWXHA0HgdP4L3W1ZDBanDEsyZw7DK+SNJjexrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8+pv9IPzi8YSunj0N6xQxRvGFLYOsye65+XhJAOfhqY=; b=NP5ZEUvfpHthUyY5nFrrFEqMtpe5Qnfqe4xt2PFKCoAIuO66njAvj3wCkU7JbQY3IC/HWoofSmSorI2nEYKhhsQOrDT+x4ajJmLhs4xL6ndoozZqw0670m5YKJS7I1rJO8PV9BiDvifyqImRAXeOSXwykrxQgorbS7/opTfMrzbEUkfFdOhu7/qMGXR9l1el6qkYBORGTR/SRuEgIhArzIHs8iUfBPh4JAOPt/5qVVr5GDBZlaJeTWTbpmaEinx/RfKpoJhEK94myWQrPwmcwhlElTCZhedfOvABrLGL5ss+fOo2qsLbwbLzg9HGyHn5a4sTsv4S0pK80p7rtPzjDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8+pv9IPzi8YSunj0N6xQxRvGFLYOsye65+XhJAOfhqY=; b=CCngK8LcQAK7cZktWvW6F0y0qbN0e+keAW1Pypj5neyq1iSzezY/xouwCM1GZErby5njvYgCk28ZP8lF6oPRSQAZnTxf1EPIWu5TfvGgQhky5Umf5UFRM2SuowfUzj2eG8eUtLrpUcKISC/o8EOC3QxP5cn71ub3ZMPlk6poEBI8ufQiLVWlDxTzQvkfCDgKPRIbJayExnLVl4oUGx7cIFxqPkAzDj28tabaHr/EVSmZ9GqlF9Qtp2hNTRplEwhK8z4t6jzdgB498CtEGkt2sM/6QS4OxxUt2lNlDtqCjIEyHc7IzrToNzAMaEmbdWJFUx2F97RCqD+ccewyKKL6Fw== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:49 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:49 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 7/8] systemd: no need to use qemu for hwdb update Date: Tue, 17 Nov 2026 12:51:25 +0100 Message-ID: <20261117115126.14374-8-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P302CA0020.GBRP302.PROD.OUTLOOK.COM (2603:10a6:600:2c1::9) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: ff9f8da3-f567-4af4-29ff-08df44a1240b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|6133799003|261009223027099003|11063799006|56012099006|261028144727099003|261102123227099003|261021123027099003|261022105027099003|261026140227099003|261026121527099003|261021121427099003|10067099003; X-Microsoft-Antispam-Message-Info: LDiKUUwAM8uerSgpvL8eLxwH7BF7/teNaQNWr7ySM5pCKxac6afFjNKssXHNN8KTDotOLpmh+Zol0fEixVazyTYm6j2zgfa6DFv9/lekfglgnwJ74/1DbxugjA2kjHFjUyOTBK6TPdia6cYwbyB5xJHp1Be4nS73C3tN6wyPOcuc9qehOd9p7H34B/cbIuRayxj5UGYaL/kmFBR3zqVUvIpGK/P6t3ILlNT0t+CZNVL5UCCqMowgWmBHSV5q0heCVUYhPoKLYH/FtcqcJ/ONglLd9FQdath2Z8fjLMIvjMlXqSfmixAQrlgyPkbM/t3ArFoOCiyp/PKMcF0qfzNCNMp+oGHBnro9ZjpOeguWi8boNyv4mEIKbZKOSzR1aJycBZ5wq5gAfRu5hY3w4RnsCRkevR9r0Y1dvWXXtSxB7vf0slh/NtzPied+TWWQ2Vr76CJmCbFFq82pvQheN9mhbB6pLKMfJzOCOrG/ydYKK06XaiuVpdDQIp+cfjG5vIkF9wync2XrB18HbKDSm9sqc5ysRj0WSJ3wZAukN/a1EF88vHOR0ufw7DcWOtIUIsQazOAXMShBjeJZOCk8nHDUt8cum3C1beVLZrPE34xvMC2a3tlXwCiNOE7K7m292Se5CFNjiMRPxFIS2TwLmK1Zr0ikIDiUiaz6R1kfUT3q3hA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(6133799003)(261009223027099003)(11063799006)(56012099006)(261028144727099003)(261102123227099003)(261021123027099003)(261022105027099003)(261026140227099003)(261026121527099003)(261021121427099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RyfNXD63IzY/7a+vhEXqn3VSmsZOi+EuxmBPQ1IjiGHIT8s4Y0cljxFEU7UkbmcHkj5YI11Fe+Xy8TfLK/pxH32xxVzF23dJGXtOVCw+ayBVn1ZdjYvp/GhJjyBR2XuENvcIl40UFrg/mG6pBif6lXaw5GPTeU6Ibi7cvdgUms7qPLxEmlmtuY/RCUoV2wyjlGyvfAJ4xxVRM1oW7vDBx/P6D+nsvKk6R9CvhzRQF6yOJJu7tVXQehAeQo2ojcSK8p05W4c7Jh4uZiZN+w1zxAc3kS2Y/E5IkqrB1Vj2lFm07dxJeW/lswkE13yYeyEof89Ldu1TlDWHGs1ehAv+QxlygQ5TPKkIDt7zUbdpBQz4JIwQf1dM8QAMMk7f6HKz/FnztzTDuJG/BtdyiGI9bYbBFsA+GGWlRhLDukJe37Ukvepd6fuOQ2v86RW0gCIBuVK1QeR8R5UHIUXpxlbShhe22UnnhT0xZrodsrOCCeRQFaekx3awT1nYbEpAev8IFW+GA7Xbz3CBYgiMyLZVp+m5m/2F/Cp76BybLW3MNQxfnPmCcPtNqok/JRcq2rqdv6TROZucMYuvA+yupkP7WY/jgyXezYTEoaSNuWkNpyVFslzMsmOTboieUMqfX0KI60WIlj3LuA1Vd2IZMX8/xQGFte7bixZA4s7cAifAYaqMx8D7lFBSThK7iC5XgBhpxWhW9IKZ7itlqktBDqurEfy0K6bGCyWuIPo3L01E3s5wA8zeCNDXl3xucoaOwXGX/PEWp4xxhgTubWA0+I9zjGhRpX2O5Q6M9ICzq+LTWQpCwJvsFtUo9I1tpTWv93s5fsYTNOl3XeSPn5wZVMOaGJEVkr3gSy/bu4Is/gLLhNPKTaMcTGiuPX95Eo/HJClwgkekOp0HvsJn8LoGzmFu/yYmRVyKWScl/jwkcmd1UhnEtNrR6bBLp9eoup7ZKnPyxvbfcaSZnmrWnBN1zKdQ6Vdt+H1Gtm35SQbODn1anvke7CdGz/S6PvUT/DABYetM+IsJIu12GPpaR98abOsQ5C+AkKw9VAqAPdhQdSAixq7k50ETAD1qGp1LYANpM8ZjWLG9nSY737jX8NQcOHzWJliYYKNEYjOfpa/Jd7fyvp9d2UelQLWv25I7jmzM/x6FVF8+mLvzjuniAd9K7pmQn7ekOy7EbdLk7mPRw5RxOxquOZ5/3iKJfy8yeBpXwbS7kEO2a9YM5DNQNB/UMzvv+rqwyaUnu2Lglu4lPyrRvG+CurICoU3c6gNECwqy6I8iUF5JDpxBJlKBd3pTo5b9sYG+gPEl0k68rZUx5bQGELZJNX9ldr2RxXHKpLUSxhgq1V5UZ3mqwqGcyCeERTyazSXQGAEzoyNwwELkMA+RY6sIHOgXcG5KTaOWew9i3FoILR2TdLBxKGwJtz69nzzsjqjG1p5qVSoUXvnHzur5YbQ2Sa5XiQgfrJU8xLmHH8h4f9fQYOZIwsag5PCE/2Cwqxq2k1Fb2NUrJhB8uF+e6V661tJtQXcLfHZ5TPpmuS5mKbD/5OykIh42qjrCBlHnV3/iFx0KfXZinu4h5hnghM4ATfs08beBdcPgNZ6Prs7id2KSWQWCElnpyQP6jx0Ov/Dj0pFA0gVLeoLpZZ7u1fIFkd3u1H5ZLoq5b1SHzQveX/RJi4CnLe5MrC+s7d/SNARY4OBrVEChr8062oL/T5/cvOp7xJhTEIGIN/BVj5KOATBZbx3LC37rOU94U3cWOw== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: ff9f8da3-f567-4af4-29ff-08df44a1240b X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:39.6329 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: u4f0KQtemUZyK4ZWaMSv346z24WcF30Ipwr7RbstsendzInBlQgkX1O2ZVRMaxm/ROgO4kQxeQ7Yt8vwjjxrMEw/5AD3fZx4l5tkk9472BI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:52:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250431 From: Ross Burton Now that systemd-tools-native gives us a native systemd-hwdb, and the database format is known to be hardware-agnostic, we can simply run systemd-hwdb directly instead of running it inside qemu-user if we're using systemd instead of eudev. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 7807da168dc097081623b1609fb818e32ac54ae8) Signed-off-by: Jaipaul Cheernam --- meta/recipes-core/systemd/systemd_259.5.bb | 6 ++---- scripts/postinst-intercepts/update_udev_hwdb | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_259.5.bb b/meta/recipes-core/systemd/systemd_259.5.bb index 848e12e8b0..8080377cf5 100644 --- a/meta/recipes-core/systemd/systemd_259.5.bb +++ b/meta/recipes-core/systemd/systemd_259.5.bb @@ -915,12 +915,10 @@ pkg_prerm:${PN}:libc-glibc () { fi } -PACKAGE_WRITE_DEPS += "qemuwrapper-cross" - pkg_postinst:udev-hwdb () { if test -n "$D"; then - $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \ - rootlibexecdir="${nonarch_libdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" base_bindir="${base_bindir}" + $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} \ + PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" else systemd-hwdb update fi diff --git a/scripts/postinst-intercepts/update_udev_hwdb b/scripts/postinst-intercepts/update_udev_hwdb index 8b3f5de791..5b84adfe87 100644 --- a/scripts/postinst-intercepts/update_udev_hwdb +++ b/scripts/postinst-intercepts/update_udev_hwdb @@ -7,19 +7,19 @@ set -e case "${PREFERRED_PROVIDER_udev}" in systemd) - UDEV_EXTRA_ARGS="--usr" - UDEVLIBDIR="${rootlibexecdir}" - UDEVADM="${base_bindir}/udevadm" + echo Updating HWDB with native systemd-hwdb... + systemd-hwdb update --root $D --usr ;; *) - UDEV_EXTRA_ARGS="" + echo Updating HWDB with udevadm... + UDEVLIBDIR="${sysconfdir}" UDEVADM="${bindir}/udevadm" + + rm -f $D${UDEVLIBDIR}/udev/hwdb.bin + PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D || + PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D + chown root:root $D${UDEVLIBDIR}/udev/hwdb.bin ;; esac - -rm -f $D${UDEVLIBDIR}/udev/hwdb.bin -PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D ${UDEV_EXTRA_ARGS} || - PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D ${UDEV_EXTRA_ARGS} -chown root:root $D${UDEVLIBDIR}/udev/hwdb.bin From patchwork Tue Nov 17 11:51:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 104624 Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.1]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16008.1794916312290085460 for ; Tue, 17 Nov 2026 03:51:54 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=y9USmQyw; spf=pass (domain: est.tech, ip: 52.101.72.1, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Pp7X/kkaQ39HwUFYQQyR1QAcHDgZltflm4ZagtwP+sp1Pq4QYjMoMgau1S/AyJsMM8vlMYQA6HguDYqXarkJAgeKPEkDbC91rhrXW+ogdUfFjiDhZraw8GeGZz/5HHE92nfX8llBzu5sttIlT/0FEfT/CJvZVDLiP6JBBA1E3ktsFLHl9m3TUDsC0IksXcDDpNZ/RQ8FuwLnvs1q8QNO06iy1Zit4gY0WeHlW8xlZFu+PohKzaSBVwUhxhHtBCwq9WCNRRuNto4VfDi3vkYSpCMr+49QkgLVmcFrjx6Le1b3fVXBuIEwF7nTj1eyqdax74SebQ/7uiR/hActrFz/Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9OJScWyy5aZ9MLJXkjlL2ARmqSHrADYOecL15xWbDp0=; b=fHgrpwWJXjqq/G+kxYPzC+pzMqnlEui3blgkvVn5OdUEC1GkFqg3IHQ8AmEJPpN3dRiLYz+UUDrUiFBsB/vj5TT4xFIA8uKRDDhRB9/n3NfuUwKjpc0kt1rFlf2AjT4h+bYrxGj/pR6L2ib6zJ1g6wFYQJGJ3aPoubteuM0arUCRQFuP2gE3CAfv4pDRg3PO1y3f5PIqvl2/X1jtARISEA8gF6Icfoz40+653XBE0bqX2rcPlgNgXR/v9z1HnXxqcjv8cVTe9A5WHOhLeCjbx/UNJ/m1FLK8UA0E3N7lBhp7XMcjcAXIA3AYYhGAJpc06WXLkUv1LeSyIMYV3OBh+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9OJScWyy5aZ9MLJXkjlL2ARmqSHrADYOecL15xWbDp0=; b=y9USmQywe09X1rsTzg/8YDbcT7zIRVg1rptUU6L4VedXBMwTUUdnbA5Mh4ducCt/PyWVfyAsYqWR2laaAWDFzUqIv0HfbJWOwDP+xdrEEQhNCF42ruYJuK/S+BnKlQsB7jz3H++cMsFtYeWsYMcZVvVOhrRIXboGH+EY3ssxrqnUfvIj5miewYhWe0Ss5gvRq2FdD/cEonv+jIJPLC5gNEMS6/R+tq1oqqad9wIn7GUkepWLPuJgD13s3umMnD5KVlcK80s28oYPviyQB/JU99xWocmqh6Es1IGEqkh0XuwzpOPAmkiLuqFIPv50rU6bNe+IRNxE4CIU0HTjuJz9fA== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by DB8P189MB0853.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 11:51:49 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 11:51:49 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v3 8/8] systemd: Upgrade 259.5 -> 259.10 Date: Tue, 17 Nov 2026 12:51:26 +0100 Message-ID: <20261117115126.14374-9-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261117115126.14374-1-jaipaul.cheernam@est.tech> References: <20261117115126.14374-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P302CA0024.GBRP302.PROD.OUTLOOK.COM (2603:10a6:600:2c1::10) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|DB8P189MB0853:EE_ X-MS-Office365-Filtering-Correlation-Id: bd8585da-b7db-4ce3-0628-08df44a124e8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|366016|1800799024|376014|22082099003|18002099003|6133799003|261009221727099003|261009221227099003|261009223027099003|261009223327099003|261009220027099003|3023799007|5023799004|260925022911599003|11063799006|260925021911599003|56012099006|260925021311599003|261028144727099003|261102123227099003|261021123027099003|261022105027099003|261026140227099003|261022075727099003|261026121527099003|261021135927099003|261021121427099003|10067099003; X-Microsoft-Antispam-Message-Info: Wg2BrZ+BWdBL5CL/nygdiljIxiLa3x9UdCPv91Gz7mS2xLnbRHheEsE32IgXqlSN00WcMs/TnYuZ44uXuuio+7MfkzdujcNMFFMQhezLW8oaVlLCtDqZOQuOxQrcr45LxJnP5TaiuMazJ1LFRNTR9JgfqVqJGmFQRUpbumqWXyua9HXewWM5jAr3HGsEY/HeFTlnkMU66VUM+CfdM67X37doV4Pk5r9KqiuzNcMJ8qRdnPTdGf7WFynr8khr5tIlLoqckU+Bn2+QKz1qRAQFnOaMLFv5xJGWXJIBtwPQ2aOfDVm8jawsJz3c/1+mPspiN5S/YgJhFdU2lY2eALCwC1klyNc6vEqymAH7a/Vc+OkQpJgL0xMLqtgzmIsMCbUEW8dWZvY/5Aac6LVhvYunMK8LbBGqo6XRFgYqVEWin65BqvoBPyhGMcNuXal7BclEzS3b1N045S4n4brbfy1phfei5vlFFlsINNAMbMQQKlANVvw+zZl8tixNLcMethsfcke0gxLB9OXLyxEz5sGdZucS33m90EmY5/deABHw9cAj26+lprZsvZozore9v5E9y3uxVPvKLy/lNqE2NCQUWLoqkuQCotl8lV5OxQaxQMrrjavydRQ5RPK7/oPO1b+l X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(366016)(1800799024)(376014)(22082099003)(18002099003)(6133799003)(261009221727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261009220027099003)(3023799007)(5023799004)(260925022911599003)(11063799006)(260925021911599003)(56012099006)(260925021311599003)(261028144727099003)(261102123227099003)(261021123027099003)(261022105027099003)(261026140227099003)(261022075727099003)(261026121527099003)(261021135927099003)(261021121427099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Bt0o1Kb4YL4r/5B/Uie45BSGq+nhpvCR3sr3aenCTpEkKb7xQsyx3UAM6X11JWwBXaoMggAdwZzVb3u3nhWaiuBOwxxAFPuZJ8pkT8Qmng/CSZKAHIQGfXEo3Kbb9LhKYL8X+jNMYnb7I1hcEERW/I6cZMDGVvDVyN15d6f0eDQSkp/tHpSUQ6ixJTJHwXIfQvkQOcAtWXlMF18SHed4A0JHgngoEBeEoJBxo+TIa2ZEQj+646RZ7JA0bKMV219Wdf/Pv7V2Qas9I20zdoaFWltE6wCJgCPPSlKqgJjUjbdJRDviXxq2/Hu7IC9gk1vP1OGMKAmjlDZU2L7z7jaFHw5O8ygKGlG8wi+SCtyfeYdqYP9wN/CZdCZsg7Lgw6MdaGLeb5Xm28F6zmwSLpmNXXDYfPHXPidF9TvYlKqS+m6ejKvqKW8aPvDG8BGjfnU8sM6sjOOpFOW0QyeK9+gJjwNn8xzePBApzY2gZczgG0AUr4I9CPrabpFS2V1NV+05q01dPZySIPDxo6g9Qe80U2F72tQ+NirO0Gax3b2RSUoUHHQQSHnWbjEdqW+hAfoq67wQn/0xoA61B7y2fagQmhbWkVM1kdzp4RwDezXkte/tOAR0jkGMUEB6Fec5/ofYnDd7/rv0d5nhmCB1yTIY+uomnXp8cvUQR3P9jYD6oKqsdl8Cs//e6eNq/O5baU/rtAxasQg/FNfhBVp1wzunaWwVSwICQQjQefwy5Z+QTrwPIfXh/owSeiNsiFi5HLeYr0CJf5tM0zJETL/qKU5CxJhNq2ODB3x0UzRRtdnCFh//hW94RlDiW/2Q2mKKikEXKeDRZAQoDoRWEk19tPVtHhhueGYpjFQDSZJfyNrhpQsrZozZDTsO1lKjxTPBJ6p5eJHNouU+oLfcZ/YEJ8iTC5ZDNHmFgfs/MgKQgTLpCBJXSsr1XDL3zsf4YQAUFCJGOCJdgCr6Ghw9Ggyy8uwJctzVBxpyu5hjtngLKJCXJXFS1irJIx/bn/jDusYp1NbHWBYX4dsk3W0VCwEPLTNHke7BWkzK18aSa294qKHt7PeJF0jpUDGkwMY8LfuVIytLgsgvKLeKktch4q2Lb0rE0r8jM5lel5mxYJ9RehrjWVH1ciPtbrtYWXEnmnEVsPwwZb9zdT4MhUHDKVg+T08K9K1S4u+fPovl5DZdnVGfO9ObfSdx48uxcmFk2jC3Y/JNdI2OVtQmUCL0z0lpLwNrribwEriT5GQZqWP7G+M4WejarBTn2zm21C0suWhI3QFmBQU+lvhzAAC1shLhFjMbibpViJmLi4W4LAijkfCYjTB/obRuS3H3eYsnUSJIFk6gP+DOy4tdeAJCUo4xSWZ9eSd7isaiklypH3zgGK/25DKrUgvmVTEFHx6k/VjoQ68CReRtYNeGKMtPNrz7Uj3wXPhpg9ilZ80UPZkk77Fztl9m+NCPj4+fwcChWxpgfBtmJsew4SMER6w3T2RUOIYm7lRKQzc6D/jKuIVdj3YdC/NahxXAVKaURmcNhZiu57uB8+RRGm/GTGQMwPCmX+lK4cw3XpD7HfxG+29YwHP9OBsLghl+oDRhRGQRBxJ1LR+eUURlUTT/lE7PgrWOgwns8tesbXGnnU5sXMoHDJ66W4pQzcNcBnuXmQJbDFcHdPFwZx7wi9dZDUltp1ZdNy/r139cOHG5KjL1IyvP19wzfWAwFVWSVYG5UHuKSr7qaD71KoXneVywQybvlmbFVwId5Q== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: bd8585da-b7db-4ce3-0628-08df44a124e8 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 11:51:41.0825 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: B7XFEyR2HXrhqA1UR8AO2/wXlJF9I9nya8uPfK+V4TqJiC6QziEnTNP54oRBYmVvcEBWKAxhF/64dn1+qwMk+Jxd3u1ME5dKl87hs7WZYoI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P189MB0853 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 17 Nov 2026 11:52:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250432 * Stable v259 release uplift * CompareLog: https://github.com/systemd/systemd/compare/v259.5...v259.10 * Drop below patches which are part of upstream 0001-Revert-resolve-refuse-traffic-from-the-local-host-only.patch 0004-tpm2-util-fix-PCR-bank-guessing-without-EFI.patch * Also drop 0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch: it was added for systemd-systemctl-native on 259.5, but the upstream fix (a9397de9d2) is already part of v259.8+, so it is redundant on 259.10. Signed-off-by: Jaipaul Cheernam --- ...259.5.bb => systemd-boot-native_259.10.bb} | 0 ...d-boot_259.5.bb => systemd-boot_259.10.bb} | 0 ....bb => systemd-systemctl-native_259.10.bb} | 2 - meta/recipes-core/systemd/systemd.inc | 2 +- ...use-traffic-from-the-local-host-only.patch | 61 ------------------ ...oot-from-filenames-when-generating-h.patch | 40 ------------ ...il-fix-PCR-bank-guessing-without-EFI.patch | 62 ------------------- .../{systemd_259.5.bb => systemd_259.10.bb} | 2 - 8 files changed, 1 insertion(+), 168 deletions(-) rename meta/recipes-core/systemd/{systemd-boot-native_259.5.bb => systemd-boot-native_259.10.bb} (100%) rename meta/recipes-core/systemd/{systemd-boot_259.5.bb => systemd-boot_259.10.bb} (100%) rename meta/recipes-core/systemd/{systemd-systemctl-native_259.5.bb => systemd-systemctl-native_259.10.bb} (95%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-resolve-refuse-traffic-from-the-local-host-only.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch delete mode 100644 meta/recipes-core/systemd/systemd/0004-tpm2-util-fix-PCR-bank-guessing-without-EFI.patch rename meta/recipes-core/systemd/{systemd_259.5.bb => systemd_259.10.bb} (99%) diff --git a/meta/recipes-core/systemd/systemd-boot-native_259.5.bb b/meta/recipes-core/systemd/systemd-boot-native_259.10.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot-native_259.5.bb rename to meta/recipes-core/systemd/systemd-boot-native_259.10.bb diff --git a/meta/recipes-core/systemd/systemd-boot_259.5.bb b/meta/recipes-core/systemd/systemd-boot_259.10.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_259.5.bb rename to meta/recipes-core/systemd/systemd-boot_259.10.bb diff --git a/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb b/meta/recipes-core/systemd/systemd-systemctl-native_259.10.bb similarity index 95% rename from meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb rename to meta/recipes-core/systemd/systemd-systemctl-native_259.10.bb index 34f64e2eb9..e348966230 100644 --- a/meta/recipes-core/systemd/systemd-systemctl-native_259.5.bb +++ b/meta/recipes-core/systemd/systemd-systemctl-native_259.10.bb @@ -4,8 +4,6 @@ SUMMARY = "Systemctl executable from systemd" require systemd.inc -SRC_URI += "file://0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch" - DEPENDS = "gperf-native libcap-native util-linux-native python3-jinja2-native" inherit pkgconfig meson native diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index bbcacf9deb..ae3a034ef3 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=c09786363500a9acc29b147e6e72d2c6 \ file://LICENSE.LGPL2.1;md5=be0aaf4a380f73f7e00b420a007368f2" -SRCREV = "b3d8fc43e9cb531d958c17ef2cd93b374bc14e8a" +SRCREV = "cc6062f23cb595c172d9a007ed99d925852bfd60" SRCBRANCH = "v259-stable" SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}" diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-resolve-refuse-traffic-from-the-local-host-only.patch b/meta/recipes-core/systemd/systemd/0001-Revert-resolve-refuse-traffic-from-the-local-host-only.patch deleted file mode 100644 index efdc2852f9..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-resolve-refuse-traffic-from-the-local-host-only.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 658e5ac06f80ee2078b034f7cc483204d7f91c5e Mon Sep 17 00:00:00 2001 -From: Bret Comnes -Date: Thu, 26 Mar 2026 05:59:09 +0000 -Subject: [PATCH] Revert "resolve: refuse traffic from the local host only for - queries" - -This reverts commit 526f1594daec073269c3e70ee7914f6dd8740d5c. - -This revert is necessary because the change breaks mDNS hostname stability -whenever a DNS-SD service calls UnregisterService. When a service -unregisters (e.g. on process restart), manager_refresh_rrs() clears and -re-adds all RRs in PROBING state, which sends a multicast announcement -(QR=1). The kernel reflects this back to resolved's own socket. Because -the local-address check was moved inside the query-only branch by the -reverted commit, the reply path in on_mdns_packet() is now unguarded. -The looped-back announcement matches the pending probe transaction and -completes it with DNS_TRANSACTION_SUCCESS. Since the zone item is still -in PROBING state (not ESTABLISHED), dns_zone_item_notify() sets -we_lost=true and calls dns_zone_item_conflict(), which invokes -manager_next_hostname() and renames the hostname (e.g. foo.local to -foo4.local). This happens reliably on every restart of any service using -RegisterService/UnregisterService (homebridge, avahi-compat wrappers, -etc.). - -The top-level local-address check in on_mdns_packet() suppresses all -looped-back multicast traffic before the reply/query split. Restoring it -there is consistent with the overall design: dns_scope_check_conflicts() -already has its own manager_packet_from_local_address() guard and is -unaffected. - -A more targeted long-term fix (e.g. guarding dns_transaction_process_reply() -for mDNS, or avoiding unnecessary re-probing of already-established records -in manager_refresh_rrs()) can be pursued separately. - -Upstream-Status: Backport [https://github.com/systemd/systemd/commit/658e5ac06f80ee2078b034f7cc483204d7f91c5e] -Signed-off-by: Peter Tatrai ---- - src/resolve/resolved-mdns.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c ---- a/src/resolve/resolved-mdns.c -+++ b/src/resolve/resolved-mdns.c -@@ -415,0 +416,8 @@ -+ /* Refuse traffic from the local host, to avoid query loops. However, allow legacy mDNS -+ * unicast queries through anyway (we never send those ourselves, hence no risk). -+ * i.e. check for the source port nr. */ -+ if (p->sender_port == MDNS_PORT && manager_packet_from_local_address(m, p)) { -+ log_debug("Got mDNS UDP packet from local host, ignoring."); -+ return 0; -+ } -+ -@@ -532,8 +539,0 @@ -- /* Refuse traffic from the local host, to avoid query loops. However, allow legacy mDNS -- * unicast queries through anyway (we never send those ourselves, hence no risk). -- * i.e. check for the source port nr. */ -- if (p->sender_port == MDNS_PORT && manager_packet_from_local_address(m, p)) { -- log_debug("Got mDNS UDP packet from local host, ignoring."); -- return 0; -- } -- diff --git a/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch b/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch deleted file mode 100644 index f11199c553..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0031715c560e8138cc320f017a0a2c7160b1f7fe Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 17 Jul 2026 17:25:31 +0100 -Subject: [PATCH] hwdb: strip the root from filenames when generating hwdb.bin - -The modern hwdb.bin format contains the filenames of the input data that -makes up the database. This is useful but in offline builds where ---root is used, the filenames are the full build paths including the -specified root. This introduces build paths and thus information -leakage and non-reproducible data. - -Solve this by stripping the root prefix off the original path when -passing to import_file. - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/43062] -Signed-off-by: Ross Burton ---- - src/shared/hwdb-util.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c -index b42681a289..5386b4e9f4 100644 ---- a/src/shared/hwdb-util.c -+++ b/src/shared/hwdb-util.c -@@ -632,9 +632,11 @@ int hwdb_update(const char *root, const char *hwdb_bin_dir, bool strict, bool co - - FOREACH_ARRAY(i, files, n_files) { - ConfFile *c = *i; -+ char *path_in_root; - - log_debug("Reading file \"%s\" -> \"%s\"", c->original_path, c->resolved_path); -- RET_GATHER(ret, import_file(trie, c->fd, c->original_path, file_priority++, compat)); -+ path_in_root = path_startswith_full(c->original_path, empty_to_root(root), PATH_STARTSWITH_RETURN_LEADING_SLASH); -+ RET_GATHER(ret, import_file(trie, c->fd, path_in_root, file_priority++, compat)); - } - - strbuf_complete(trie->strings); --- -2.43.0 - diff --git a/meta/recipes-core/systemd/systemd/0004-tpm2-util-fix-PCR-bank-guessing-without-EFI.patch b/meta/recipes-core/systemd/systemd/0004-tpm2-util-fix-PCR-bank-guessing-without-EFI.patch deleted file mode 100644 index c590b01cd3..0000000000 --- a/meta/recipes-core/systemd/systemd/0004-tpm2-util-fix-PCR-bank-guessing-without-EFI.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3cef11c710e95bb5f891181e9b2a6d8f174712c3 Mon Sep 17 00:00:00 2001 -From: Patrick Wicki -Date: Fri, 20 Mar 2026 15:56:56 +0100 -Subject: [PATCH] tpm2-util: fix PCR bank guessing without EFI - -Since 7643e4a89 efi_get_active_pcr_banks() is used to determine the -active PCR banks. Without EFI support, this returns -EOPNOTSUPP. This in -turns leads to cryptenroll and cryptsetup attach failures unless the PCR -bank is explicitly set, i.e. - -$ systemd-cryptenroll $LUKS_PART --tpm2-device=auto --tpm2-pcrs='7' -[...] -Could not read pcr values: Operation not supported - -But it works fine with --tpm2-pcrs='7:sha256'. - -Similarly, unsealing during cryptsetup attach also fails if the bank -needs to be determined: - -Failed to unseal secret using TPM2: Operation not supported - -Catch the -EOPNOTSUPP and fallback to the guessing strategy. - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/41231] - -Signed-off-by: Patrick Wicki ---- - src/shared/tpm2-util.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c -index cf11b50695..c0590fe575 100644 ---- a/src/shared/tpm2-util.c -+++ b/src/shared/tpm2-util.c -@@ -2702,11 +2702,11 @@ int tpm2_get_best_pcr_bank( - uint32_t efi_banks; - r = efi_get_active_pcr_banks(&efi_banks); - if (r < 0) { -- if (r != -ENOENT) -+ if (!IN_SET(r, -ENOENT, -EOPNOTSUPP)) - return r; - - /* If variable is not set use guesswork below */ -- log_debug("Boot loader didn't set the LoaderTpm2ActivePcrBanks EFI variable, we have to guess the used PCR banks."); -+ log_debug("Boot loader didn't set the LoaderTpm2ActivePcrBanks EFI variable or EFI support is unavailable, we have to guess the used PCR banks."); - } else if (efi_banks == UINT32_MAX) - log_debug("Boot loader set the LoaderTpm2ActivePcrBanks EFI variable to indicate that the GetActivePcrBanks() API is not available in the firmware. We have to guess the used PCR banks."); - else { -@@ -2811,11 +2811,11 @@ int tpm2_get_good_pcr_banks( - uint32_t efi_banks; - r = efi_get_active_pcr_banks(&efi_banks); - if (r < 0) { -- if (r != -ENOENT) -+ if (!IN_SET(r, -ENOENT, -EOPNOTSUPP)) - return r; - - /* If the variable is not set we have to guess via the code below */ -- log_debug("Boot loader didn't set the LoaderTpm2ActivePcrBanks EFI variable, we have to guess the used PCR banks."); -+ log_debug("Boot loader didn't set the LoaderTpm2ActivePcrBanks EFI variable or EFI support is unavailable, we have to guess the used PCR banks."); - } else if (efi_banks == UINT32_MAX) - log_debug("Boot loader set the LoaderTpm2ActivePcrBanks EFI variable to indicate that the GetActivePcrBanks() API is not available in the firmware. We have to guess the used PCR banks."); - else { diff --git a/meta/recipes-core/systemd/systemd_259.5.bb b/meta/recipes-core/systemd/systemd_259.10.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_259.5.bb rename to meta/recipes-core/systemd/systemd_259.10.bb index 8080377cf5..a6a86a5b81 100644 --- a/meta/recipes-core/systemd/systemd_259.5.bb +++ b/meta/recipes-core/systemd/systemd_259.10.bb @@ -38,8 +38,6 @@ SRC_URI += " \ file://0003-Do-not-create-var-log-README.patch \ file://0001-meson-use-libfido2_cflags-dependency.patch \ file://0018-shared-fdset-add-detailed-debug-logging-to-fdset_new.patch \ - file://0004-tpm2-util-fix-PCR-bank-guessing-without-EFI.patch \ - file://0001-Revert-resolve-refuse-traffic-from-the-local-host-only.patch \ " PAM_PLUGINS = " \