From patchwork Wed May 28 12:56:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63727 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 003E1C3ABB2 for ; Wed, 28 May 2025 12:56:57 +0000 (UTC) Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by mx.groups.io with SMTP id smtpd.web11.14931.1748437015884685544 for ; Wed, 28 May 2025 05:56:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=nbZJ4ZzO; spf=pass (domain: linaro.org, ip: 209.85.167.45, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-54e98f73850so5525383e87.1 for ; Wed, 28 May 2025 05:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748437014; x=1749041814; 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=ObSV+vaSymzdEYKlvZ+RNFbNGQec6EggxJkiuNZQr8k=; b=nbZJ4ZzO636oSIQOypjwGNoraXTgulkTu9MCAVrbFsv0NF43kuXIvMkkwcoXI3oHJi HoCa8kW4v5nsQ3BBqL69SKzTZEdSHXBXCEtyZmfLTzL+ed2w2XNVcByX5Xg1KfX++3f/ 086R06lq1rQzlACkz1FVMGNQxwKQzPlFU8pASeX9R5M/wkKoYhZyHFnUW8lKl04rfrVL 77YRDymKId361iW6BmEXSc77W0Y6LmY2eUJWap/6N7GJtFhRBNnLf84MI2KHoe12SZWB gGQG1ggcrsWwxdqHP4z8kjh6gaFlV6aLwFG9WhuqKDlQavSTUGIydVDBS7cmYmhp51dK TcAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748437014; x=1749041814; 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=ObSV+vaSymzdEYKlvZ+RNFbNGQec6EggxJkiuNZQr8k=; b=qw+vfzaXXG/4+S/H5uTbVtJjLWJP0PhFMhytjWlkpdYv6Mxp0bY6/AZfZFi4A0Dfj3 TJXs7GRvBmaSbHHf5gX3hKf69g8X3Uto6D1hdk36prJaiOkQeDyr59CcKtJnNr5tk+1v 89QRuKTEoDi6efScgnoZQJCP2FHKvxBCc/gjDOfysntdE8cPYlMbUphOy2WXLF5oJqCO THt8YBmdWqeX6d2TsNNGK+SDOgjY8alxj8rkB4835GXJsu1HApIghkhe0kokvaaGMmib Y4qC3yBETlku1i9YY0Xc7ZG+jl2l6EvMsjued484O85+Wtzt7B4APlgQ6Y9tb+HwO4YS xZnw== X-Gm-Message-State: AOJu0YzogSpGomDTUrV+WKfAt4hALik9V98Ay9JcpSwyWkhqinN8eDYy wvEtBbXqR7ftdx1JEIIaLWrFzx4zd0D270wqgMy9N0g2oTMQ6y4kQ4QMJht56ChdO8HOephzXpr om/a6ReQ= X-Gm-Gg: ASbGncspI7/TLjV1zKfTxGYM9uIn9WRbIy9GLeuEanqx9pworZJ2nwcX3P3k/bV4THD d1QdG78EypqMg81+o5CFODUSsKZImMM3P2xErRz7tAcSjAj9WWRuT6DtQvOAXymy5edqbqBXj5h GcTczrIJGE+C7OzW1wGLNdeD1qxg0Ck31K9hfh8ZhKMQaBnfPvLUzFX9Ckdz7KtY/nSe64B88In 9WMEJfAfSHV3FTqsnj3XD9dYJS7UxAbPQcZvuPFYuaqtALFsHJD7VtS9DdzApWq/PGmuaFfud0l NREtjZ2ajddsQTaxQCQK2QVR4L4kppRjUGBzBVt4yP5pIk/UfwInXAFDvq3Zj9m9rTCBNPTsi8S HacXgilrPPFSzolK6uKvORIm8xWZWysvk3kf+m/s= X-Google-Smtp-Source: AGHT+IH4jEyZy4YgZLs/8aVqwdT+juTyBGnJWDql/ojZMsGxUiAMzLetV7c1B7CtXHiq38N4iKsHRA== X-Received: by 2002:a05:6512:ad2:b0:553:3322:49a6 with SMTP id 2adb3069b0e04-55333224a8bmr439187e87.25.1748437013809; Wed, 28 May 2025 05:56:53 -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-5532f69a504sm267869e87.146.2025.05.28.05.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 05:56:53 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v5 1/4] wic bootimg-efi.py: fail build if no binaries installed Date: Wed, 28 May 2025 15:56:32 +0300 Message-ID: <20250528125635.684302-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 ; Wed, 28 May 2025 12:56:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217344 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(+) 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 96c710bf77..e0ee2f7127 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 Wed May 28 12:56:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63728 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 D9354C5B543 for ; Wed, 28 May 2025 12:57:07 +0000 (UTC) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mx.groups.io with SMTP id smtpd.web10.14918.1748437017752346269 for ; Wed, 28 May 2025 05:56:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=H79Rew7k; spf=pass (domain: linaro.org, ip: 209.85.167.46, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5532f6d184eso849287e87.0 for ; Wed, 28 May 2025 05:56:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748437016; x=1749041816; 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=4NBfdZowu+K3O2+oZIs0IQvHG3GEuMAWCCsl8bak33k=; b=H79Rew7koUM6IctVf7jwVQ7P9KagTewE/eSZ/fdVrBprItvQkwD0qXiDPivX7q/chF 8JOdWyjIghCrsrN4/WFML6M0WSBoDjMOX2AZ2uo9m0IZdoMg+OY4+b87hcWRZgL2nF3M ENih3qiy1sWwCPKoShW71CE4MeVN9z1svfC0XaI69gC4zDyQkvbCJiGtsl4cynYG/KbW zawPDOyKyoW6u1jer3NXsb7Ck9MCmipCGMzWkkqtly1oO6idNsOhFWUDJcUtb+ayT6x3 h7VVh2s4devopj0mVtluD8+7D77glRg4iFb4Ayjwr3PzdTxNfM6cuBGFI/wNcy+RwQtS Cuuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748437016; x=1749041816; 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=4NBfdZowu+K3O2+oZIs0IQvHG3GEuMAWCCsl8bak33k=; b=TbEWTviHmpBV+60WtxVrmjEGxJwaFrxKndXJTIRfJ8jtXaXN13Mjqe9pzafU6jOLXt i4c9uzcHHPSbv/q/acCrx+4OnsB4YBD2QCJ67gHJvM11W+wDZ6XgrpJaCddkddw1sk2f PObAhtPZWj1FpO9OJ9oWHGxcT4f9k3Nz1TdS8uLd0T7qIvfL3dKmy54lfKxcBKJc8QrD QD9Cck/AdyF8t5Q76d3NEG8XyiNF58efugLRS4L8Qhx034ZuoVGEByJTo4IdFrIaMbS6 d6j93DXWWzQH7olf08b7xbsSayIl/SCbNoBzeOeSIEDzIs7gixoY5aAA+hqhFxiBYiRS cggQ== X-Gm-Message-State: AOJu0Yx7Ba7HCgLjXsxRL5EPFHNVC3WjWTxzil06PiN59JaT+oLm9wcm VFK9fPI20jRW3isN/fJsKKGF45G4ATOjprften4k5QAOewgCWPn3hdBCdy65r4IiAY+fnSYein1 xqx7dEX8= X-Gm-Gg: ASbGncuYLLJQYObQZOC4MI0tdIx2qxvC1h5BGSFvi3ZB5XNYc1R10Npx8cRUYEMGjOs kuxWPVRgO0+7hjWNr33TzZFuMlpndObHUWBBOdE8FcqDjRZ0owVuRyNGMV0kQPMl8uMhvAcXu6q ewIfDj7kttAcRIeybSqEB6v9tGRvXfqVNlxczzLyIzBfYnJsKScaQQrc5mhxA/8BVk5xFpHzA29 XVEnSPMudznX3ygz1DoYf16gR6tUJ43g+crRFbD9kw5oKQAWLqRnpoJu+SAay9Edp0qyShu3pPL x35/u/ISgeclqMLXmZebcjRuxeJ5iJwqhdHEnU1XDYyabi0kkm8m7K2ZitAufwA2xiGMKJFgPcL XWkxwS+6EI4Hsa3w0i5N+vlxeLO9q X-Google-Smtp-Source: AGHT+IGD2VHyNb+mcGwDsKyAPjQ3qNTRbWdGaFAhd8wBmEQ31Ix6/4b8DdQtY1OipBSeNtPMk46eCw== X-Received: by 2002:a05:6512:1188:b0:553:23fb:595 with SMTP id 2adb3069b0e04-55323fb05e5mr3543574e87.14.1748437015807; Wed, 28 May 2025 05:56:55 -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-5532f69a504sm267869e87.146.2025.05.28.05.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 05:56:55 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v5 2/4] image_types_wic.bbclass: depend on grub-efi and systemd-boot on aarch64, systemd-boot on arm Date: Wed, 28 May 2025 15:56:33 +0300 Message-ID: <20250528125635.684302-2-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528125635.684302-1-mikko.rapeli@linaro.org> References: <20250528125635.684302-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 ; Wed, 28 May 2025 12:57:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217345 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(+) 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 61f028bd7b..90bf8c7a60 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 Wed May 28 12:56:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63730 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 E79E7C5AD49 for ; Wed, 28 May 2025 12:57:07 +0000 (UTC) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by mx.groups.io with SMTP id smtpd.web11.14932.1748437018913856865 for ; Wed, 28 May 2025 05:56:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=XfP9dr/5; spf=pass (domain: linaro.org, ip: 209.85.167.53, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-549b116321aso5981484e87.3 for ; Wed, 28 May 2025 05:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748437017; x=1749041817; 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=hRiGd37bfTlMUJgz/25jnkCfA1tENAd1vqe/mQYGDU0=; b=XfP9dr/59qC4UI9UocmBynhyuRwGweoYKsjXECPl1ivtThNi321c8CWdoHMtv1Y71w kEf3bOarPxzSpO9b9JvcefBXsaTbdHqYE+ufkIuK8EdzdhtIH0Hc1E079gkOsOdNJ5f0 lP0lF5PX39vZQ7JCFdRX7kUGtXdrytbKAKTKsMrSGbyzfApYkMxEDi5LALyKSHuvkHfo MRerPVDzbQyJbCVzfWtW35EtnHR6SbBkKn9pAUPi5RDZaULTBpClWqEK4FhGWcloqEDY JjbmLIrte5sELLjSNf4DRlrRU7zNNsnMju6QAv85PyH+nZozwm87Da+W/+VUysV+atI+ btFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748437017; x=1749041817; 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=hRiGd37bfTlMUJgz/25jnkCfA1tENAd1vqe/mQYGDU0=; b=f9KNJYlL/uuBqjkqLxZ+jMmzdHo6IOBClAQPFpxgbvfRZeHpEs/y3y0ADY3TuQdLG9 83gE9R7qtwSp4m4fIwn/0JzeYEbePoetM4anDw8EHaNMJLb2QjEi64Guke4Wo5Z552ZQ 0a5I2RTHeZ1/PgY7NHMsR8MQpRBPfJr9KuAOoYPdEvcHf2TV3B3AG/YmFCkFAtg731/n 79JWsVucJLYqsdQ5gKCrT5y4uba8rHHrm8wsRRd571/gLFelQpqxthDMwRN4zshL9RYl aIfecdRqCYycpg+cbWyl3AdW+OwWiOccMje3I2DU0xlsiDXxUe434x7CIFEX5J3+wPSj hRrQ== X-Gm-Message-State: AOJu0Yzy0rA6T6i0J/IXU3//0UqkgKNw9kVyCvHwSBg5fi4U2v1Ryy2W 147yvQu2wN3m87ek547O+4jJVrxiq/R5Ie48ewohXW0jfym70xpAMpGBvk6FJsdEAdUJGOml8ZT 1gtyJHN0= X-Gm-Gg: ASbGncu85w0HUdHzp5LbUaXD4/CdGZVZwijiiBojOz99e2P8k/1HKsUqV7ICBlGIkAJ BY9s9DhJ9WE7Gv4CdwTz6qXC0z+Tn69zyDRxhqG0ql/NVcWCulbI9nGKZ9rV2SN94CX928xDvGO 94YiYE/y5z7OLehjLKIdIJ6QwgUDOFnDm5/62MQ/mdQ70fjVdwZaOAsqSjjhEBqIUQKyZx8r116 v1//h86+yxsMM/Dp6yrPaBZIdHrzO9849T/3z8KvkRwHzjGJ5zLhiVf2JRkxw31Bgz9WI85tgsq j9LyPmUVSpbLikA/8ryJxXM/SLgBh8OMv92yUPNtDmTX0Sw/E+PkQk61pXzEK2mq+1Wzt2TI3cO VrTb+eu/jxUmuc1DVfp97qaEkIhCC X-Google-Smtp-Source: AGHT+IHUJyVcplx/UVf6xuhwSSKEkcLiVnbRb3jmI9U/FeBTA9n06W8xYIBE+Uu9oczRWdWASJMWaQ== X-Received: by 2002:a05:6512:23a9:b0:553:26a7:70e6 with SMTP id 2adb3069b0e04-55326a7731bmr2881255e87.0.1748437016952; Wed, 28 May 2025 05:56:56 -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-5532f69a504sm267869e87.146.2025.05.28.05.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 05:56:56 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v5 3/4] image_types_wic.bbclass: remove os-release from WKS_FILE_DEPENDS_BOOTLOADERS on x86 and x86_64 Date: Wed, 28 May 2025 15:56:34 +0300 Message-ID: <20250528125635.684302-3-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528125635.684302-1-mikko.rapeli@linaro.org> References: <20250528125635.684302-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 ; Wed, 28 May 2025 12:57:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217346 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(-) diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index 90bf8c7a60..a64beda95e 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 Wed May 28 12:56:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 63729 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 D83FCC3ABB2 for ; Wed, 28 May 2025 12:57:07 +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.14919.1748437020023120543 for ; Wed, 28 May 2025 05:57:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=CGRgwYGY; 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-5532f6d184eso849332e87.0 for ; Wed, 28 May 2025 05:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748437018; x=1749041818; 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=+FYh4leX8hSau2NnHS5n1H8sJG9v8V7x1HeJcwS+q+c=; b=CGRgwYGYgE5E1oPRb3SI8adNOidRYYd0L0JBUfuiiZNnVfipt+4Jgn6yWu3pbmQuOd pvyjh7RwklLMvsm+SHP+7mwgejlsaoe8Q60Z3CHbOVnBvIzJpQmSG9ydPK1Cw1jkLO9S B9OfIrNQ1Nru0msl8DqFzLtpWoH4ur8aKabDEkA9nfO2bZssvBEAFKibfY5saWqHxwPm HapnR0Ry3A5NN7toW6vp0wVYG28O/HZk6AlIytqtmALb+jIx2X+gDaoxstrTDLaHw5xd hJdC4Odj9m3/tjzqjWa8XMyanWYw0VYk6t63ONwlyqOj80vNPPdY9RcQxPdRvj2v2jlE 5lhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748437018; x=1749041818; 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=+FYh4leX8hSau2NnHS5n1H8sJG9v8V7x1HeJcwS+q+c=; b=POqj2qdaJPIeRy71+bef2JB8mi8E76RGxeIjGX8E2N54YZXonZcbAZwvxDxj9Yir2q KWh4/iYT0tOdIb+N9/p+xgzjjup8ceMEtScmQHt+hJ/1Oabmd5HkZAAls9FdFzbFlX5T itsiqXujYtifFfPBzCpfdonIZLb97e5O8bVEYMn2SdXpF7GXTJ0eKT1nNUz+JUJEoaAF +ti+iSbMecT9E4ZMzkWDRlR3RSmvZYV2xkhX7eJlJF751dXVAlFq4ki/9WeKfX3tR9Qh 4EZR0xVuqt39S3TcnD+Ya/2U5WiFPA1dJ74O/jBKPSMnu7dfBs8zGJ1vUGUgYXboLbDg oCJg== X-Gm-Message-State: AOJu0Yye1wtSm3B/rDrY1q5dD3b9tWddK84Yxt/a/I0HxoWjb8/rIjhw 7nzdrDbkjRrGRwhxajr+ZKDlElO7ki0PpmRLOQvzTh4W/51bWm03vFhdCoJFp+Up1AckI2q/Ccy tZfPnwNo= X-Gm-Gg: ASbGnctJhTSJzceE3u325xZsYULLTo9OTw2xDATS06Ukz27oBI1AAklvc0+gWfMle+D G9GYzwXV/BxzYc+4NbrXy3H97XEZtWvJNVi1G6bgLrYdRzNKPxr6XNzUkye1KmXxQ5skWBUe8g/ SNz8dj1f3h5nKps2WqM4HfqY9qNY5PBrW3db9t4Z3G516aYJ4yugp8RZq44NdOzN8UEXzZQQi7T eqY4ccbaqiureUfPe1dFWrerFbzzySCbC5vYWm2Ncyu59KnupxtjAf1kIFHnay50w63jPxO6lHl 2JxzYuY06/B9QlGc4BvlOMwRn60cauqlvRywGA/G91DnWRf5Naum2eCgTFHSE1WzLXpaLAbpHAa mZaOR9aLCdNQktGfJAR90N1nGCU0p X-Google-Smtp-Source: AGHT+IFsYkbZz2I5WaT87066hEeEUXP6xO8/j7nC30EwhS4gPB16JWlk0eigv3SMjpUJZK+SStQZMg== X-Received: by 2002:a05:6512:4152:b0:553:23bf:bb26 with SMTP id 2adb3069b0e04-55323bfbca0mr2423033e87.11.1748437018091; Wed, 28 May 2025 05:56:58 -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-5532f69a504sm267869e87.146.2025.05.28.05.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 05:56:57 -0700 (PDT) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH v5 4/4] image_types_wic.bbclass: capture verbose wic output by default Date: Wed, 28 May 2025 15:56:35 +0300 Message-ID: <20250528125635.684302-4-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528125635.684302-1-mikko.rapeli@linaro.org> References: <20250528125635.684302-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 ; Wed, 28 May 2025 12:57:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217347 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(-) 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 a64beda95e..7c6a6f2e23 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