From patchwork Thu Nov 5 11:09: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: 103109 Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.66.21]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.31622.1793876978210880068 for ; Thu, 05 Nov 2026 03:09: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=stpJ++Bp; spf=pass (domain: est.tech, ip: 52.101.66.21, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NGcLg1xkMCA7sxcjxIq5YNZbQ2QYPgZRHBTdYsiHRxwuDUr8Td13Htn0CUTsKTdmmmDzT83eIaRsII/QfxdaYC+7LdgiI3Xr6tRHbtLWC2xNPiRNAGWsTPzbf9v/P2z5j9dTOEIuACShrs/fe94lmP6mHn6Rnspg8RflCIYolFzWV00cvzCbsaJ3nez+x7yI1umClTU9knZYQx6zE4FsTFGZu/lxNCSu5Snc8CM4M+F697GMjV/KKqulkiDMJAM19KJ4s5vvK94xdXOM783Vk4H/9ZwbGqwstybOWfOMyjZgQYfo21aLlxiIi+6wlZLFCcV+YbiBJ7MyxcIMX/yjZg== 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=UAwghFu9cG6BWZmCrYG5CSFs5CdK4qCSjpts2eanVp1U0O2OWGNiSXncN2ILIWDES5g2ITBKFXfS/GVaaJafedDV96kRgTGkFy06UVXtVmxG2JOo2SmFSWaB6b38OZd2YKsVd/Hwxg63E0mfy8KlXeNddvU/Qpg9cgR/83q5Iq6NrU1+u+CjYGwCyXDCB+H8ubxRqAywY0rzMFiSJ/ci3nOXa05uXu0FoaJ8fTg07Gpka2p2d1RVsYU3eeAYT7jKamP2Q11flVX5JGqqDE0Y2/k5cIyd6KKLoGw2Djv/8BiGkiRM4YyXq4hAZoeffVOcQ2gpEYkMfyj4DxLRPyJbZQ== 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=stpJ++Bp3VwLKFsDlV91R+bPLl7LAjRHTcb7mR0TYuZAaXaehBE4lrkfDVaRjwRA5oYqbn71YPwROIqZ44uxC62F+UeZ81MN6TyY0ehxUi7SbP6ki+MZwT0fVsmmF0WGdUzvbRD1BfG6ASlhqL7DLblSV2MRpQzPp5iyexvR6ADfUpw+jQBcTxBWNiDYlK2DkAzi8BzcrjO/Dko60E7JWFrtYgHqqsZeWzL+dxjPXd0QzU2zL9UAk8Mu7uKbGwFGF+0HeT7/4SgUTavMkpMBZSF8O96QnqrMCL3RsrXBKK7Gleu6Exzv002Cl7ieIcefR88ObtjFGllIvRWW2f1yaQ== 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 VI0P189MB3462.EURP189.PROD.OUTLOOK.COM (2603:10a6:800:2d2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Thu, 5 Nov 2026 11:09: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.0592.009; Thu, 5 Nov 2026 11:09:34 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v2 01/10] keymaps: remove obsolete systemd masking Date: Thu, 5 Nov 2026 12:09:21 +0100 Message-ID: <20261105110930.52643-2-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261105110930.52643-1-jaipaul.cheernam@est.tech> References: <20261027110126.9383-1-jaipaul.cheernam@est.tech> <20261105110930.52643-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: DU7P190CA0029.EURP190.PROD.OUTLOOK.COM (2603:10a6:10:550::23) 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_|VI0P189MB3462:EE_ X-MS-Office365-Filtering-Correlation-Id: 6af75dc6-cdba-462a-17c6-08df3b2d460c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|1800799024|366016|56012099006|11063799006|4143699003|261026121527099003|261022105027099003|261009220027099003|261009221727099003|261022075727099003|261009221227099003|261009223027099003|261009223327099003|261021123027099003|261028144727099003|261026140227099003|22082099003|18002099003|10067099003; X-Microsoft-Antispam-Message-Info: Sr82PzTUIXfXELSO17QezSFtB+LjGTFXz5a57eBLQcmNzhsRN+RTF9EUUVFzUPweiBvOPUDqCMShzUQxIz40tmBuCqYS6IgYoG7gIps69ywsynYNOkj68ciTtAoqMwNMRftiHQqp/aI7vyBYEIe72zt5USOKc1XTbf+gK2PIcH5JYgmMtJFbGpNyS2FNUyQj8qOj9tv+6lpCCKmi15LFmEdio4IBDW638xWNdYvVfTi2HPuD+rccLDdsphby5oI+A6WmS1t5RW1R/ttdEuE96ZLPl/9W/3s2nVZ1pMW0TYcqnYFocbiWtPLXvQ3zOp5iw/9oyj/HlM6vdr1dyuKK8oeP8WudLvaSLfyvWIzsm5b52Cdume1GVcof2fR3+P/qpYI7uv7WuZnt7au98OR3ImB3Zbw8/xJoZKwl0wmZot6iPXJh4lmnmtVk+73PAxE5KoksSLJm3LHHXfoFpMioYCCNjxglTaAHevPu5a5pc3Aa7A9qrVPOXo6mt53mRu7jAZ0zKk0uPaVfKIFVOQKWb1nJxfj2BR9GLFyjzhVRmo7RibDqiZrasEDJXBP/oiBXoIdcDcuw1VgJ8PpOqI2a5Lpwr+GwYg5VmkmDCJy61+ZwdyPb6g0RtVZjccE1gbNin3XA7qjqkH0qk9AG4tjufMoQis/mI8UKz+IuUslTJvk= 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)(376014)(1800799024)(366016)(56012099006)(11063799006)(4143699003)(261026121527099003)(261022105027099003)(261009220027099003)(261009221727099003)(261022075727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261021123027099003)(261028144727099003)(261026140227099003)(22082099003)(18002099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Thhk111EvVgCwTmE3NbH5w+1737BABmbXiMVpKd2GksukrJgKlBVNTnN57V7uAvzH0iWLzV0vOLK2+Xd5tnmSABUadW7o5n2VSGV6R5D1p+cIcHgB0eb7txtcL/SC/0pxnQS5e2CpjglowQeNzXxruC+/mIgIvpQGsNRHIBCCVA+fI5FnRxBF4RYbp1j3/d7QUCpwyY/WRz/B01C3oGrBVjywm8RJjrlezg9dC3NkMNyzfoeRXC1dyNuefhr3BVewYbzrvRrahc5l+3IP+fNKD1YqpfzNeOfwUmHHc+oDcJayJm+87ddArgKSlkXnbX2gm9IVvJ1jnJdfL0a58JeAxINHfkDW+MgT+L2UvwchXFaHkX7FrnQn9BTYMowihamV7/NiUJGQog96JpwZth/wRjk6vHG9ejQ3cuzHrEzMY2f4YUADo7BBfo7yE3Vyj/4zy9d+uc/qyT8Ri6Pr4ksgURZ/EU6kECpyNLE6MBtaDLL10vXLDlgy9apVuzq6h9498DRtTZubdT1kj4vYYyh3AfO9+LLv5uo2HIxOVv0dTyeUgnZdr6y9mGlaBbe+aIpGfI80YHgBHAsy63mYQlSVlh2u3ex3FEST3i4v6BaGtHK5x7m0exp60abUFJ8bKl8a+JiCMFM2jsHi7QJNVQUOkGBeiLtiLsWbAsiuV0D952VJLRV7Gm+QtiZyowmJX/HteIsphXc3P+aK1VEYj2DGuhVD+8dr7NPYrsvuQuKM+y3/1Kls7nDN7VhZYZrbSF2uaZxG/g202ed6OZG5avbCJ+imwG7dUS45TIbV1PqplVh/kHCOFxk3RdGVD0dRYxjFD9PsR4IGLE+9hmPeH7tsvGTBoQPp6Z4LFp5iD+/FAmFGmZhBMqYaObjhrkSJN9QM4UVpJI1pnlj+tRkwIcN9sih8aFMr8/3t9gU4zyy9TQNRkTLm08jM0SlL7qyThptwnNvw3ukbld32gXxjDubiRY/Kx6AzTKI7cAcVLBVvN6ntIbFbxxvodynCxNZXw1P3XNklh16Yus/3+giZFynljZVO33RM1rbfLEnpPg57hQsXnz9jaZ+H3AxSiwWp+IMWWwrprNAMJKXme7TPEahmidbFKJ+/QNgdC8u31hvI4eHDiQrANihisQ1nB6J3FLm3vC6VTICbjA+JZxB0Y0dnVREbwkLbZbYNc3Yq/nfXr75Te9+TngL6WtWS+RfOskfCgZeT5DcWzzKNKDmtWQk+jYK0aChZ2bChydeHCu6Td8PLf0VHvW4dpinVS5EQldSJiyyd21gDqrTC+z21pM4FnO4LlFvOYaD1XURqEN7VVfdrghTbHUpf3PBI1yQYrVZ/FvENdSF/YJJL1gROYNNgpYL/XjAzoB8lg3wzDf5C4kEewvFJunPskEFIEmgEVEXwJXixlzlR5VIch5VilcndDksJgsIhtpGjt/kwQyVArNUqLat2jlvJhT+0cTZwhr2Kc6NYQCy8zYob+YjyEh6+gJGqZOXIRYHjCAdk06qhtGmbYp9q4MA6ueizD0mBrvfoGIB9/RcMZe3L8VKi3kevTHLq2wUILecS9o2gWJ7wVBEzCZTu2/MonbtaOgqtLGJpHfoT4MTGfvbiUHx7l7eTQwYCcFXc8lCKGcF12g672mitnJq0M0bYFNdzauKjKO84KMI8W7AB5EnV/7wfgkvU/aYxPnHEtWDXWVH6VJSBsAFSI361F6+yxmSv5sFYUiUyTZXEah2DpRJjJMw66Pebw== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 6af75dc6-cdba-462a-17c6-08df3b2d460c X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2026 11:09:34.5744 (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: 1yGPasyaD74L7gphzeItpsvHYf/kvJ0SmfSi2wT+kjr5VR3wtqZzgUnnG0Llh1jzbn3aE0h+MGvsprCUxrDC4lJFrd92Lw/4EpyJoSgmC7g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0P189MB3462 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 ; Thu, 05 Nov 2026 11:09:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249528 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 Thu Nov 5 11:09: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: 103110 Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.66.21]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.31622.1793876978210880068 for ; Thu, 05 Nov 2026 03:09:40 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=w74rPy2g; spf=pass (domain: est.tech, ip: 52.101.66.21, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ybORU3vMk+MU/Z7HPI13XwH3hQmdxxvV8iaGNENJJET9Ukxa2NJf53qctBHYRgMrSOEDio/kanMfEpXJPIuA7aukLoPJfqyvUEkfbmJE3ld7LfVXCTeRmaahXSg+EzZYS+S5UlsNvYGj8JyBas5zDotO9iWpq4xgoWAEWmhhxK2NoU2LPJsq+Z6rmc4kPSAOuy/ZeXJf53HRZY7dFgW4iOtBi8r4YTMWxG9fnETjY/x7nbMAKikoh54VtbohaWU3KwJX02djYAG/YlG8E3F04JnQkB16MrOXOil7OAvp57GT6c1FqArgF80hPa81saa7Jsd+gGJWeNPasmjOji1d5g== 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=uzHx1hbvVPLVz2pnifPZgFD1Jz9wwSh2a2556hxp9LcWB5JoiQmznAMKeStLTtwuW6+W93xq6XYyhKbEVVmR6sVmxFNOQHVI1djXWj30vB+S83glXF+PxxdLnMv9uuQ2BMPottkWul5ztLCO8aIUtMaN9oXrsMzyLqsIU8XPNbzbZvTVCj1XITWmR/XgMpVgKNc6dZK37DvFNDLGQVrjxAV/oLaQ2Tu3vyVK1AUT325bjNtVjKbrneyJ3EpOe4pofaLr/fqTbv/6dCIIpUD45pXVZCQmN0pT1BZ1/itowMijdZ9S8Ngke5s3T3ijlTNir6bX2WdZRi0TX9AHHrXpWw== 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=w74rPy2g1EGYuqDUFpiwKpMcj9cSPijcvD9PLav7hmjVUxQDZZvzx8uS2kJI2mI6+nxT9CdERsLX1Sc+baXG6ixvqBjEyy7CbNLecRHskWGdFqp7V8qfCCnbxluoUtqmiMNRwltKxbtlWFu9uPuWuGPRzaIHuujbSt0c/bsiFDptxLjPMOUx4km2gBbreYaEr892a7evVwFigUkUlMes5uS4IghdED/H6CzcJZAKthbG3I2695bzJjmCZQF0sLljUzwvAyxh68wwaV7+kSr9fGsErdwdfXar65NXgD7ok/12Qyu7EB7W4LjZVw2AcUZDgSQ+Mf6IAurg4/1pFgbrGw== 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 VI0P189MB3462.EURP189.PROD.OUTLOOK.COM (2603:10a6:800:2d2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Thu, 5 Nov 2026 11:09:37 +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.0592.009; Thu, 5 Nov 2026 11:09:36 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v2 02/10] initscripts: remove obsolete systemd masking Date: Thu, 5 Nov 2026 12:09:22 +0100 Message-ID: <20261105110930.52643-3-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261105110930.52643-1-jaipaul.cheernam@est.tech> References: <20261027110126.9383-1-jaipaul.cheernam@est.tech> <20261105110930.52643-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: DU2P250CA0004.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:231::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_|VI0P189MB3462:EE_ X-MS-Office365-Filtering-Correlation-Id: 7bb2f9e1-6a9f-49f7-b302-08df3b2d4708 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|1800799024|366016|56012099006|11063799006|4143699003|261021121427099003|261026121527099003|261022105027099003|261009220027099003|261009221727099003|261022075727099003|261009221227099003|261009223027099003|261102123227099003|261009223327099003|261021123027099003|261028144727099003|261026140227099003|22082099003|6133799003|18002099003|10067099003; X-Microsoft-Antispam-Message-Info: birA9InoYd0tCYuKMWs3dlWKNIzK0ZPVuK0FZ48TM/KyQZkvH8jRWCK2LbJpeNGcNQh8V2wrI2xoMpFcT0RjISddksxDrvz5KZa6l4ELLlsR0oP24ZoFJmxaA4XdMFB+3WYq58AB6ybUME+K5s7vOg9cmPO6txtImbHtG4cKgwXZH1ilS9XGLc6EOH4OJizN2EbiN5+L4ClcjaTpFX17uWZ72uuF9XMN4af/enlcWEMKfGeUckjYeHnxU0POC2jIL/ygfSvvb9CitCQx61mqyu2NzzDSpInubthbpOKX6IAXqEyJa9J5HuxGYdlbon9+gZ2FRYafGv4vn2Y5tqUDe4A3UFXEcqqzidyHKwHs8cCVy/E5ciqQ3S1UHtb/N/93WGTQwspC6CMcXnuHBeOvhcx4CzJ8Zye7RPHXhR+mQATrLy/W/69XQXoKOa8IKv7Yk8NmQVMH+laZ5I7ZH2P6Uv4gi/4mZukensGJDsEUzOGpsyTRq9RG3wA7ERM3RTP8THdO5m/4MrRs6oZNTy7WCaKJVdg+YGWBZF/zc/KgVAoh5eEILHAyExtes07vVWNugm8L27oYlVGzi5Z1Pt0P+Pj+MNLFgY6cGS77Rwo7cOicmWnPDZZ273YzVNdzfuzEOoXrK9s73aNlTvm8VAtWRZTiahJDyT4V8YIIhUiGgfI= 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)(376014)(1800799024)(366016)(56012099006)(11063799006)(4143699003)(261021121427099003)(261026121527099003)(261022105027099003)(261009220027099003)(261009221727099003)(261022075727099003)(261009221227099003)(261009223027099003)(261102123227099003)(261009223327099003)(261021123027099003)(261028144727099003)(261026140227099003)(22082099003)(6133799003)(18002099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oLVRIRBFaFubZfIAzpVB9npaPaUB9yNxC9/5RMpPxDtARi/udvlC3blhn0/N0FYSX+bwMLuIz3OuPnBztTvS3KVM2urNF3Q/UmvKDW0kbB2/Vst9sZs8Fu4bio6fWwfipYBcot8Ctrlx0k8tMumOyqS/dE87CmUccoz14hb3ENJK2BUClWqnAJIOV/nh0DWId5Pfai29y6v0wtHYOtP/z5v2ZEBTtq2rBJ4uE+yiDSP5R+pegHSA4blr7Tr2sP8y/6fxzj0uYUI1UKJc4IszTnmesQ07dqsDzQhpnADw/iDtryWTLFFupkD4yT+A84nef4maUYyP3CobB1Pc3QNfC2pVg7e2OunnBFPTTdPD+5806CeePprVRlP4JIOk1WkanEVy+jeMbsniaXOgoBv5Bii5WcQ3gPmkaJ9OYgMeGTG7oDvcPTUuQ16PoUYOZ8+MAyaamq11KMtO2+Wi4SGIoP7TIgPMI9WVxYlnhduBe3BO1Vkl/TRR8/BMRDmZj6tJA3griDvYbEQ3lK/JlxIGuUmUhDUcJvVjCx2MjjTG3zxEI228Lw/5VL+Nn8BFZyCmenqP5N0B/Y46oyNt9iEfxS/Z5KtEchtx9iCiftroTBUT25nNE6SmORjY10gj7quCOel86byjEZehooUCmDU379kCztr1jmPHNKTzEteiI43z7iSCF6cHVDnDps5Sgxbw0eNhXbIgOozyv48SXcnywVfVwvgwupwTIHgWd89Fz0fxhva5fEAtO1EmtLI7ySw/bTdeY2OP0QSxhpoYvKroiYaNS+uSYmBk2UjgFPNpOP3loguoujEXuSUIEV2fDRAbPgb0IulxPB2VbbTceWBJ+Vev3z+EtksvrFgniiosTNsHbRzsn8+S4Ghol2t1F6IKtWhLLVuOSFqF1dT16y46YPUoyz4xd9cu906aaOAJbbWG60f6wNWjH8w20HxWs3YA6HiNdn1Qnl5WNyq3Vmb6LU1lawxqZhzIo06Y2T9r3UG22Pg4KVqPakelQagR6f3ZCw3qra78Hh1C2+l5bJfbx5gj9WWyhA0lURWML+vz5sz2Zc2k44Dgb7G8PZsIAckOHxE+AARzUQDBrXoX1XA2LFBdcG5p+a43O6X3nlKnosZ9VT5lxeRzLEop4j0Ve0MpXQRBDKG9hNxgNVDNfKe1mptvaCQNfsc4nybUrPmxRN4zxwkLOoUlwOBcQ4XerfOMgmDhYgnXuwBxjojurq2bv/Q9ApMdS0vwY3PQERq+2D3fLrdjtoyjltQNOvSz6n8+4eG/IbFHH/H0TI0Sb1nAEKcyqcHIAkeuSnPEYntL/l4k4uDMFN3xxY1JFvZr7MSjs6N9y0WkdvyUnKe8WnEoFbHYI1WRfWdmvjvj2Xw53Q7asMkFfTgFBseeVUbOrjaWLeX8oz32+Ngrj4cnr91FgtU+erCY2Rc9u+kizOU+JT0KhzWCGM2jtV2dknO1OQzUSSqxCB/RsvRh3Twjw52ep7mwCZ0SMxFiKXAadIkIy4QkLzCucs0oyxvaEW4o2/JSeGwoQC7zbMIjw4aqiYWwoG3HV7RqSftS0ZyNIiDB/txAYA/62opfZbM6RRwzaiEOZFcNuIco6Vi7h83XgIvmSFuUC71g9xpoLEcZ484ph6C8N5rPE99mrUSLGsb9WyZDGyXweWvjRaJulOOYvKaT9lLzMBPV4XL5la+v6sA3I+YqfbYg9CiyUN4SjFlEDePc488SvtxemS0aDFNcK+aQBw== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 7bb2f9e1-6a9f-49f7-b302-08df3b2d4708 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2026 11:09:36.2432 (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: fEpeOUJdie45UgZU265UdetJb8L8xWx80ITrJKu9b2+tRQAWPuV0cNR/RSS52shLFJeEEXIAdkvW/sXPKJRVxeR0VXdp68yemHDdtcn7CrU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0P189MB3462 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 ; Thu, 05 Nov 2026 11:09:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249529 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 Thu Nov 5 11:09: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: 103111 Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.66.21]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.31622.1793876978210880068 for ; Thu, 05 Nov 2026 03:09:41 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=E/yLEXST; spf=pass (domain: est.tech, ip: 52.101.66.21, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hjARRTndO8P+5GCF8Oj+NPFU5IeGnY/7eeimkfTNPLYJm5TXujAlqfY3lX6fpIwFrSPGAsTyRXNhFoa1UoWN4VTAIct5Gj7fkUlrsKMNgG1iSR7nriZI9uBlYL0630rwSCSipTxrNZrXCgVqxYPX6MA7TvvIM5VDlmv+G2A3XJnCR6/yrl22SXsJ0lDKVxKd/LE8jqJZZQZ2lQ0jlPqqU3IZ4jJE/WlW5lRGuo34Bb7rGqpO1suTvXT+UyufA6UUSmk5Vt25Oz3K6xMuCELir94m90xVNsal+AGTt5IUfzNzN+Q84OIs96/a2MYSD0HD7yo8BX0fsRwVEQFiZk/R/Q== 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=U88VYn8w24DA4WKPy12I+w7H0/ycUv/WP4DMp7LorkdjRxbwT0qSrxAoHm/AB69V1vuA70YjbRyJn1bDH50MZmyygcdZwetTX3YFCrzyEdBRSDN8vb/vmhi4RUXh2z/8Ag70G7sfy6Z3Lf8b0r8A5x1gxTOsy+qM3szgBEmbtMHOq8BgeJOHuOyQtkxwMq6i4d5EBoniVMCwQYXnuMzp/0xSzv0QtAt/IropvHMaanpVinGyusYykSlz9qB+ClFaJdPCkH+rYr/Cg0lmZRNjzTFHsCYLNN8+M+RyArPJ2NMPxwLXuh7MJe8GeJN/c9IcLwBepr/lyYGQl+rY+2KBYA== 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=E/yLEXSTctA89qCtHEbNZmlT5syzQdxTdcNqtzDhf5SQdAqSPdpRw643iStuxpDDs0SenDkvuLVolRcbVoohChBds0Mx3TAgACQ+pXfDyiQ35Jt8WehrFNDUtAH/Hwdt87PHUCiwszdU4+2BSL9s0huHNUzEdrrJRnCB8/s1tjHYhlMWhac3UOv6GhW0OGI/wEqyDG+/oVxPDl9O93JIglss3FcEChdyWmhtUNTRYh14PCdeGOFiz+Ranw6FB/yh2lT/tgyVE8X2xYKsocq/x/9B/oTg+pSH7oj58UHShaexUzw7SeDO7n8U12xbNqLdUbTSuxNietSsmrKVv2uSyA== 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 VI0P189MB3462.EURP189.PROD.OUTLOOK.COM (2603:10a6:800:2d2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Thu, 5 Nov 2026 11:09: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.0592.009; Thu, 5 Nov 2026 11:09:38 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v2 03/10] modutils-initscripts: remove obsolete systemd masking Date: Thu, 5 Nov 2026 12:09:23 +0100 Message-ID: <20261105110930.52643-4-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261105110930.52643-1-jaipaul.cheernam@est.tech> References: <20261027110126.9383-1-jaipaul.cheernam@est.tech> <20261105110930.52643-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: DU6P191CA0041.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:53f::21) 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_|VI0P189MB3462:EE_ X-MS-Office365-Filtering-Correlation-Id: 8fd94642-7165-4ed1-b749-08df3b2d480b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|1800799024|366016|56012099006|11063799006|4143699003|261026121527099003|261022105027099003|261009220027099003|261009221727099003|261022075727099003|261009221227099003|261009223027099003|261009223327099003|261021123027099003|261028144727099003|261026140227099003|22082099003|18002099003|10067099003; X-Microsoft-Antispam-Message-Info: 3NewW5ZNjcf79s+aY61SOKTqMWUAFhedz5kscxUzcKO7OFJw9QqP3XckjCgkZSXNbKyvqKrwpSMMFirNBfB0O1qdEcV2CBEhL8R0gAyLSkvAPyRcRJtDJDwnqoFPYtK8hyOGMfpsBYCVMNKBgxAuy2pSd139TDtnujHl/0fOE4wU7b6ncvWoSa0hFeRgSGo55lNgWD0TtEukIauKN3oEye7GudkveyuRUlJau0Yq1rAAPctdY7GnknczWzebz8HdU3ABC63PqIxPp0L2LOtkSAkOSQCN5nQBet+Rwxp/yHFTD/kFBRiQpU+04a6ZWN4LjOZ/H9KwljNbljST1JPJbttAXBZpSfJJ63Bb2p7kz5qpKCQbgc2CJjg45VRCAYG1VlytiR4zSnhhRBLMCQ1GpUPI58cN7XPgYm6Tz0RBuf6XlI2G8UBaQCpoc2RAh2nthPDb7RSoLOpR2ok1fT8gj1HBIJsB0gV2k4RRny8YRC7gGOXQwtuZ946IpKFg2BIGz78RH3AcRnTI26C2kqoWfbO3NgFn8k5rFtrkE78Hj2ylHwE8f+Uv/x0kNrd1KnqKrXCXOzQN4dFoKN+IrkFCkZydLIgaYMSUrCiI1IfcV0Wx3oxpP83ldO3FL5V4t8EFW9tWww28pRWJ6j3qFpNJLM7G/JpSSCplLvsw/337mpg= 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)(376014)(1800799024)(366016)(56012099006)(11063799006)(4143699003)(261026121527099003)(261022105027099003)(261009220027099003)(261009221727099003)(261022075727099003)(261009221227099003)(261009223027099003)(261009223327099003)(261021123027099003)(261028144727099003)(261026140227099003)(22082099003)(18002099003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GX7ktBPPsejlAuPTINVJIe7FF2t1s+RZHc70InZZMGtYqTVelZqg1ctxe92E5uNeIg5Ny4OSxPQJQozF1h6NWcoAjR/b5T/sQ/NH8nOUwMRPt35+C/o7bwrwoZ4xyWbEZoYsC7LIHRzJVWSGJrEtT+q0dH6uRCPK+f02K3KrkHA9Feg7Z4cbG8vZ59lZl7hipVpJrRdXBv16nGtPSqrQMjlH0iKae/yVWOGxs7rFDMLEo/3rzjdSAlJNWHxwnJT7UUksi2cDF45QyvnNIu1gC07YPCQkmoMmedImYFClTTapScQkybjBJ9gNCQrdLU8kJjqq4ovB/bykhryRyQS/bxlhmUTXzntdCcsngWKrQmgJ912vdtAwqzRL983NcMszqbMQTfB+taGRw6H3ku2JAsO5aiOPZNNe7xfnl1TQVPWq8Rk+Jg43CA5bPZuOuiUViY15WJ45pZ7pXPGzbdpfsKhCp6sMfIL1OoKYZ+lZ2Ic4X53EfHjT/R4zo9gUYp732Rq9fPup1KCyaxUMXo3In6Jg+EAS9QpYgoiLeYma+lOB3WM7EHy9NRK8SKf/VuEYUZnQArAFvE668wbF3Ct8Npsewa6HLZeIzMOKEYRWXF5LnTrZ9MkhjoYtLdrZPbRi+pdolEh+Auqd7RjmtnZuw54oUciUU+MB1giZWwLckNKo1LAAi0MAVfxBcZH3rDjNO7MTcrpPelt3DbzkDHtN0OL7pyhjVCkFTZAQA0tXex/W7mY/RNXG6Zw/4bDruEuWES3LzUHE99ahet9I64CHEFSJarR6A02cSsJxsg+CaVQoYh5hx4XZQpxI3ogITH9XvmdLbz+W3C1t7vueGHeog2b6qwIEaf2h6AzzSAPOwLA2qyT51CWqa3lmdQ1RdSglgu/hVir5bRztE+RQeNKafROY2i0K4+OazMe0oZlTJF35usVfxOwkDdHHvzaSglynxksOVSXLZavxcJSgIHAkTACzgK4DJC9iWVK1e/pf+0nNzZMGdldaJqA2jZ9/tuuj8c+8h8KU25DCiWgP/PqLU16IoeBIGjNim84IJjBZ6hJKT3F/8mu396qlwTKQxVtWNWEVjgoegajmQ8ogCo/vIvY+08i9TqX6Qt5ZVY/hCVKC7+PzYF9Tr5oi8WpyKanmI4eLngnm4B8BfH6soK0y2qW5pCNm3/bq8O6lMNXPoOywgHAyauR9JQYvdIdHh/IkvjbnCloiVWMktNsfKZgdxqFRCj/2hYxFSfk4bra/ykESl8cLUvCinoGAtQ890wTeRmkaP1ZpghSHGfoKQPobVU8r46epBdYuhsIjAjIE5g7AbjUMSHeETQpf0hP4dJVfP9ATRpSJtckZZHQ1miU577vWQ3D4LMSrCOTqyDaDHkF0Yj0+0RwY7vC6pPzYDc8KAAOf4FBSWF9wFGhm7xz3FwfNdrg4MLKoyCT3diMcrEk6ErsMs6viZDSupN/aWNtzxs4iwDtgyIQ4EfpnnFIW4Z0300HYEUXq8F0zhr1g7sQ3o6Iw9A6xFsGB/DCZ8jao/6j4YsOhJAa9lLMqxjOz1kZWzOmfdJx9r5IukAah3F0PjEvJgf4eODaccs1h+XAQPZFW+SlQkW54EpSt5F8DRuSpTXiUSkIguURQzqs6L296fXjuQKleXJM0NKZ+HpvjZ+bouRMQRj2PKzGk6sZNDF9wIZyjyikmxk0Fr2JSF2Cwl4yL5TfgGvJ+VNiEFU1BtSiS4aJz40uy/3PFHZd+AA== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 8fd94642-7165-4ed1-b749-08df3b2d480b X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2026 11:09:37.9575 (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: Tf/rfe/P3s3qDBwinNk+ju5cHcgr4omDmWjAZL/bj4LKdLri3gnNXFWe57Ycp4i2TAqE6pHbn07QuCEbtxz9xTr9FXcluHFnhPD1W5zLnG0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0P189MB3462 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 ; Thu, 05 Nov 2026 11:09:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249530 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 Thu Nov 5 11:09:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 103112 Received: from AM0PR83CU005.outbound.protection.outlook.com (AM0PR83CU005.outbound.protection.outlook.com [52.101.69.36]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.31808.1793876991549491014 for ; Thu, 05 Nov 2026 03:09:51 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=Gq7BY/tD; spf=pass (domain: est.tech, ip: 52.101.69.36, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QWkgZmgh7tPaYdqGh/TW9j2f8YC4TR+QxUiSjMqg3EIN56A/TdPVvRqsn56ghSnTTgurb/tNpVvB6j5lB6yksBcsd4HkCjmB1tQVPZYMssp2EyCuBbq24KzipVcv5Xydtn2liNQblpi/6bFDMBX4SBKO3RsUjEbYhmg3rK+lzQPRtLVFvBaej976t27W04HZz0+fiFGpBSKAfLdQiX1N5pz4EQ0SLlmU+PeaMK7pq8XcZVjAkAVSl3YErAoTgSJsXGOc9pMdEIqFPNyUx46+sgdP9lohGUKNF9TqnB11t6zE4Rd8ab7tPAdI7W2kqrQWgHvOF3smNGPugUOvWRej3w== 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=LfwcHX3jzcE7lPj6snWomSeSUPvgeFSp2iQa6pXjZOQ=; b=Gmv6m17E8RyVfTSXozJ2fgL4cTTPUXR0pdpVtdJZWkr6hKo02/A7MMfoFj9Tn7VvrzH+7mMCqNOmKkY2iuD67GKoaHWke+zNAv0rCJq1FNtzNqtBs6A/H9odjZjDys3dncSOK0Ntqou4vFwxOvt5oQdWWwgv/abNsr015Ox/Kc0H+ueNn+VGr0OysdVubmsm0a5jJ0g1ApNFg8suGrMWEG7a+Yqc/AWIkZy7dhIqMWRKS+WKJ2kKl75M2kjXzDIHwbLdk2wXuHzLUCJtxjRuSAlPzzZ2Q92vb+M+d5/c1mybgyNZk5iE0xC2LZvBO9blhyvxvQFwrKvRs3xtHMDSYQ== 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=LfwcHX3jzcE7lPj6snWomSeSUPvgeFSp2iQa6pXjZOQ=; b=Gq7BY/tDgQE2SCRP4XdA/S5B1sPHh57MCZpxTfvcInmBh75eZN8RwsBhQafgvQB1uC3xpqqKesihhHvEJMXA4zrYgVlpDFJjasoEq3sw5/7as2kHf40H9o79I+arIYFWfM1nZ3KrrwBxEsdzeofzVfhxMVPbo8W34b+FtACvYTo9MDJnwRGQ02DkNMlDM5uhREXfDvLC/9VGTYdrvo0Nq9PinZnE+mbSY5eyPIlOI36j0Tcx4lPlw56iBdTBKAsYIX+rYcACN3kwafhep2YCBmOy8Z2gyLcNzct5bnzQXbeqXxREHufwsT/qLId5zg/KTpzc/a7rYxnXHGnndoLhYQ== 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 GV1P189MB2747.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:1f0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Thu, 5 Nov 2026 11:09:45 +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.0592.009; Thu, 5 Nov 2026 11:09:44 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v2 07/10] systemd-tools-native: reduce dependencies, add comments Date: Thu, 5 Nov 2026 12:09:27 +0100 Message-ID: <20261105110930.52643-8-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261105110930.52643-1-jaipaul.cheernam@est.tech> References: <20261027110126.9383-1-jaipaul.cheernam@est.tech> <20261105110930.52643-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: DUZP191CA0022.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:4f9::26) 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_|GV1P189MB2747:EE_ X-MS-Office365-Filtering-Correlation-Id: dce5ca80-19c4-4023-a1ac-08df3b2d4c19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|1800799024|366016|11063799006|260925022911599003|260925021311599003|260925021911599003|4143699003|56012099006|261022075727099003|261021121427099003|261021123027099003|261022105027099003|261009223027099003|261102123227099003|261026140227099003|261026121527099003|261028144727099003|10067099003|22082099003|18002099003|6133799003; X-Microsoft-Antispam-Message-Info: /byGBTDhxlB0Zhs+eVpdhUltccGQDMu0zFMQIYBKTfyhtHcwKoSmbKXDXdZDd87cR588xEitNp9jRN7opnZhfbdtt8I6BzMvUhbQkWQPStaGncY7oCVawBccxACVLR77YxjtrF8c0jjBRBp1DOxQAcR3sumNskao6tQx8vOrWeIzZGf7bufiy4WWcNODsMir8Wit0hSpKu6Q/3B00xxVkqIlPn+7wYklhGcKq2y2F4GfOlO4mXMsND4j7oTXGeLT2jDdDDTASax+kfyphXlr7Zg+t0mOMtIrZOZDacGib7SQ/8RWq87gikzKl/VKzjlZ/cjm5R91wTr7jMHe6bhW89RclOdbR510F4XIBGUXbglCAoGkaX1eywmFWwxuiTsm0YooYwqRfyh403b+kyVyVPwcg0kouk/ItpXu4qzfyNVrzVNm8d8FWxXxKF+cUziv51WnSbOSbl9wSNRm1WIUK/gm7ZACJTfP8SvjjHTP4rYsbqu/D6WoA9/Fnr9AMFcYL16p7yHYjcpqq38+cpEh2vjmPEBDDXmdep1CgLPfNA8M8I6EeQQ/VZ7uqMCI4Z3mypdVe5t5SxYIU3uejSj4ohHnuXLKsVS0XD8k06JPzGKjcz6QiQ+ZJqAZK8EBsxvB 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)(376014)(1800799024)(366016)(11063799006)(260925022911599003)(260925021311599003)(260925021911599003)(4143699003)(56012099006)(261022075727099003)(261021121427099003)(261021123027099003)(261022105027099003)(261009223027099003)(261102123227099003)(261026140227099003)(261026121527099003)(261028144727099003)(10067099003)(22082099003)(18002099003)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HFpuUaY6xKNQTEYD5VGuJyMcXoLrLtUqOB8igEgiOD10ilx5F51sbhdc2SzP0K4maStM7kXlTjDJmJhF0lSN2SDySFEh5qGQO6x9rlstku2ILy5RqH3NLmjkcxOuDZju/q7KL0+4StkAwMGKWpt5Kw3Q3/rP27/ngJP5LKysjKuUbLzmqOaKWe8pk56v6+MO9xfbTgXBUkxQb9QlzBMDS7tBjY14rkkMJwgOKbe6e0nu1excnbXimRT5w4rvOx0gQFwz/wIDFkIC80ZofFVpxCSwmGbOawFqaXcs+YIKdTFzKqjxNvrHPWrAo1JgFnZ1YRcitd00tOQD8sLvz9zDjDo3fgseVHQQf+HRP3WexXC4iq9xB8ect5w7RgA/90HGj7MaDK+TEEVxSN4Nof9O7Kdj78fhZuF6kpSc7/BNkzn5WOdIKtAVOdunAKBNzIJJ4o/OYEBIJ2ITpsF0ZTknfJSC0nYCKVs5FKZFyw+SV3jpwzka4hWOzhuybm9DFEbXXv8dSxwD/Tqj5u//AN5ugrzXC9Lc3ealwqF744FPCQroI2+aITYcxr4IDADxUehZ4jDWkP3+SKStP4Yji3r9WtJdvd7Gse2APaxO5+pYRw87pAg2Gd5s2m/gleDhMTUcs2IYxUaJskDP0bsjyJnEQZuklKyXA8haR3snMmu1MYvvIxijZy3qnRO6fFA/aBS36s22GOPf8HypbvsXbZl1rmGcgExZkVaB2oBDVP82pyJ3vG7uyJD6UoAlRr/CiA3hCA2iBpH+NwejKjBEfqRq/muPO2znvZ7mOdTOvY5tzRXQk65JyFVBm9XFc8zbuJp6W/G5pyDzpme3IzmSLhWqkcbEbul/i77s0BYZpOH3MJjw2ZLnkNvE5NjIF68IMlkZwvWdemxomhT70aGNKzwTSGjGb0cUbbTscfvXFemwIDNTitA+iOYIWumsc20p+h/S3Oq2FmSibvZEF68z85fm6GRuHCAx11kvb7ByRv9CrSD7eLiSoyvnv1KsKspcbovmKx8TCioCEoDF4bDzlFh82g2d0lieDmXE4N3TYcvAfDslkfYlEUABk3b/czoWmIT6GTYPp/Gam7SVgvv8vAWJukeIMqwNKeRr4KaNYY3s08Sscvil5lwNFnClisqlcspBdJNLtngSWeFCIBf5R2LiIxQDvh6IIGPNgiFg3QqqGJr+3yxL5AzVbgJO+IwIGCmEV+k9DwUII5woZQAozCN6sbf0S1/P6Gg8nWx4aX3aKJcqg+MYazKmMXJYBLVC39DeRwZhelAD2MCYKVjvrhcOhEDiKWefEUriytE/y3dAKRkRnY9SJS+0fZyWWEvom6cFmsbT7kflmXS6uyWrduQdSWYLz+rfi8QacglGHVgIO7YyFI1V3u59Wjy4pITg84LGGPu5jWswimAobQ56fSC7+ExkslN0KcjOahkM7wBLE7CfNBtk585ZkvrGIxDvClMsm2M49+c3rlmQm7pgJ8fCpVsJ45z9eKsVz0EPEd31pKQeE9fFixT5EA7HKe+rTlVGW7PA9reo1QOaa+hhCQYvaUgYj9xs5hJVjWYsgNfXDpRBausenTyVSQJqHgf6o330/0VTLzeI6v+UgfYRjOKFzy7YVSBH2KytRHkKRzt5cYN5g1Ng3ZbFEz/xzlw6Rc3+GD5WwIV+vQ0LRPPHONT3Xp3OBqzbuaUSNbIQnw7NvMnOdq3GzN/0fnX8VSKdKEpAWC4Y8UtreoFwrbCD3h+zFA== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: dce5ca80-19c4-4023-a1ac-08df3b2d4c19 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2026 11:09:44.7371 (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: Oo0gWW/1mOt5s745nWijMe1+VKJIyUAira6cN7rUtyaOfenrbtWlFYASXsbXW4qWHx0qKmo+ZeUOXlLOgZxZDC1Z+WpXq2rMiv43FgXglBM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P189MB2747 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 ; Thu, 05 Nov 2026 11:10:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249534 From: Ross Burton Pass "--auto-features disabled" to disable all optional dependencies by default, and remove build dependencies that are not needed. Reorganise the recipe to make logical sense and so that the SUMMARY isn't overwritten by systemd.inc, and add comments. Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 717badf77f4a1f72d885f285a7326a485f9938fe) Note: kept our MESON_TARGET ":executable", -Dpam=disabled and the systemd-sysv-install do_install Signed-off-by: Jaipaul Cheernam --- .../systemd/systemd-tools-native_259.5.bb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb index 5b29babdc7..89b5220e3e 100644 --- a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb +++ b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb @@ -1,16 +1,21 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" -SUMMARY = "native tools from systemd" - require systemd.inc -DEPENDS = "gperf-native libcap-native util-linux-native python3-jinja2-native" +SUMMARY = "native tools from systemd" + +# We don't actually need jinja to generate code, but it's checked for at configure time +DEPENDS = "gperf-native python3-jinja2-native" inherit pkgconfig meson native -MESON_TARGET = "systemctl:executable" -MESON_INSTALL_TAGS = "systemctl" +# Disable everything that is auto-detected by default +EXTRA_OEMESON += "--auto-features disabled" + +# Link systemctl statically EXTRA_OEMESON += "-Dlink-systemctl-shared=false" + +# Ensure unused build paths are not in the binary EXTRA_OEMESON += "-Dsysvinit-path= -Dsysvrcnd-path=" EXTRA_OEMESON += "-Dpam=disabled" @@ -19,6 +24,9 @@ EXTRA_OEMESON += "-Dpam=disabled" # More details are here https://github.com/systemd/systemd/issues/35897#issuecomment-2665405887 EXTRA_OEMESON += "--sysconfdir ${sysconfdir_native}" +MESON_TARGET = "systemctl:executable" +MESON_INSTALL_TAGS = "systemctl" + do_install:append() { # Install systemd-sysv-install in /usr/bin rather than /usr/lib/systemd # (where it is normally installed) so systemctl can find it in $PATH. From patchwork Thu Nov 5 11:09:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 103113 Received: from GVXPR05CU001.outbound.protection.outlook.com (GVXPR05CU001.outbound.protection.outlook.com [52.101.83.0]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.31626.1793876992219552122 for ; Thu, 05 Nov 2026 03:09: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=JGD+XOgS; spf=pass (domain: est.tech, ip: 52.101.83.0, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jZgE2ZIdIhY6KkfhiqOZfntLtJJCJTctWt6uiJY4F3cMAzsibFnaFKpknTt4Z1MqMaYe/Td7+6smC8qyS2PAUKsbqiojdorJ35nTCWGUDV+LXUxAMeq7MNYj7oedK+AkcLevdmKcSu1gozNfRxIYRxaAvNa8EcG/xXz5KPlHmXXmiFn5gkqhXd8cjvvr6nzNEtHfOXLeOsowO5bBicjqWInZX9kuK3XBxnw+8ixWSCeYFvT/9lpQJ1kvyWdwN8DyNq2c54w1d3E5BQpsG3ZhuKDajhBCL44PR2LFTuFleBSJOEDXNp9UrlkUhv0Y6xqY0RW2Rm2Oiei2yrI2ZZe3Ow== 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=H/OmlnoWTxzP7t19XJSTA5LMF7W/9KAZPsmiMMQzeYM=; b=ppCLa2T9dLBxETu3jHbF47Obp/e5YBpH5/b3XMsQa13RO4Sh1+dV7LintcviQgNTzGdSx+2sBOPaIBhfrr4mjfvuh0bD3Inc0dhz3IOeM7beHqH1WLgP2Wx1wXRK6DBCRLQtHUJ6NFoJtOESCLHPgo9JN3JgNvSF5vSGL1h7eTvSq/advugVwZGUZCPvW/dsnHqCbL8JQVAOiAHw9R1uWAVob4vRrAehqVM0fT1wIJc3N8cNFGa1cHz7ndPgev+/r8gs+r25Q60asLcU2QjGcFClLaBaTJWTHRdCD6Feo76vqzBwF/Cnj52hd68AmfXVXEwqc3l2Et6UfelAiXW5PQ== 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=H/OmlnoWTxzP7t19XJSTA5LMF7W/9KAZPsmiMMQzeYM=; b=JGD+XOgSCLVxGlnLdLC4wEJ76/SwOifbBCBObioWgEsxAktN6AnNPOry2Ka6mu11tHLYWXu21tjfHkbgq7jjHeJ/EvGt3lcusQjwyjrQcqFcmRiFAje7XF52pRhdJDWeMd0071hDKUPcEY/rLf3Qk7eYR3CI1L5fdv3fXrb4SHPEneS8AGEfOZf9KSld4lNGkX48aqiX1IXpwuFe4irC3YbiSgWIMqESPxTmDWFReJ40DUwUQjqQlNFwotAGSlyurw8vuol5HzmOiQ8BuM+g9uZStwiySO+y2lrAPaodro6pgdgTSZZadYjfL5phoRGprqE3oHNUZf3CqGLZJTNLxg== 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 VI6PPF0806ED8F1.EURP189.PROD.OUTLOOK.COM (2603:10a6:808:1::185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Thu, 5 Nov 2026 11:09:46 +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.0592.009; Thu, 5 Nov 2026 11:09:46 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v2 08/10] systemd-tools-native: add systemd-hwdb Date: Thu, 5 Nov 2026 12:09:28 +0100 Message-ID: <20261105110930.52643-9-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261105110930.52643-1-jaipaul.cheernam@est.tech> References: <20261027110126.9383-1-jaipaul.cheernam@est.tech> <20261105110930.52643-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: DUZP191CA0024.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:4f9::21) 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_|VI6PPF0806ED8F1:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ef26b41-8b98-404d-0f6f-08df3b2d4cfc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|260925021311599003|260925022911599003|260925021911599003|261026140227099003|4143699003|11063799006|56012099006|261022075727099003|261021121427099003|261009223027099003|261022105027099003|261102123227099003|261021123027099003|261022115727099003|261028144727099003|261026121527099003|10067099003|22082099003|18002099003|6133799003|13003099007; X-Microsoft-Antispam-Message-Info: MMDAvZsVuXUHFoh/21kjbOhbMBkqejV6U8osLJ8V0u6bAc3UIarHJKBEsBVVCejI1jPTHd1YrR0MqfWR0SxHuvD5mNRVBHyAMZjtFEq4Bu5pemgpFcyy78gIwivE+dpZcyeeS5mD8BNsXdh0sZvoNmksT9xepFLAYYfjEFQ2q+PcWdxcTdCJek03jpPWDvVfiF711/grCZqGOUT9+RFnN6HITEKukCogyifCM5dA0WJLHmIBn1UklcSlU6VbqPqPlyfL6iDiMy6hFSr/Kim/Afp3MIWdts8ezI7DW/e96kofPjDygGVBTOxlDut497kzRbcITupSsU194Fm/tHSOd9O2AHlFSWvTnRTSwzvi/DY+AF0r9vhWZSFS0gHYzA2G407SM42CBqKI3479ZSziz7jxjxyfKzKf3jTR/SGO6BBq2RA4EOOtOlAAYeaBlECqIGiuBFrc5kw2KVcGxvh41UENdQUJ1dsqZAy3ZR++au9mTcOdZUBM71lmJv9Fl9Z3am/MYmsyyDw2DuA0Ckedw+xZomTBBSSrouyC/ks9M1+qrFpcyWV+EDBkP5+n40xT37rpsYW2BxKZt8dRQeMKgio76fPTUH3c7rglJ7F/XOZynxT4CmK4Ou9qK0r1iXGu 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)(376014)(23010399003)(366016)(1800799024)(260925021311599003)(260925022911599003)(260925021911599003)(261026140227099003)(4143699003)(11063799006)(56012099006)(261022075727099003)(261021121427099003)(261009223027099003)(261022105027099003)(261102123227099003)(261021123027099003)(261022115727099003)(261028144727099003)(261026121527099003)(10067099003)(22082099003)(18002099003)(6133799003)(13003099007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uQkJldjHNGHfMaBZN87DzNXgzgJWR4A83QADtBH/IdOJ9N+fBg+PhPQFEma7NxrklyA6zZ1NdS0SZNVs7PmcOLpRD0F168MasJdPLsPIR59NQZE7SokgsPqSyKoSr/uHannQ9vcYkpYJiGpfEN/C9VrQi6XpfRiXd2d2Xzj0lkLz50E6JL2vDXu7eWg5nf4TXtFB5yoKNqnjexMJeMilY3oet/Pv+Y+14nX88YpqEWAwf10divpcXU8IF0edUH55DLDRJelWwtvx9+CigD36pgT0e1ytSWgJ9Qt3d+G6Y9/WE3WfzD5xwiR59rY4g9stJzEMO7g0QuEhHL7+HLj4OT84W0npNNBRo7CWtOIhf/rLQ7xk+9jjhJ/Y9NeNTc8Uzt+5grp0Qompy8P7M+aW/YbJuh5K9/wWCymMIMpwt2Le4tmbHUfzWk2prX0WZ6NoQ7iGj9XCth2fC98jRSS6j4hDsRVCPj8QAkAiaprfger7CZpOq1+FOMYWcafy6D/ZcHhIm6vBJxJhCebqgZJrSUHCAM9cGPqb1bJlTDmKN69Q0FnNCcBkCVTjNO5ITPuFJhg+OUR+PClB3S4Hez0/SKjw3yUlQkau4yDIeMbD+0VO8AiUOTq23OGo6KM2HQmpPnZYT8DVXXpSP+RLIypqmh3oAlgeuYmftX3vCtYgybE0gMcYKgzeAfJAP+uSE9eCFLettsxcqdjac+htgoJeDoe4bkS8Vbl/nPcHEzhfJTqt33FDeXGylqL/ID/xAtjWyun12dGmhe2QMJejPDYTTlXDMTg48sgwUKxDGnnq7d63DHky7br55TQChRVXQKkdnPIPD/3u0MZm2dfXjt+AJt8i+kfQWrf+DDViqX0efktsbc10ctOW797CnpAEPQgkhEyJWYR0qACt45GHA/IsGa5OqzDA1zTEmm1e7YASg6CGs0lwuHnVzqFwcI+SIUFrA2ykXPBbKJWgq2xrSWD5WI4ftwUydJKN0nr2eoo/nPlXBd8Wc7I0VnBGElZKn4Ieb0TKQ6ERShgvZkPLFxiOQlxENmHblmc+D9N4QO1z2EnzUeLpvWINDNzbskmVdEiHSD9hzQse+6qzsUJdmkuSnD9oEVMABZM5x4f+2yKfUoGdkFxkBdzlVrQhoCdPNiFGXuuM9RVDZrMIgSK20mKQGGL3TfxI2TYgZyZDIZ/9sDo4kYCLUo9muZJ8s5dGM+c4uvAOpjoiyvA4HpiQWWh+Z0sZd8ycu+kpClT2e882Ht1NycuNOy+wca5ZaA5dxpd6LJpr7eR70A3ABCTe+Fx78hgJ4HzJ6m6AknLEmw0cXYwt/XkUHPalMqc0oX/yc2t1tnkctBY00fC0wP73374xWvGqazgxz52DTOS7KLZZUwlTl9OBAcNC409Du8hvEK6LrVJ0DEOtsxWK0DDc8DS7G+/GtsIOfhKpta0g/81hZdoypo7qR5qcvYDyze0J3YDsEwoAE7fOCGRM7fnFisVXhdEGYIun0y91KjiEsoOItsgjsNYQ4jjVXXcaY9yiL3ajfvyhVW5HGx4UQtkjIUT5Rx5M26k12QYCU30d6L+WyaO4I43iXh6MHLOsToxGnwt9WaLw56Sz1/2utrVJD/OcvPoWmzcQws301XT59JA/vXsym8uIC2N9anYd0epzp9WtbOFD9WF1n8LcKJn4SJVu8qvyC7fPyQrW8oSf9I5pCcKE81A6MsjAXdYYU2Io4wQSH1VYz9dvYv/Jug/5E0RdAQ== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 6ef26b41-8b98-404d-0f6f-08df3b2d4cfc X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2026 11:09:46.2294 (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: Ueae9j/vKnb4UAuxwacxDz4Zy36Pj0JtiNtE7sxE2oRb1y91S5LZY06TsP/MaPCdvwR8A8yUfDB0dPARE+aPZSYH7AxFVk+Ry0n2HC4DesU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI6PPF0806ED8F1 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 ; Thu, 05 Nov 2026 11:10:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249535 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: kept ":executable" and our systemd-sysv-install do_install; keeping the strip-the-root patch since we're still on 259.5, dropped in the 259.10 uplift where it's already upstream Signed-off-by: Jaipaul Cheernam --- .../systemd/systemd-tools-native_259.5.bb | 24 +++++++---- ...oot-from-filenames-when-generating-h.patch | 40 +++++++++++++++++++ 2 files changed, 57 insertions(+), 7 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-tools-native_259.5.bb b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb index 89b5220e3e..d8d0eae009 100644 --- a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb +++ b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb @@ -4,6 +4,8 @@ require systemd.inc SUMMARY = "native tools from systemd" +SRC_URI += "file://0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch" + # We don't actually need jinja to generate code, but it's checked for at configure time DEPENDS = "gperf-native python3-jinja2-native" @@ -12,19 +14,23 @@ inherit pkgconfig meson native # Disable everything that is auto-detected by default EXTRA_OEMESON += "--auto-features disabled" -# Link systemctl statically -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" # Ensure unused build paths are not in the binary 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" -MESON_TARGET = "systemctl:executable" +MESON_TARGET = "systemctl:executable systemd-hwdb:executable" MESON_INSTALL_TAGS = "systemctl" do_install:append() { @@ -34,4 +40,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 Thu Nov 5 11:09:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 103114 Received: from GVXPR05CU001.outbound.protection.outlook.com (GVXPR05CU001.outbound.protection.outlook.com [52.101.83.0]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.31626.1793876992219552122 for ; Thu, 05 Nov 2026 03:09: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=yww9TZUe; spf=pass (domain: est.tech, ip: 52.101.83.0, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UBznjJpIYgSWLhJhijK7CUvNxtTMLHMJ88VnsftiKS74h/doaEM0QI7sbVQi8ClbzH5tz2Gcg6VlOwMe+P0b/pEUVew+49wMGlI/XJZzzD9rqOVeE9MoHmGhTqmiIwMOwIfALCPyd2ffSPp3xoT8EZKNz/WT5Cki4bwubH3g7rJtIdQMpaC/g1IUJu3TGHE4Z+h7Fi8KwanYzn79zqrkK+KEsoRqg2efPR9LesuMVqiEsTO+YePZjXPeV+u8mKw01FW1hWrHOiULtoCp0UReLdXskOrixhnLXlY7CofzkZFbrnzAoZRhMj6YkFxHwRMDRpmvgj0YXXY7KMZ9+5uK+A== 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=Is4KAdsjmhW0R5y05FDA+k6z7Y4Sixu1mfNNPLBlEBs=; b=BZwAq8dgUhaX3LAHwTlcwTjorYuEEefM43bVc60HDBP4D0jMgmg06SED3xeumme/B61B4aWlhHFUjqnS8qiHTuYaZ7ZCqvlFHTLk+BUqVQDjFlpEgRLWtCR/n4XXAuFRZ2572D/E7/AyydRMCidJldlxNu33bimnAY9JisFvxaJC3grMslmZVyBX0XuO+Bvho7ZDZeCy8R+bHv5qFoQyIZuOrcYL6QwsSMd66T9G9qvAjkuESeqnB7DcY/zhhBZbLtZuhcqz+ZvdFuiHIi8fORt8vjmNs9n/WiuXGkY1MnWGxy1LEk4v5Jk318ZBT9uH8Ys9MjdGdKUV11nLie6Tlg== 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=Is4KAdsjmhW0R5y05FDA+k6z7Y4Sixu1mfNNPLBlEBs=; b=yww9TZUe2F392pw4c/Shsx49j28WJ1zmQeV6OihtrtVtIrgLmF4BIBM8t9Bbml3bqASqT5OP813ExR8O8AMZKoN1I7PE9rLr4TPF9wchUK5dw+QlYfTeCS8rHRCYTH/YCJ31tmbeGGUFTFZwJoABzO3ON/mvfZWS2N7NZjr7AVpZ1vHYcD/hXwYWwAIvo8O4Qiy8G4wY3RkdEQltUZB1SvhbtcwCqScAAh3p3ow7VKc06A4CtgZk0WOJOIathAkaEGP00RsnAxQPBZ8EsrGXeiBRWKl82g/7NloHbexuBi1R4eiZk27N7iefxdCxuA6gXLWC8bKuyqBXdP17Olfbng== 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 VI6PPF0806ED8F1.EURP189.PROD.OUTLOOK.COM (2603:10a6:808:1::185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Thu, 5 Nov 2026 11:09:48 +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.0592.009; Thu, 5 Nov 2026 11:09:48 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v2 09/10] systemd: no need to use qemu for hwdb update Date: Thu, 5 Nov 2026 12:09:29 +0100 Message-ID: <20261105110930.52643-10-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261105110930.52643-1-jaipaul.cheernam@est.tech> References: <20261027110126.9383-1-jaipaul.cheernam@est.tech> <20261105110930.52643-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: DU7P191CA0030.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:54e::15) 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_|VI6PPF0806ED8F1:EE_ X-MS-Office365-Filtering-Correlation-Id: d1ae62d6-2a64-472d-09a2-08df3b2d4e38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|261026140227099003|4143699003|11063799006|56012099006|261021121427099003|261009223027099003|261022105027099003|261102123227099003|261021123027099003|261028144727099003|261026121527099003|10067099003|22082099003|18002099003|6133799003; X-Microsoft-Antispam-Message-Info: FokzQ/inVKvi+NcO8lpQ9DoTqf2fCsZY72tcDnuNZWZDL3moj2H8Tg9LnzIeXtCnocYnkDokyA/oO70XfKIzTgWvxiOwK9AEyerSs+XbBj91WanQWXG1+IAXPF0+fcYBFup74Nfa4hDCGdCYUIoEqMLHZ7Whd01+I6E8AAWrl/ZftLvAiQ4Y7HZkMWeEebY6tZ22rkQbsBnNIbSdqhe5N/H+GwfjxiOQevTHgi+Vj2R4lW3UpBLEaKGZxzP/iKrSEHUlDSGyYyxn/ImtF3En1iBHP7WvM7lWQZb2HDTyUeKMQSz5CoWg63K71dTMKA+A+VQHfPTKuNFDZsy0rM1YIVPKVv4xXLqHATQSLX3+G6Dcp9WNOBk9/IeMuk8bSIO5FE9Zx5u2LtGutWcJP39cyj5i7yEVeu2u8Rx/7JMw4xYKLpuUFaY77ScnlHrAIPqGApTdPYwN2xssoq1PfSumN4Lc8POpJXwmKY13fSAMj8HZyGI3f9pmYjYq8jcGUlhHIz5tOyZaW/56mrDzs71PRL3P4ymoC9McZWkQD1uQd3viHN7Nh9ubheaSLYgrmGE8JN+eeGaAGESTA+W5I6ZeXMA7XjfNFQ3BZdEVCwCpb6NxhN9jqRFGryZFiwHZRVNNhB55eXzs4rlkhWCXoHcdxx2g0JKP+dVAIjEvBnFRWGw= 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)(376014)(23010399003)(366016)(1800799024)(261026140227099003)(4143699003)(11063799006)(56012099006)(261021121427099003)(261009223027099003)(261022105027099003)(261102123227099003)(261021123027099003)(261028144727099003)(261026121527099003)(10067099003)(22082099003)(18002099003)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LyyCbLIDlrzbyCn5NpQ1ESqSmfyHNcznb8wkJfOpfMZm9aql9uFeSx6gbxTdT0EnHh1MDX1VXsD3jgY1t1+Fpm7neQXSEcU5+rhmNlYwPCJL3b0JBbiBoXSoTPiti6qG1yQU2vDcCcwR4DOgF7y++WmMlWyuBy5PD73c3objmGJzLp2YKmY338LHog/3qgaCzp7X6EZULKY/Q7aBu9wdaca0mAolt4HjtQ6nW25O6iZBprvyI7A0PDf68I0m1VGnDDKmj8jviqr01ZAw3Dqb8o/eIkQkwdHRVrsQw3G8PfeqO2bDVDbjrCtwAd2eu2wUZv29+1wz+a+FnkSls5nbGr/s4/cutK6lnIHVu+VqKHWLY9YIuzlfCUbVSwPBqaBnnZ/MTj9naRalvz07BSMoaAEBn3j5sqWW28M1zZm+1HzwAy1hAo2SRdQ8NNYjpwOAEIDJXeq2C/1Vq48hbG4R0flICVQLOjGkOJzTRqhIMMCGavAa4ymiPG8zmx14Q4mOQ2YNzANsBJQ/ao4UNL8P4dJjhA9NeNWjUR1/uf7GIw074t+8Fe+TTSoyXvFVRATkGlP7K/Q2yI4KAaJ4sCxuPfJyLNt4LZypxG9qaCYfzSGGd2QgZDz+TIA/xu+to7kdnj/K3cjR26DoRakT9CFph8ySxbppBjt1hhUvB0Hc7m0z/GhIj25lFnaCUZGwoAtoOLK2Nkt94EfJhLaq7NfqST8omyiMAXk6yF/qFDrHSgL5/a3SFHTTpIkBVc0kG4YrsElOs4bus/b+ySFRcsUZqZ6H4gZ//1dFypXEQcZeX0qmVEE58ky84dbcNSCtv1l8+lz5id5YGox6rnwH/zlf2TAhuuTe0LxZEQfDn7Cwv1CcClYLbzvU4M1TlWdSyYwjPkzTuJYEdauK49cGfVwm/o8701vHsMU44RUdI4IuM5JjUOUBlAuguOimc1WmmmV6MuU5KgKPPOvR8zV5+fDXPvtlOG2lswkVhlg2oXCXylsSPPPzm+ICoUVjBKpbPXl9rsQ680axz5OLJwmLyL3Zwl3NjUDpEfITUUP9x8RBb8ddJDuBEeydygQ7j78SygoewHNi2cq//ruYIaS4hZ+CowB20t4kvjPKgYTrVeQDAaXyPBAkITO+7FbBVSzt/c7gB/2Xup1sHg1HiaDQykGL1DsmbeAItrfeAds1TqD1D9vJv6FEAIm5Ao/MC+iFEFfiFm6nVxiMB5PFsksGpOoJ2219T68KsmclbTVm6z9dagditz0NVHRuG9FQU7pvEN03PE0p55EnsYR3RGnaKZVLPJwU2oFmVhqOP0r44y6FGIy96sw4rijNqaYX5E2wuE2wLTyuyirG/lLm494htSbQZQDfzRvZL6ZSvQJoWBknKTyXwQvcJOLXPcC0BSnBXqnLWS/NAqtyLKsAxMxrsU+Pq7XD1IT7AEBOB1aoeffTHE5DdpJqj7nKWPW9Vf8WL8tlONTfq1Idalmjcj5BABGtdBJhoXLp2a0vC0wT7VEfxI6TazlDFgvCzdlIjTr6iLlA/BfJ63QcCuHiQu9qbupwF8bY7oNiwFiXIgQl00DZeALw/pnFWH/C8Wj3SaaBIGilRXkGecWTHj56cDDkYQHaXzh09KOkENN9J0HOm3LiwnPKmeliKL6ANlauD7DZ/h4VkSGFaGNlXBi6XS+d9UW8DR1/s+0hI+PDXV9Gse64X8T7ERkuE86/K21pvU3gYgLOdTgoQtnZuduQcHIyBkidGg== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: d1ae62d6-2a64-472d-09a2-08df3b2d4e38 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2026 11:09:48.3141 (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: 4T1msyb5bTfF0Bg9430WNfb2JgdcE1Wpc2X4D90fjV0Ea0x9Dpfqr5qnmvXDX5kJqs2c/eypjKDvsc6olMa4yRt9lBcjb1EFZEzUv5R/xwo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI6PPF0806ED8F1 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 ; Thu, 05 Nov 2026 11:10:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249536 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 69f4ee4fee..32fc04352f 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 Thu Nov 5 11:09:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 103115 Received: from GVXPR05CU001.outbound.protection.outlook.com (GVXPR05CU001.outbound.protection.outlook.com [52.101.83.0]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.31626.1793876992219552122 for ; Thu, 05 Nov 2026 03:09: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=M2hEGXsw; spf=pass (domain: est.tech, ip: 52.101.83.0, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NDERTvo2wLVbwK8bj51AD8mEFTaRBLtW2ek8F166PvaG1v2wQ8Bbd1X7GbhSaVehsQ7w4hygk3fboN1FZwy5vqCbepr6IoEQD0kuFQO7zgJq8voaH4wupsjQUC+g+ENE1/FZ/VbPxjwNBTRylqxSgABl6MH3OOX52DIXo3vvX4Wcv1mIH5JRtomPYoNHHB6a1l1Tbk3O33sjSpuJ83UELJlp10UuyqqS1SotcM9rAIOqLT2l+09vFELzYfQnhxngJ6X1mHi6V4gXrGJ6Qmf8CJbtqIf/JDv461qtHWPuJgqxp4ZQbRECacncEJV4F/jhhlQzKeMNzwxZiJJBwt5zsA== 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=1/wThOpm9CYY72DNiq75UNFyGhDV4NOQcFOzhgUTadY=; b=fsk0yZQEQer7E6XpokSoSYiydIHDyzWx/yRpaW04u4nvn5x8lRoIC002Ji5JmELxiMINey6mssVSzuuuNnSugQlXiq1+JpCbExPmtE+ATkvHB1MiHLiHBbSfj+zusGOSef53RNeWX4kB1TJRyCllCFZ6FsQPqxNr1LECvuPN9EuGXmjPAU7XCPAE/m1ncs9OcptI6Ji6IafGMrXLYsfyUODUoWkj07xd29D8VmFnJNZs2hqsmzwU8u/KcfKKO8WFNTQ5JxUvlHBjHjV+ae/AcMTux52Uie9jm4DBZTT9LTD1kArjOeNgSXkBEJN2o4WLegiq8E9xyhRFAkvYpFUDrQ== 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=1/wThOpm9CYY72DNiq75UNFyGhDV4NOQcFOzhgUTadY=; b=M2hEGXswiLv7K9QrR4rTnos3Vts/ZYU/SoLgmpqMnH+uOtHEENEnXbGrSoVMycAMc2OmcQQRGwDSjI8Bg/4Z1hmEzbMlC8QnTYIcJlVgC6YVoBF7POPxMWkOLOLoHUeuMkvZ8SOXM8z5/QKt3itcffDY3tGaZsBmWjK86/mL7bRhvllfTy/t0NGoCf1yOxCygrrNM+aDFeZx6RBeS7JmixmWE+tiBvScfznDSQNWRKSHrby4hQLR0w9vaV/A8byeZ4HXJPH52EmSbJhxqFwZ6h/Vh4GYt+fQyUISBH8shxgPm7oClnwjjsPsOK4QevB+EVuhQ+/NvDta7ofTO3H4Cw== 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 VI6PPF0806ED8F1.EURP189.PROD.OUTLOOK.COM (2603:10a6:808:1::185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Thu, 5 Nov 2026 11:09:50 +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.0592.009; Thu, 5 Nov 2026 11:09:50 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [wrynose][PATCH v2 10/10] systemd: Upgrade 259.5 -> 259.10 Date: Thu, 5 Nov 2026 12:09:30 +0100 Message-ID: <20261105110930.52643-11-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261105110930.52643-1-jaipaul.cheernam@est.tech> References: <20261027110126.9383-1-jaipaul.cheernam@est.tech> <20261105110930.52643-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: DU2PR04CA0355.eurprd04.prod.outlook.com (2603:10a6:10:2b4::34) 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_|VI6PPF0806ED8F1:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fa49c9f-6a22-4db7-a233-08df3b2d4f65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|260925021311599003|260925022911599003|260925021911599003|261026140227099003|4143699003|5023799004|11063799006|56012099006|261022075727099003|261021121427099003|261021135927099003|261009223027099003|261022105027099003|261102123227099003|261021123027099003|261028144727099003|261026121527099003|10067099003|22082099003|18002099003|6133799003|3023799007; X-Microsoft-Antispam-Message-Info: lwMeV0tiFuSLKezqwFExnPZ8PsvfmGN2QbggPksVYXnXpPzZckdOnQidpN8SDU5EocRl/D8O2nXW6uSSoQqWb31W5CU7Nfe+exkg7jjo2v8jqAZNz+F0ZTghgVCiDfqNPlsEU06X36m24XL/onU6DytZrZDdbm3MyRTDlz/zekcsQld6UxB7HaGPFW7rN4x6oXf8hVxK5MZoqT7cTEXxT6UAZLAhYQF3GsO4CFk6KPYxoI2k/2GEA7HsOUTLbs/Cu3zwKjfAJgh6OWrz7dhGQXg+XNjwCke+o4eEOat8wENDgFJF0qMmL1b1BFIqkoo1G2PnSCXUyE/V7mFfNSzn1Exgoz1qyt6HzngY0p8qWouqSQhYaBvpScHTQjB+3inDK9ARIinoFjLZQaYE4CUbQARWz21LLIToy3YyFkFo7SFwJP8EcV9zTkl5ApGv+40anVRmCjLfw57N+vSxmocxGowAzfq9nsRn/j9wpk/p4ZpFB0AJwH9sgzVfV+i9lEyu9LHo7a/Pxxr1A+suYll0G1IDQCRFv7ULk0ur5ckxyPIT0dWtXXCt33H6CAuUlWgJbKsA4wvINKLLuy/VhhoL6MRipnDk2BwXAXKyNTXcgmb+k1atqHbHpMDjwNbyuhcL 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)(376014)(23010399003)(366016)(1800799024)(260925021311599003)(260925022911599003)(260925021911599003)(261026140227099003)(4143699003)(5023799004)(11063799006)(56012099006)(261022075727099003)(261021121427099003)(261021135927099003)(261009223027099003)(261022105027099003)(261102123227099003)(261021123027099003)(261028144727099003)(261026121527099003)(10067099003)(22082099003)(18002099003)(6133799003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y1dRcaNeYxcGLXjv57ETC/ztU51aWU3ZU+xJ32FDyqJkaHvkYuZoM7sMFKupBxvDgUI6d08u3xo6raPWVXKDmAktxgj7yRFFoJveIQLxvkSsWmLxLyBhwVKqMizpUoVEfQZhP/MQMGQHZjfWZy5C4mH5q0g9r6emxMY1fV8uZlPr7vOjSlbRgCPzzAB6vVSDC5ViN6LyVZ+MhaoMfs9zTtdR1IHXiIz0s5eiy2+8QmiVYKNcaV7vAwslb2o5hn4aNQg53oDJxbyG8aeKfPnBUpazM39UEt9sqaJ7LiFlTqGT/ya4WHhXbnsImOCf/0abdJMOQ2bA9EE5G3ksPABm9uE34QDXEPTzHOu893Bo8WLduTeMS+uxtmaMOsaMaAr3M0Gm5nP2fUn1WFMLFsd0BJ2J7Tnufw5kHlxhGNkWuj1Cba6Qt85ES7iJeP743b0MsEv2RILJGxMSD6KDZqdya5pwnoLsTV5cZi04AW5bAtU634oIJ8V972KXAEE56SraREMd8Q4befj/O7MkxmPQDl9k+sDHcKo6y4Ni00WCbsKzxJULuP8Yjd8YtHu3Sq2A/yZjtlk59zl0AaBbYknxrpDdkga23n5EHPdN02vLfbBD5DVwQZNoPzEjW4MA9ffjIFXJ/WsOQ3OKm6ufVrpium4OhRCDYgQJVLFVUTpf4y2SGkhynmR9KNPmvZYH8UEbgh+kQUW2jYYNqrVhHvSVRx9o3JNG6RF+IPckggnJPg6obMmeCtrPmN7jXKd+NEDcbnalEU5aOa7dZ3DXfsC1jF6inojrN4bW+TrGaJkqws17SnfJzdr6G7st7GC5BgeolY9kEGHi+LXvKb0bYB7E+pWeQUZwtFtNbKG0BFx+mV3ylmCzrbSq9/nL/46ldtBX/nreqZNyU7uCFQb8tXg5e+yFDKsIuiVdr8MgMJIfDagEkZLkrmf/eVoN2LBQ/NOKgiopnyGIGybHb5m1iRBR+g4sLMw4a54NBPySiAY9dNxl0To7qBTKIp5YvIBzPbz1qHyBPYDi3b38/BvAih86ZzYYDWJRXJ1OcpET7HLXCpM0hLKhvcoHdK8ENpAFBk3mK33TT8IO63YtjDTbdfeyp0JOk4fbQarI2lgRYEe+OAu3jVL1oxCWJOUbxFs7nxe+kXUPXoyP7VmmBo97nLLg9Sv9arSSOQFSSb/qANiH9X1YMI5O7r74ZjWeacfQO2/UIAo42blUIZ1vEe32VDtEf0/CItGlQKMBD/hAHpGTOjfu/Q2CWucyBS3g+oWx3bVaLSQpj25zTEsdkXanEILaUY4rCsml09LiQF8+Cn5sU5/xB9fEJ8cl0KVr3Qe2HvHxS0nRtKr9VJZwy14+HGTqnASC/OD3LvlqM2RsW1Oa/p8NDGnfblrAJbgbtfeq7RWO1Zmo0txgP0JDvOASLf65uj/odG9GxQuHsY/ce5uOCrrayaXzHqBfQwuR2H8KnFZDL/KiUMkP9XBwIXF8aNQ+uG+aLIyZu+rcUz9vQ8coXRHlyCjTqYhnk7AvoxYtMvyl9/Y0NDz4vLZYGDRarS56NnRUtXP5Syw8rsN6bxp5kMePh/UO/qopsYBjerXmzBtUf6v02MUWLus7xdc6Ju2RvsovpdZrk1MeMaMF2VCagPckiJ7S3A2WQ2jlbUs8lAU0piNgWWI5QLlsPACiudViPs3uVX/NEzwKTyA4YRDJylT868p3NfZof3rYFYYzksaUb7lvLh0RMIRktTcATs1JhQ== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 7fa49c9f-6a22-4db7-a233-08df3b2d4f65 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2026 11:09:50.3110 (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: 853gEuR2C7DIbBEbdqkb04dhwh6Zll9HROCnfQ691qNvrC6NuQfSj7emV/FQ89AfimrK6MSkLJKXFzGVe5nhXkuKX/y8nEJ4lx1aW46qulw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI6PPF0806ED8F1 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 ; Thu, 05 Nov 2026 11:10:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249537 * 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-tools-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 ...59.5.bb => systemd-tools-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-tools-native_259.5.bb => systemd-tools-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-tools-native_259.5.bb b/meta/recipes-core/systemd/systemd-tools-native_259.10.bb similarity index 95% rename from meta/recipes-core/systemd/systemd-tools-native_259.5.bb rename to meta/recipes-core/systemd/systemd-tools-native_259.10.bb index d8d0eae009..81d37c5b75 100644 --- a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb +++ b/meta/recipes-core/systemd/systemd-tools-native_259.10.bb @@ -4,8 +4,6 @@ require systemd.inc SUMMARY = "native tools from systemd" -SRC_URI += "file://0001-hwdb-strip-the-root-from-filenames-when-generating-h.patch" - # We don't actually need jinja to generate code, but it's checked for at configure time DEPENDS = "gperf-native python3-jinja2-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 32fc04352f..95032bf13f 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 = " \