From patchwork Fri May 30 11:24:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63884 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 4114EC5B552 for ; Fri, 30 May 2025 11:25:35 +0000 (UTC) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by mx.groups.io with SMTP id smtpd.web11.4124.1748604330661913987 for ; Fri, 30 May 2025 04:25:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=FLoweZll; spf=pass (domain: linaro.org, ip: 209.85.167.48, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-551fe46934eso2379246e87.1 for ; Fri, 30 May 2025 04:25:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748604329; x=1749209129; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UwULjfA4+Svk25iwrC+LSMPyUqWecEmIahklQsp95UU=; b=FLoweZllDdUjLxcE48VW9gXkSPPux08OOw1T3vYoiYOtEeeXtfNiYVnu89O6dSKadV hw9hKP4s9nYEK1POMlG9LBZ/tf4ztQlio/wlXlhncQ+Pk2zrmXTpUz8PvS8++aaXSgnN 6AKN7InBntmorXgPLqEPMk4CRNVTRdItHoXvqzTzKGe5SEJgkGHU32UdMObdlrsFQHA3 TNn7KX0PRD5XyMlhV+uPWpNwdjqKcHf1FBNVavaxcIBI2cbJWgUcFof0x4P6IW0/khQi 2IKEBJDhlDLpED6fYMWJVWzrmNH1yZtv+Csp5YqLTCPmeKtCaDPIMlizBVyjsVYh8dQv ba5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748604329; x=1749209129; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UwULjfA4+Svk25iwrC+LSMPyUqWecEmIahklQsp95UU=; b=amRvCSEwF7PhqN57N7eCBUfBvD2/2kCzKM+noMm7ekTizMxZr6PTa0WtIHvAnpa+et JqDG/PyS/mbpH+w40Y0EICvJIIXMQww2n7SZUn+aO4ytB4de3TmJYG3cIMZyft8M2G4t 0K5oG8MyuCbXFQj9Wip7X8UmDxTV2tzeHGpTBO82jxNtcOEKxOEy+Lx+8MYn5S+8jQYi 3G5VnH++TATjc4Jd2omccldZUQ+YDGfh25ILCgEh9rXjq62cwpbYEnKAzbs0eHmgWLmo 0bLo0ETbajF5TSPZVfln9Id8MZQ9rSiFygezoG0nVvTdWXNq1XU7zpkq07bpA17A9riC 6JpQ== X-Gm-Message-State: AOJu0YwbNmRnReQwyZz8Bb6ynjGsgJCeCWxxf/7sPsnFBBUPgcb4Neuk Qfy3MxJjPhBG/HQT9mVbKnaumyUnbGht2r7fGahvltQ2ShsfNsZbzqTTxACBadcxTYFRlVkVTvc rRrH2GFw= X-Gm-Gg: ASbGncsu/Reuv3acmxx3CXxg91sqYh/8sqUKtJgKG9WDSnzl9JikPNxDL/PYTTGbU72 +7W4QnA/lMzw0CxNP5Jwy6uNKkr5862f39ijNodRG3iHGynNIjKQP7DtPFqtPhpLy2FeDxSxFLS gmUY2uc4enngQdwysOPcIQizWMCefo+TR/m4Ctj3Qwqu/d90avlNKxw2PwB8GoKlWUV079zxB43 C00SYeQwVuN0drneucM/Nf2F4LN7PwRl4u2M3FXBJdH2000O2ZfV/GAuXz8Kn3Xh/UScg+x/nj9 E5fzKdWiRltECOm2xjyMkBFmbU/xsyF/wR69DaJJKKn3mpsSx7NRYBQ9FQqv7cI4V6ftchjfoLh cM04NCGeTCXHiD6vor8b+9tVerplf716hQeB59PQ= X-Google-Smtp-Source: AGHT+IGBRTErJ2QW7tlI9DHT4XDvTAjWCo+rTPKDcT+I21vD4/s+2svNX51mAOKdLgeP3jJAroSlHA== X-Received: by 2002:a05:6512:114b:b0:553:268e:5011 with SMTP id 2adb3069b0e04-55335b4688amr2539096e87.26.1748604328554; Fri, 30 May 2025 04:25:28 -0700 (PDT) Received: from localhost.localdomain (87-100-218-141.bb.dnainternet.fi. [87.100.218.141]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5533787d35dsm667377e87.46.2025.05.30.04.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 04:25:28 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v6 1/5] wic bootimg-efi.py: fail build if no binaries installed Date: Fri, 30 May 2025 14:24:55 +0300 Message-ID: <20250530112459.776330-1-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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 ; Fri, 30 May 2025 11:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217492 With systemd-boot, some builds included correct EFI bootloader binaries and some not. Thus some builds booted and some not. Check that some boot binary was installed so that build fails if none were installed. Signed-off-by: Mikko Rapeli --- scripts/lib/wic/plugins/source/bootimg-efi.py | 7 +++++++ 1 file changed, 7 insertions(+) v6: no chnages v5: separated from modular kernel changes, changed from shell "ls" command to python glob diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 96c710bf77ad..e0ee2f712774 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -367,6 +367,13 @@ class BootimgEFIPlugin(SourcePlugin): else: raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) + + # must have installed at least one EFI bootloader + out = glob(os.path.join(hdddir, 'EFI', 'BOOT', 'boot*.efi')) + logger.debug("Installed systemd-boot files:\n%s" % out) + if not out: + raise WicError("No EFI loaders installed to ESP partition. Check that grub-efi, systemd-boot or similar is installed.") + except KeyError: raise WicError("bootimg-efi requires a loader, none specified") From patchwork Fri May 30 11:24:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63886 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 3D856C5B556 for ; Fri, 30 May 2025 11:25:35 +0000 (UTC) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by mx.groups.io with SMTP id smtpd.web10.3993.1748604332525657335 for ; Fri, 30 May 2025 04:25:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=ae6M9SV/; spf=pass (domain: linaro.org, ip: 209.85.167.44, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5533302b49bso2635438e87.2 for ; Fri, 30 May 2025 04:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748604330; x=1749209130; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XCBzfsKiAcKNKGKcZS+HN3AnjGOGh6rvqC9+btkMIyU=; b=ae6M9SV/jGUWj4xXyDg5H6Zmousk8bTHh0ghSYjo8BM1mhxc/0MpTIEY+8ArukEIbX 6zOnpxxyqh1L3fqY72MQbP41tCt2Tp2x/pZJLf6Hw7ceRkUEfomqTUik/wy04EnT4Csl zSmJgM60RF2M6Ow3OghCYZBskW6/dt4Gj4YdTIyej9u4r2sQCReUn8gusm0uIZ43lUmt Uv/WZjazmbBiYUX+YpI1Ggqrz7zNRnVa50F+i96B92NcMGjtiLbGJv0R+KqV0V++/jse +bHGzQJbN7LD4eb9PGBeRmyWXHEU2i60tdveO2PE6h1xffDmEuCtutWKmuk0yWWTC78P EJ3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748604330; x=1749209130; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XCBzfsKiAcKNKGKcZS+HN3AnjGOGh6rvqC9+btkMIyU=; b=l6OjtxX72UphndXD+LEWgq9zGYgckwkil+aK7WKiUPSjJdUvXkzB9Z3p1d8zRthFY6 bqYm5LT8AYW+cDFxZyz/IRP5yslfpl5YJhJezRf24qz4l5M7aVMtpd38PW/AcM2KMEn4 +Gq0Ns2xcUC1aI3cF2Yeuan3vYX0hRgD1SLLmsTqtw+tsDrOAotTBLwdV3yxU67YvPu8 ezizMpiaWLU7GhldvjxpwUEBVenehj2bcOsMTFG3T8ES0jsfEkaD36fT6bYmpjJKHSIo M6pFBWESo5oeq7uXII1pzTQE86yiWgRc8I7ZAE51kG5QsO7VUHYD02quwAPi4xtMZKun a95Q== X-Gm-Message-State: AOJu0YwlKimMSAHGKGv6m3QBfSKx1iFNgjQJlRy4WE0We24gs1lp1c7S hGYrlTxaOxYB4RmwUIk2bid6ZkP6VdOqge8YOOJkddMptgA8HLRLCA7jpMcv/ZTp+A+Wr0h6V5G zn1lqgGs= X-Gm-Gg: ASbGncuqebk/exZX73xA0sxCkLt2dmVznqNwMWH/zlR+xtRQJrP1V5cCzyrXUyaDEeh dTaWJHdi/Hj7HF+KpacFH8LBtHS6D8Fiy46AcEsJSiGg366mjDBO9BKFrtmpq39rBLvTFzu6D8x o/6T8tdOwPGD6eioA5S6rlVYFWHXmLBqbju5qETs7EiVevB/xig23sTeTaWLp7HX+qQjA5GBOs4 WBInIduy25eIL8CKV0EbSxU5cWdCKFriQ4cn5Q81S0jjbBgHgbpm+hWmU/KX6pmwD0+2YoKjZyf 9jW1r5W7JOZ+yupetp4lJCfi/ZiJrReqxrn4q7k71+P6egj4zlo159gQBwTxllwVLYR16nlubNh VLuj0Vz06J6T0WkrV9vc0/gz//l1Rd0aAyC2kFas= X-Google-Smtp-Source: AGHT+IFaGu3RyPRi9EU8h7GvKRTJU+ITcWR6aUzdftf/KZZ9cpHg1xdPe8+rBCSSWwB+sYAt+ilqOQ== X-Received: by 2002:a05:6512:3d22:b0:553:2cfd:5958 with SMTP id 2adb3069b0e04-5533b8e10c4mr1002742e87.8.1748604330479; Fri, 30 May 2025 04:25:30 -0700 (PDT) Received: from localhost.localdomain (87-100-218-141.bb.dnainternet.fi. [87.100.218.141]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5533787d35dsm667377e87.46.2025.05.30.04.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 04:25:30 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v6 2/5] image_types_wic.bbclass: depend on grub-efi and systemd-boot on aarch64, systemd-boot on arm Date: Fri, 30 May 2025 14:24:56 +0300 Message-ID: <20250530112459.776330-2-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530112459.776330-1-mikko.rapeli@linaro.org> References: <20250530112459.776330-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 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 ; Fri, 30 May 2025 11:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217493 On x86 family builds, grub and systemd-boot are always included and thus get built and deployed before wic image builds. On aarch64 builds that was not the case. Result is that some builds added systemd-boot binaries to the wic image ESP partition and some not, though bugs in wic plugins contributed here too since missing files were silently ignored. Boot of such images fails since firmware is not able to load the default EFI binaries. Adding EFI_PROVIDER to WKS_FILE_DEPENDS_BOOTLOADERS is not possible because of parsing order so adding grub-efi and systemd-boot to aarch64 and systemd-boot to arm depends which makes sure their do_deploy is always executed before wic image is generated. Thus systemd-boot and grub binaries will get copied from deploy directory to the wic image ESP partition, and boot of the images succeeds. Signed-off-by: Mikko Rapeli --- meta/classes-recipe/image_types_wic.bbclass | 2 ++ 1 file changed, 2 insertions(+) v6: no changes v5: separated from modular kernel/systemd initrd series, os-release removal added as separate commit diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index 61f028bd7bdc..90bf8c7a60bc 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -111,6 +111,8 @@ WKS_FILE_DEPENDS_DEFAULT += "bmaptool-native cdrtools-native btrfs-tools-native # Unified kernel images need objcopy WKS_FILE_DEPENDS_DEFAULT += "virtual/cross-binutils" WKS_FILE_DEPENDS_BOOTLOADERS = "" +WKS_FILE_DEPENDS_BOOTLOADERS:aarch64 = "grub-efi systemd-boot" +WKS_FILE_DEPENDS_BOOTLOADERS:arm = "systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux systemd-boot os-release" WKS_FILE_DEPENDS_BOOTLOADERS:x86-x32 = "syslinux grub-efi" From patchwork Fri May 30 11:24:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63887 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 3C7A1C5B549 for ; Fri, 30 May 2025 11:25:35 +0000 (UTC) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by mx.groups.io with SMTP id smtpd.web10.3994.1748604333432247528 for ; Fri, 30 May 2025 04:25:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=nY2css2t; spf=pass (domain: linaro.org, ip: 209.85.167.49, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-55324587a53so3696033e87.0 for ; Fri, 30 May 2025 04:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748604331; x=1749209131; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=taZJM352csUu8TsRZrmDcVxhygmZ595xbtxpAb/3epw=; b=nY2css2tvNPwzsH4gKhS/2PHi/dqxUSM3ktgAYLy+mJsGAa9pW8mLvLDhSrqGo+074 aOqBkfUke4JZmtD/qs4RawkVEaD/jh9Z1jYGJgb4PkMDCAccBMroyy6pL6aUngsL4uDa FePAegXZ1pjUcLdkFlmv/URjmsVuRQvnJGzHmZj2B+yC/P/ShBHce7YXPVU881n72mUZ 5lDSk+fjCc2CY836Qxv8D+Ty6PeI0wuRrG0OLcxqYTtzRAtqxmIWX8F67on0sGAw3nf1 x1Gri7awEyWqvAT75LDhSKg7HGaARWBosHCKzV64jF82+9zVF2GuWOlsnwSr+i6VX/ud 5ohg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748604331; x=1749209131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=taZJM352csUu8TsRZrmDcVxhygmZ595xbtxpAb/3epw=; b=i9Gc9fFfI4jEz7Fi6eGMisYFokVCYhx2YwpzpwXjU9DSQmcWSY6aYd87y9n6ISmFgv QPSg2JCqWFcOzQn04xJORZM1F+ExtjVjourMhrSa9gc9MgcgOpiuvOIWBfHp5nXIPpGm J3FwiMdBNz+XSdcWwFyE6Q26wo+MZrxzkH/DjaFRpg6EUhpv+n1g22x8UKel/mpE5j6i rWbcjclvA8TvkkqexZ0VFFwOHlw6bISVifptep7WOXoJLiR1Eog66Ih5uFnPzb5wuFxr tr6054DISfdNVB4tcchqYsJxTDL3qY8xrmJu6Q0L0YXb7jgvkKREzvekim1OWVE5+3pj /mXw== X-Gm-Message-State: AOJu0Yypn0bjA/ImKmPLxxHsKK52YK4YxgO59zZ5b33HUuahWk/BjFiF +tfA7KZY04tmbXsUi7sEA5Jj5REeSQJLQj12/1S7cF5pTygakGrUSi7F7yD9XGXm6w+ukQogguC Z9C677Ow= X-Gm-Gg: ASbGncs4JcGc+B1IArdkLdv+LoU+lg35C7UgPTSzlP1BsKfE8h8sTpefHMiQNIKB1bw QVC0iBfjwGBEV3+ok15G9rdimH2UKiumYsjnh2EHY5KmIKcv0wslXUSgZl03FeJPKWqxpUjtfUM bNHHjFzfo6KxgqFMVKVoPhBX/OGsXhKrqA7n52jwQ2MkwWBnaB2pScsYiUjmj1zrBdFE8WmsyaZ r1ryNxzJdT/Aim+S1OVg+s/6RnD6+5DeT+hgEkALU8CLmwJ7uC93hDTY8b6RuJpSXLNHOx8kvph 9+tBwiQ874txiNrsn9F8JmUnrRYKbhRTQPW78yY+ZSRuZsE/eL1ZNbxGIjPT7TMG1cIVZXIVkZy vU4lXLYZ5pbNqQJAu3Ls+zJZLfvre X-Google-Smtp-Source: AGHT+IECJg/KCsyHs9FC0c2Y4skYH1f8SinWuDyubPNuIPMyGUfnHONoK7vm1em8usbesPnNYaMWYA== X-Received: by 2002:a05:6512:3987:b0:550:ea48:a4af with SMTP id 2adb3069b0e04-55335b1180fmr2440349e87.11.1748604331529; Fri, 30 May 2025 04:25:31 -0700 (PDT) Received: from localhost.localdomain (87-100-218-141.bb.dnainternet.fi. [87.100.218.141]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5533787d35dsm667377e87.46.2025.05.30.04.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 04:25:31 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v6 3/5] image_types_wic.bbclass: remove os-release from WKS_FILE_DEPENDS_BOOTLOADERS on x86 and x86_64 Date: Fri, 30 May 2025 14:24:57 +0300 Message-ID: <20250530112459.776330-3-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530112459.776330-1-mikko.rapeli@linaro.org> References: <20250530112459.776330-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 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 ; Fri, 30 May 2025 11:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217494 os-release was needed with UKI generation when this was done using wic plugin but now with separate uki.bbclass wic does not need it anymore. Signed-off-by: Mikko Rapeli --- meta/classes-recipe/image_types_wic.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) v6: no changes diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index 90bf8c7a60bc..a64beda95e5f 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -113,8 +113,8 @@ WKS_FILE_DEPENDS_DEFAULT += "virtual/cross-binutils" WKS_FILE_DEPENDS_BOOTLOADERS = "" WKS_FILE_DEPENDS_BOOTLOADERS:aarch64 = "grub-efi systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS:arm = "systemd-boot" -WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" -WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux systemd-boot os-release" +WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot" +WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS:x86-x32 = "syslinux grub-efi" WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}" From patchwork Fri May 30 11:24:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63885 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 57D57C5B559 for ; Fri, 30 May 2025 11:25:35 +0000 (UTC) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by mx.groups.io with SMTP id smtpd.web11.4125.1748604334507521708 for ; Fri, 30 May 2025 04:25:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=JpBQK72K; spf=pass (domain: linaro.org, ip: 209.85.167.41, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5532a30ac45so2001223e87.0 for ; Fri, 30 May 2025 04:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748604333; x=1749209133; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=26MNH3WGFPbjEpSznGaRaSeWRRgk7ILmF5ACGqf2lOk=; b=JpBQK72KBnbdbpZuV1RHowAFv2S0pDSzWN3xynsISWLW6LTBilmUnUNiLtvk1Z2MG0 5z4mHWmL8iG7p9hRxEToFt8bRqcIBKsUN85FzjeoXnBikUBgwe3K9+oPAVD6fZHdb+4j nzhL3nMj+QcSzAgxp8gjM5mJyI5xtEBnhKcFIYh+EWmgZGr6qpAfmedN4jwCH41WVaW5 7+YeB7nhon1G+Ocd2L2VHzNktzFrIpgQrVgqIsiB4MEWHj/ea6D34uFTzmatvLlmu2Wy BzHn6g6EpAFsEu71tct2b+Koi3vXB9v5tKwTfNNKFjZ2eE2rpNEsfo4AQU6s8O3hzQE4 VVOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748604333; x=1749209133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=26MNH3WGFPbjEpSznGaRaSeWRRgk7ILmF5ACGqf2lOk=; b=NFC/0e7tsIWj5KxeKZMTLriFy00uhTSQm4j+fs89V9cHiP20xofD2fQrqFxYEjLETF Zvi8JPKZCrEo1PFXP2S+cs7gqyjrg1mNcYfORaa6xh1z8kdF+ve7g1gRzBZvAoWWdcQQ k2TExjijvHE4J582mDNIRsh0umdHPfO+FMECuvtK4ovOYmiymOrVZ8ExIR854Il6XjWj k37dLiNiGhSZqTxoSL+kFEWVHHRcOTu7dfivaT+RcXrnR9smZSkKuR6H/gjUT3KzyP/o Hl4SJDbyRyHkq8Y8g3SM05C7ZHB/WwuNHk8f5cooskbFcqH30yLRcDmZ/+mPCwqbx6Mc E13g== X-Gm-Message-State: AOJu0YxEJzRZPbDydUOb42/inkoQEQGk9Eh7KTqjyDagjHUYqIBI+VDL 4DdWG9QqxifREbzJH8N3A45hYUeqbKZe2J1RLKS38ixcA3PEDtPsF5GYUl3Olo1/um6GwCXF7ch i94p47a8= X-Gm-Gg: ASbGnctJnMTGQs1HHbDLPtrWYF5YdSncf5h5/gdHYx6qUWmfX5ejspJnIdbFgTyeQde hBteoEqKxKx45sbqqU5RktidrQOkfoP4N34oro3g/Jz6WsY67F5cWc/cXa0H30A+2+ahXwl9abM 8HR3nM6KrJULYIw9RNLFRrCZwzvSyfqT7ml0GqH3N5nRXp9d0JoM2r6HYp512+6q9g3zhkLRpux qrKs7QRMxnVU7ZeU5oJkRudazlPeGuBez5WLzV0Ub74slgpy3mS5L4QRVzCvwuZYMYn1BTptGUi hC3LtbST+Kzpr9k7m0pzFUeWSypo/bvX+lgUhULKPGbEQ+FVYvIFyh5AWTRW6IUk2t6wP3GSGo7 XnFLvlJrvxw8oU33TVsUal4XEUblnwccGFW2pLzs= X-Google-Smtp-Source: AGHT+IEf5y8V8Reyo8rCMN+C3VvdLirwihBGvDLqAr4QpAu4hWpnK4avfrigCWQhE77ol8BNmnHrBQ== X-Received: by 2002:a05:6512:31cd:b0:553:29cc:c49c with SMTP id 2adb3069b0e04-5533ba45922mr965733e87.7.1748604332584; Fri, 30 May 2025 04:25:32 -0700 (PDT) Received: from localhost.localdomain (87-100-218-141.bb.dnainternet.fi. [87.100.218.141]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5533787d35dsm667377e87.46.2025.05.30.04.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 04:25:32 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v6 4/5] image_types_wic.bbclass: capture verbose wic output by default Date: Fri, 30 May 2025 14:24:58 +0300 Message-ID: <20250530112459.776330-4-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530112459.776330-1-mikko.rapeli@linaro.org> References: <20250530112459.776330-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 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 ; Fri, 30 May 2025 11:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217495 Call wic with --debug to capture logs from wic internals so that it's clear which partitions get created and which files get copied where. wic plugins contain for example race conditions which don't install files at all and thus images fail to boot and it's not possible to debug these without something in wic task logs. As an example core-image-initramfs-boot do_image_wic log is now 576 lines which is not excessive but very important when debugging problems, especially race conditions which are only hit in some builds in CI. With all issues I have to deal within wic, I always need to apply this change before I get to see any details what wic and its plugins are doing. Thus I strongly believe this verbose outuput should be the default. Signed-off-by: Mikko Rapeli --- meta/classes-recipe/image_types_wic.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) v6: no changes but this change helped to resolve issues in v5 series v5: no changes, v4 caused pseudo aborts on autobuilder but these are likely fixed now after path inclusion list changes v4: https://lists.openembedded.org/g/openembedded-core/message/215221 v3: https://lists.openembedded.org/g/openembedded-core/message/214360 diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index a64beda95e5f..7c6a6f2e2307 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -72,7 +72,7 @@ IMAGE_CMD:wic () { if [ -z "$wks" ]; then bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." fi - BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" -w "$tmp_wic" ${WIC_CREATE_EXTRA_ARGS} + BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create --debug "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" -w "$tmp_wic" ${WIC_CREATE_EXTRA_ARGS} # look to see if the user specifies a custom imager IMAGER=direct From patchwork Fri May 30 11:24:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63888 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 270CAC5B549 for ; Fri, 30 May 2025 11:25:45 +0000 (UTC) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mx.groups.io with SMTP id smtpd.web10.3995.1748604335805403167 for ; Fri, 30 May 2025 04:25:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=qxNRBpk/; spf=pass (domain: linaro.org, ip: 209.85.167.43, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5532f9ac219so2366547e87.1 for ; Fri, 30 May 2025 04:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748604334; x=1749209134; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R0LIsHBlqDPzcvHAwp3bRNPaus0BcGwVLlL23WCve04=; b=qxNRBpk/MjS+/RQJIFEJC0X0beQc6rY1C9+TLvqzQbgRXt+bHvCGNn/GVZ9Pv+jDwI PCoqsuYdzI98Uxdq52PZ1ECo8J2V6RrwseakrdIAGJzdrHynXNb7rRCWwwNC4ZOMgtjy QNpu33pmFQAO+vRcz76CsDFZSJhf/FjLSULQonkw4QapKpfykVVdo+/XuMdYVRhnNIfB 57nItmUFyMGM8DlqI/Y58BoLzc7TQ6UNbQikMT+piiP46Jr7P6u+0gzlISeNq7gtm+DE KN2NLuszNsQ9p2M3r9dNmcM+5jHWt//sB28hcW/09eec/QRbAUjq46HYzdYHrKccBu2i JZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748604334; x=1749209134; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R0LIsHBlqDPzcvHAwp3bRNPaus0BcGwVLlL23WCve04=; b=pFpkNY2hIJ3wWcxYy3D0etkq5tnmu6Uhrjts7DCxoLdXD6QSeRBvzfdLYr4sBks9ZO SFOOek+ViFef6dlvOQUc2nd1hYJ7iJqpSqsTs1fJMyLJC3/RzfNdjIu82vjh55fy/SUg nA9urh65zuFNy5d2XeNL5BeSwEkaoVSyfaQfYj2CkMhICWURB7fKMnpeWbdNgh+hpm9f GS0IPbHm7R18oLPjdI5jyeLrJOzWDgwytPzpOImg+3hnISTtu9qb2XoDstsmYUs7hqTo V6AicXYQq0FXYZ4bm4rP60WmvKZl837BMqNIzuKy2mIrHlh8WieppfpX0/5x7VFFrWgH 4FEg== X-Gm-Message-State: AOJu0YyX2A+kjEOLaXLvY53g0gsX2RRjSjmOGajffPVX0q/oVh/D2I0k Xb+tSu2ZuN5/kvY/RVnp4nPmlIKNqr9eopEAOGYvnFb3pcYSDLUG5oKv564DGMw15cSAh8brx19 3ek88SRQ= X-Gm-Gg: ASbGncu00hopHuUFXSOxeiBbFU7UecRoeHVBiwcwWL4keiY32zE9N2f7plaG9Hcryor AhBHhAYPfpr9PA+RxAwBVsnU8cQRtAauj0NxCIjWFKW0qWdTYCrBbn0hFmv4XRTdL09JjzkH2nK lDr7C8/t/wx/IlKwwGyT+w/QzR5MzLtXGKvvhxKlHKO21hxdecZUD0VzrFWvr1Dx0G3cbqdT2LE mzUMzORYAo+cQLBcJJTP3Jf6nriKp0fqdGDvkJrEPod2oSjwfMnKKPGnXIUu8IUN3PVW2cKpxVZ V0Ik7RmZ3Myr/dpzoa5+E97/89CU283/xp96jqS426V1oDkkNvPBKpQofJgbffr6/mgR2C0LasP psBacSFoA35Z3SoaAriJRdr/PZQ4Lyf6F5xjoNbc= X-Google-Smtp-Source: AGHT+IGBPv6hYPZAZsV3K1zcqE0l6K4ikRRigGpQgDTjchHz9Zk+KW2jDaF0tdW7MPrlocdncloNcw== X-Received: by 2002:a05:6512:3d28:b0:553:2c58:f967 with SMTP id 2adb3069b0e04-5533b93b8f9mr926103e87.56.1748604333882; Fri, 30 May 2025 04:25:33 -0700 (PDT) Received: from localhost.localdomain (87-100-218-141.bb.dnainternet.fi. [87.100.218.141]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5533787d35dsm667377e87.46.2025.05.30.04.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 04:25:33 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v6 5/5] image_types_wic.bbclass: add "grub-efi" back to WKS_FILE_DEPENDS_BOOTLOADERS on x86-64 Date: Fri, 30 May 2025 14:24:59 +0300 Message-ID: <20250530112459.776330-5-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530112459.776330-1-mikko.rapeli@linaro.org> References: <20250530112459.776330-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 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 ; Fri, 30 May 2025 11:25:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217496 This was removed by me without good reasons in commit 2f0ef8cd0e61c34e67ad9c7508094da3c23f5fce "wic bootimg-efi.py: change UKI support from wic plugin to uki.bbclass" and results in grub-efi binaries missing from genereted ESP partition on qemux86-64. Fixes oeqa selftest overlayfs.OverlayFSEtcRunTimeTests.test_image_feature_is_missing after wic detects missing EFI loader files on ESP partition. Test case was passing due qemu syslinux boot using kernel directly from /boot and not using UEFI firmware to boot. Fixes: 2f0ef8cd0e61 ("wic bootimg-efi.py: change UKI support from wic plugin to uki.bbclass") WKS_FILE_DEPENDS_BOOTLOADERS needs to list all EFI loaders because it's used in DEPENDS and thus can't use conditional python macros to select which loader is actually needed in sysroot when wic builds the images and ESP partition. Signed-off-by: Mikko Rapeli --- meta/classes-recipe/image_types_wic.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) v6: new changes in series, fixes missing grub-efi binaries on qemux86-64 overlayfs selftest diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index 7c6a6f2e2307..740ed946f8fa 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -114,7 +114,7 @@ WKS_FILE_DEPENDS_BOOTLOADERS = "" WKS_FILE_DEPENDS_BOOTLOADERS:aarch64 = "grub-efi systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS:arm = "systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot" -WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux systemd-boot" +WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS:x86-x32 = "syslinux grub-efi" WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}"