From patchwork Wed Apr 16 13:36:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Anderweit X-Patchwork-Id: 61433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6080C369BD for ; Wed, 16 Apr 2025 13:37:34 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.108]) by mx.groups.io with SMTP id smtpd.web10.19769.1744810643518283532 for ; Wed, 16 Apr 2025 06:37:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@phytec.de header.s=selector2 header.b=sn+v1MWk; spf=pass (domain: phytec.de, ip: 40.107.22.108, mailfrom: l.anderweit@phytec.de) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AJZeuJ5n+VF28ju59qUzhnRgF67c0la4iXSIzsx+6FKDkTOxq+LCY/KgS45HW1eWT+uQctyftcuM2GseB6Gv00g00iAzny6VgNfxYgEYsjy5OFSWN48+y1riCp8o895nEgcg5SnBEXqxXH9DC6Kf12ozabRvIe66KG/tgh4X+2ANYOC56BV/K0RWl1MphghfzP5JeGh+5wJF6w1wJ1cyqp34zREOzLPHntWQZGKCqvjTi3EmwExGpDMHAtKxeqq8OpxJuoDdeVwLUlAIFgVQgXQHroclxmxjO6EhCwSPyCWaz06lEwKxr9QqcW38F3pWY8mCvVr864x2uvhLOrvJgQ== 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=p2g2I2/ewocLW42a9cbc25sSRx8qd+FsNrf2FVprIyc=; b=GeyKOK/7N+pxmSpBpB8R6pAi5c0MT+D7u7xMHgEyTe8W4VfOP6gx/1v49y3iZsyUwnvdgGg9C+28FggVNT6IzHj2W1hTIIZuZvDlSaqMpzHFvf/DIzQ1Lx86KVMEQ9oTAUqaEL+rjVtma8UFDqrl/Assw3K5KP80EgL4ZwclIg3VjAAEO/UZX2TJRoh6iY/CLjOL9B2YutRbx6WfywqDAG/pOW3zxDDgLvGqr9lMyi7Cr7ky3H49O/ZfcHTHs7zS1tKRlKIfeHUMyFtFdke/86U4ZupAyKE1PfFOaS0u8j1qxSEsk/t7vXcJKhd/hRvKLZlSuBU3JladNkSayHOB0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 91.26.50.189) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=phytec.de; dmarc=fail (p=quarantine sp=quarantine pct=100) action=quarantine header.from=phytec.de; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=phytec.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p2g2I2/ewocLW42a9cbc25sSRx8qd+FsNrf2FVprIyc=; b=sn+v1MWkBjGtOZs0tKvIRdT5ByUXS3bNkt6R4N+ot+DuuSBEKCOZc+4i+9mC0hPC75wzVm/z0Pldh7loQFsy9AWe2dIO6kDK0DUnpG7h4CPlFQdLJ6tEWG6h5GbCyK2G4IHpB/70cijKBMUFFO8IwHHMZQ4ejro6hh3081TuDQ+0vpShSt3DO08nkL5yU3bcKgBLmS4k+PahugJyYNmb4HyazJicGaS5bMQIR6nYcuMNFTu159aWdzvweGxLMv+jCqHHZO9NJtmMPVhWWEHgvH9LwN9sAxv2xTRvJJohx+/lfJmzAbk68PtQE/rFYRRuX6fLRtgM+tytmdiAMWse1Q== Received: from CWLP123CA0013.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:56::25) by DB8P195MB0535.EURP195.PROD.OUTLOOK.COM (2603:10a6:10:158::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.22; Wed, 16 Apr 2025 13:37:17 +0000 Received: from AM3PEPF0000A792.eurprd04.prod.outlook.com (2603:10a6:401:56:cafe::69) by CWLP123CA0013.outlook.office365.com (2603:10a6:401:56::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.18 via Frontend Transport; Wed, 16 Apr 2025 13:37:17 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 91.26.50.189) smtp.mailfrom=phytec.de; dkim=none (message not signed) header.d=none;dmarc=fail action=quarantine header.from=phytec.de; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning phytec.de discourages use of 91.26.50.189 as permitted sender) Received: from Diagnostix.phytec.de (91.26.50.189) by AM3PEPF0000A792.mail.protection.outlook.com (10.167.16.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8655.12 via Frontend Transport; Wed, 16 Apr 2025 13:37:03 +0000 Received: from Florix.phytec.de (172.25.0.13) by Diagnostix.phytec.de (172.25.0.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Wed, 16 Apr 2025 15:37:00 +0200 Received: from llp-anderweit.phytec.de (172.25.32.131) by Florix.phytec.de (172.25.0.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Wed, 16 Apr 2025 15:37:00 +0200 From: Leonard Anderweit Date: Wed, 16 Apr 2025 15:36:24 +0200 Subject: [PATCH] meta: classes-recipe: uki: Make initramfs optional MIME-Version: 1.0 Message-ID: <20250416-master-v1-1-be5e7309c5a8@phytec.de> X-B4-Tracking: v=1; b=H4sIAFey/2cC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI1MDE0Mz3dzE4pLUIl3TlETLVHOTJIu0ZCMloOKCotS0zAqwQdGxtbUA33y wHVgAAAA= To: CC: X-Mailer: b4 0.13.0 X-Originating-IP: [172.25.32.131] X-ClientProxiedBy: Diagnostix.phytec.de (172.25.0.14) To Florix.phytec.de (172.25.0.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A792:EE_|DB8P195MB0535:EE_ X-MS-Office365-Filtering-Correlation-Id: d6adc194-17a2-4225-42d6-08dd7cebc5e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?q?veRN+d57JEy0FMD3T7Bo2ObKi3HkhPZ?= =?utf-8?q?KZMG8JsuWb3cJPovJ+OWJEL/EMihYl1l6q3UCDGBUfNQonzqG/2tnBRhTwmTmsWct?= =?utf-8?q?mlXUlT1wUiAvIYQ3rZINXhwaqI/WTRd1V4ogWxN/56uIRXuLm+sdHREZrsczzHD6t?= =?utf-8?q?5RJ5NGCRgXuaI4iuhbaVtVhm5sDKX31rprtqFbvLQ3mQuoQalXGAxt7HK9rOrlX1q?= =?utf-8?q?2kMY3jO8YuDRhim/8LZ+tRVDoGhPjreZG0ayt8s2oaNIFaHQCGX7XleAv8o2mMRp6?= =?utf-8?q?QPUpsVJkhZM0qpgzHbH/42wcbrqOD4U3wUtXw/J8km+TVUquJk26CYKa44dPGjjJh?= =?utf-8?q?YLackQwfwEKssgICvMiB68vnU6En9Y+J6+WAON2Rz6VYe6wQBKLYM7p/FAtnbet8R?= =?utf-8?q?gJq8G+n7rOAQ5M7rOzStX9afXmWqoXQpfYTBFbCV/IY1FDeqvkk8ZmPlTBrUaxCOf?= =?utf-8?q?Np8DFg7Uo55BgQyZgVIvdle6nT6Q9Z0zXrsNAwGzegCv6i6u0RdI22xNmnGTPnsmN?= =?utf-8?q?naC6CZ11a7zC7W83PMHAC5C7fRDBub6UhTtZtiWujU7kTtnd3FjtnPrU3E6O7GJbL?= =?utf-8?q?q0AtpPeTH+mvEljCHnkwKMPn9efq4Lqs4NlsmbA5vqDv4tVz96LtgZNhNP5alWeBk?= =?utf-8?q?QOkGYOzQkdscM0Dd4KX5VHfd5XWOPKzTHaO/D0x7vL2bV73QfA1bKwDKqbwMouDdF?= =?utf-8?q?zGRwJb2L+2fGZBzvPO9RPDaPsdvJh3fSlySzqs5U9EUDGSTxGQ5PFryjVwU7ZlclC?= =?utf-8?q?QN/XV9+8cw5Xup7tiB3ltPfT3XHkhl4gfJfEN4p6Wum2MolnenXN4MQhguD/Qs/+b?= =?utf-8?q?rbt3VKxWgaW8Hrzi1Ipm0be+xQY96/dIieZfGIe4fLhm38i60VR6BuiO6GhpyEO1Q?= =?utf-8?q?JD6RKqhnfbyWaHqr81KkjWqGsaoZqNWPhYgrts06blzq4CvwY6SegUy9efwQsMwlj?= =?utf-8?q?cvldVz7lK76lD8AFz9i9+AMBeD1P2mgHKU/f5S0t/yfL7//JHxKlFwb0M6nMZlhgr?= =?utf-8?q?9/avugjHui1C4YHTkDXZeO3ZwA+tTmSk1Gl5Uhh/opMl4PyGjwJBmKAA9fNs3R2Ax?= =?utf-8?q?RR//cMYXkrt7AS0AzKFbAZzBQzk0g8H3iIqVnLeDHvmDw2pIZ/w4rTqA+pHiOiPb0?= =?utf-8?q?T25JQ7AJn8PR8GjbnY7Ndc5gkBdHF2VTw7rIApYiqBissqfPss3fqX6z7Mp3Tx53e?= =?utf-8?q?NfrYTzj0fi8Z5aAjJq2lCAfBNN0TQzuh+F3vKJXsPBEencqI21bQVv6YuJ85ExsnT?= =?utf-8?q?ANyh9xgrv2+ah+tLzRnwOyXCuQtNr8yTUCGP1AMVz2sZ3Pen9uJrIxoOPEVXKGimg?= =?utf-8?q?wLVn9CykVtLp3rSlR8BmXjeVnGapBWjbekvj3Vxt5Y1FYg/5A+wXPpVSZ9GRpDN6c?= =?utf-8?q?JFMCvqAgnIsLZAu/ziNX9IrTIVvaAEHFQ++nI7L/CHPo8oISIHdjLR6rjbH3IyIK7?= =?utf-8?q?LLuCpbfb2C?= X-Forefront-Antispam-Report: CIP:91.26.50.189;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:Diagnostix.phytec.de;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1102; X-OriginatorOrg: phytec.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Apr 2025 13:37:03.4328 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6adc194-17a2-4225-42d6-08dd7cebc5e2 X-MS-Exchange-CrossTenant-Id: e609157c-80e2-446d-9be3-9c99c2399d29 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e609157c-80e2-446d-9be3-9c99c2399d29;Ip=[91.26.50.189];Helo=[Diagnostix.phytec.de] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A792.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P195MB0535 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 16 Apr 2025 13:37:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214990 Make it possible to build an uki without initramfs. The initramfs is now optional and will only be included if INITRAMFS_IMAGE is set. Additionally, remove do_image_complete dependency on INITRAMFS_IMAGE:do_image_complete since do_uki already depends on that and is executed first. Signed-off-by: Leonard Anderweit --- meta/classes-recipe/uki.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- base-commit: 183e043de423fd3f7833366ca524a6f7d17e6d14 change-id: 20250416-master-5da9e74b8fc2 Best regards, diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass index d9a7fb0e6fe0..4db5f614b96f 100644 --- a/meta/classes-recipe/uki.bbclass +++ b/meta/classes-recipe/uki.bbclass @@ -75,8 +75,6 @@ INITRAMFS_IMAGE ?= "core-image-minimal-initramfs" INITRD_ARCHIVE ?= "${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES}" -do_image_complete[depends] += "${INITRAMFS_IMAGE}:do_image_complete" - UKIFY_CMD ?= "ukify build" UKI_CONFIG_FILE ?= "${UNPACKDIR}/uki.conf" UKI_FILENAME ?= "uki.efi" @@ -127,8 +125,9 @@ python do_uki() { ukify_cmd += " --stub %s" % (stub) # initrd - initramfs_image = "%s" % (d.getVar('INITRD_ARCHIVE')) - ukify_cmd += " --initrd=%s" % (os.path.join(deploy_dir_image, initramfs_image)) + if d.getVar('INITRAMFS_IMAGE'): + initramfs_image = "%s" % (d.getVar('INITRD_ARCHIVE')) + ukify_cmd += " --initrd=%s" % (os.path.join(deploy_dir_image, initramfs_image)) # kernel kernel_filename = d.getVar('UKI_KERNEL_FILENAME') or None