From patchwork Mon Nov 11 13:16:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 52282 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 A2B5CD2E9E9 for ; Mon, 11 Nov 2024 13:16:49 +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.web10.59035.1731331004988278791 for ; Mon, 11 Nov 2024 05:16:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=rnVU74Oi; 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-53c78ebe580so6051727e87.1 for ; Mon, 11 Nov 2024 05:16:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1731331003; x=1731935803; 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=rUowtZMviGnvKU0Go8gaKnoKt3IXYBjixhTKUFgokzI=; b=rnVU74OiV5QeKGRud7wOb9SVifFLRZRLj6DmXwWEqJN+4Jfixy7ThCeUVuSiD0LGhP WxvXYfSFiRMBqGJU8eZOsAuEYR+RyLchDZ8i9R2hHOP2AS827/W0A/0mF3YcPkMiPbwS sZfJan+Tccl1ZAQKb7xRWEUSfO+q/dFPtvz1VJef2dDUBrB6WkA+/S9Y0a9seW+Ak3AO fV/oEIZMK9AzfefIS+Z5Lt+x/NtIPng9bAIhiwMifWZo4gxIB8XuZ8d3bMKgskVMI2ci WaKzwQmHVzDLHKQbe7FfCIpZ6ql1j++SFb4buqLca/0DkeJbXXDzOgzqL2NBHlHDYSJ3 v2sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731331003; x=1731935803; 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=rUowtZMviGnvKU0Go8gaKnoKt3IXYBjixhTKUFgokzI=; b=wOw3eEEqYWYmLcevRvAUVFROR6+NRcxxWkacHqXrCxVk1IRPvRmBcNyeZB2WBR+wU+ 92h5xSmJQt5NF9wNbj06omy4+Piixcum6FmE+yGkyS1+gsZQjRbQ3kKHnqM5BgzX87Ie CZDXPGRlx4ior3dEDmUJVuk5Bun5S0RfNTEms9hrB3VRO2jZ3/4kZB3BDbKoiPoLk/Uu qUmooTCVz1vGZVXbN8m8FQUxDNFlJG2f098g6mcweyXJ9/7DF/RLITol826AQejTrHA4 uoCceKiy5CmcwBgh5i/WFiPSa+wyMrn1quGRZB2tg9kwDmBxPy6a8qsnic/dEtRujsQo cA/g== X-Gm-Message-State: AOJu0YzWtKtefKQpfdcN74l7lmXydIEMLIs1fJYTZGZ+UXCZzimMdDY1 XJTVn8knvkAOPz3ncae/PCUsY6aGMKO/OnonMH7iAHeg0D8ev/7oaoiZlxnSHF2kNHa5D8e6RjG wPLA= X-Google-Smtp-Source: AGHT+IEbo6Lqt4UGNPUA92r2AcENK63az4eO2LbTa8cGEnL5nl7SfGC3H8LfvkRXgih2nfxU8mWwoQ== X-Received: by 2002:a05:6512:3e1a:b0:53a:c15:96a5 with SMTP id 2adb3069b0e04-53d8673f34amr4061156e87.27.1731331003050; Mon, 11 Nov 2024 05:16:43 -0800 (PST) Received: from localhost.localdomain ([95.214.66.65]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53d826a9dc9sm1515554e87.208.2024.11.11.05.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 05:16:41 -0800 (PST) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH 1/3] uki.bbclass: fix debug print logging level Date: Mon, 11 Nov 2024 13:16:02 +0000 Message-ID: <20241111131604.364308-1-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.45.2 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 ; Mon, 11 Nov 2024 13:16:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206953 Missing/unknown log level triggers a warning. Signed-off-by: Mikko Rapeli --- meta/classes-recipe/uki.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass index d4f25c7fd2..441e4a7f8e 100644 --- a/meta/classes-recipe/uki.bbclass +++ b/meta/classes-recipe/uki.bbclass @@ -189,7 +189,7 @@ python do_uki() { ukify_cmd += " %s" % (output) # Run the ukify command - bb.debug("uki: running command: %s" % (ukify_cmd)) + bb.debug(2, "uki: running command: %s" % (ukify_cmd)) bb.process.run(ukify_cmd, shell=True) } addtask uki after do_rootfs before do_deploy do_image_complete do_image_wic From patchwork Mon Nov 11 13:16:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 52283 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 7E67ED2E9EA for ; Mon, 11 Nov 2024 13:16:59 +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.web11.59062.1731331011774433402 for ; Mon, 11 Nov 2024 05:16:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=o0e0h+u8; 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-539f4d8ef84so5630239e87.0 for ; Mon, 11 Nov 2024 05:16:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1731331010; x=1731935810; 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=T+9oXnFTTsfMYrzugtoc0h/K5AgkTIhJxioz+sxkK9E=; b=o0e0h+u8pa4Bi0XaeQOl9IeiJNDMfz9+fURBQV8G15EShppIhfMJt9JUt2PcD47nAX kexsqH40V1d+s/6BJ3KAi2D3n7EpkvVTy68wK3SM0htnpAN4SssDxqVdhh2qkcc10Bhc aX6PnlsX8S5snMlXfwo4RyDh3VyjYleigGFjWxNIhKNzLsRRZi2m5qaaDO1m3NmNsVnD 5Q3fHmmPXPZMd41L56+ikSF6NyclOFKCZpy2kSiRRKTY8i/HL0C6E7XpQF6p9rroUtY7 RkSxpJ+8JFJyHwRUpWs3jD2Ds4aLp+1CJLXz9VXKKmUZf3XpBfHtm/3TjOFbcqRDd39w IjyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731331010; x=1731935810; 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=T+9oXnFTTsfMYrzugtoc0h/K5AgkTIhJxioz+sxkK9E=; b=T6+fyrBofTMgfaBfaN4y9t2smT+DCpIoXfgtADmXVAzL91OWbwNY1P7NSwuomGcqiP fUadmOLZQHCouehB1zdp0G5EMFgYUN/oqNcMh549quafn8qr325ihqX/7VL8pG3JBbvv Xb3T/2bxZRhkPqkCV3Z0uhZbUEvF2ArpsA6Jrv23PEJ6UO+OGaGzkrK+hcZuaesWqtFz 3M7NsGWHP1Uot49827FRck+EgDnWR69J28si2sazNmBzi3B64Q29uiY+nql1+OziieoR gQg94IPsP3wyy/y2zXKDtP19vJ1RxKJ7ajj7S1+lj4tfG4GJzxYT5jnjDjnZxG5RpnCu FyAw== X-Gm-Message-State: AOJu0YwsSlNE1Z577nQVvIeN9kFrjvREKqJ8MwVHWpI1N7Vb4oduzHaY dugxXCDuG4iUCgsjgNw3wfqYKGmhZd9VFj1b2CBXO6YUitnOUZgLFOz8u0HmxYtWZNIL3wYiOq7 95Hs= X-Google-Smtp-Source: AGHT+IGfvIEAkEMZ42O550941hn58BHxYWoP9PXX9Xakv+rN82Lld+5xhy5PcsWT5VpjZLCR/mYV0Q== X-Received: by 2002:a05:6512:1255:b0:539:fcba:cc6d with SMTP id 2adb3069b0e04-53d8626c818mr5166049e87.42.1731331009953; Mon, 11 Nov 2024 05:16:49 -0800 (PST) Received: from localhost.localdomain ([95.214.66.65]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53d826a9dc9sm1515554e87.208.2024.11.11.05.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 05:16:47 -0800 (PST) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH 2/3] oeqa runtime uki.py: add tests Date: Mon, 11 Nov 2024 13:16:03 +0000 Message-ID: <20241111131604.364308-2-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241111131604.364308-1-mikko.rapeli@linaro.org> References: <20241111131604.364308-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 ; Mon, 11 Nov 2024 13:16:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206954 If Unified Kernel Image was enabled via IMAGE_CLASSES, then target should also boot the same uki at runtime. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/runtime/cases/uki.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 meta/lib/oeqa/runtime/cases/uki.py diff --git a/meta/lib/oeqa/runtime/cases/uki.py b/meta/lib/oeqa/runtime/cases/uki.py new file mode 100644 index 0000000000..77bc5b9791 --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/uki.py @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.data import skipIfNotInDataVar + +class UkiTest(OERuntimeTestCase): + + @skipIfNotInDataVar('IMAGE_CLASSES', 'uki', 'Test case uki is for images which use uki.bbclass') + def test_uki(self): + uki_filename = self.td.get('UKI_FILENAME') + status, output = self.target.run('ls /boot/EFI/Linux/%s' % uki_filename) + self.assertEqual(status, 0, output) + + status, output = self.target.run('echo $( cat /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ) | grep %s' % uki_filename) + self.assertEqual(status, 0, output) From patchwork Mon Nov 11 13:16:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 52284 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 909A3D2E9EB for ; Mon, 11 Nov 2024 13:17:09 +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.web10.59040.1731331019217988018 for ; Mon, 11 Nov 2024 05:16:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=DkHqY6pd; 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-53a007743e7so5366323e87.1 for ; Mon, 11 Nov 2024 05:16:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1731331017; x=1731935817; 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=0Tv+fJhw4OPZRxNJl7wQgRQbP8RGj2pujsQAFBwm0sY=; b=DkHqY6pdZ7CtV2mbgEA/rULzac3ZEHoAu+gH7HrM8L5aGxoBXnWuYCactibFGmQRyj q4K1+l1NxXGPB9CJ1CMR/Nze5pZxE7DwV9u2224XLHVs9CfPk6vQ7R+KsiibuDyJpe4U Dnd6zN2fODfCwLR5iNXLTdQCuFRHV4bVlai6A3qbNlvZqaLmws1kPCNvkuwyK9myrpSF 6w4bJkNZ9g7P1Lt9X2ZHpEFgcFlZqx2KhHvzCXh6/CnkNSpolJj/kdN0CtPi/Q2rd3Sw 0625+uH9MhGFBuXPtfeSNXQuzqqJhPLqNyWH9eipjzCzAzQ025IzBumFyfWjTOeqa/2R SNVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731331017; x=1731935817; 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=0Tv+fJhw4OPZRxNJl7wQgRQbP8RGj2pujsQAFBwm0sY=; b=O7EvOJpqwzhje4MI0p0wy+z5JaPOrGkRETo55JhJFZupXuOQnAyRBQ4ty7pyyHhjsx MH1M6u3IwkDvcP+Z1NRB/t8NZqpNIygNYJsda0f9bNt11M+4H1q9YJYA0P2pxvzE8eTl 6ZYZzGClmgs/enHBFHcfDimaN3/4Nc8i7NSwaXtW1WRPIiuLwWecU4NpKMKKFiHrl17N r/y1JKVDf7uCw5k8pTBbJkexixbctuaw23W31z5VVUhx05fo14xaXMvnNQ0HtpKbiMEd /TUq/FJBjz3z9zjstwZZXs7ZAXB7U68zgXtYuabKqa3l/9S6qZoAAM+G1LpCZDvJbQPq y1gA== X-Gm-Message-State: AOJu0Yx5dzgDmup6CYf+XrzH1SswNh5LJdAALroujoGLbmA5MiEpbmEY L8tcSSfZs6dyI41hjIpxPLR02R1nILNC8S5ZBy/5hgfZSTaQGMT+NQqPyzo6l2yJwJkemNhl2IX i3sM= X-Google-Smtp-Source: AGHT+IFIPGnR1Hq/FZaeWLulLQqA7JVzF5lduDpBNnMU/C5hpjTjIsZ2pWPfqfWJnRwjRsZVAAlLiQ== X-Received: by 2002:a05:6512:3e15:b0:539:8fcd:524 with SMTP id 2adb3069b0e04-53d8623fa76mr5339669e87.30.1731331017350; Mon, 11 Nov 2024 05:16:57 -0800 (PST) Received: from localhost.localdomain ([95.214.66.65]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53d826a9dc9sm1515554e87.208.2024.11.11.05.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 05:16:53 -0800 (PST) From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH 3/3] testimage.bbclass: capture RuntimeError too Date: Mon, 11 Nov 2024 13:16:04 +0000 Message-ID: <20241111131604.364308-3-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241111131604.364308-1-mikko.rapeli@linaro.org> References: <20241111131604.364308-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 ; Mon, 11 Nov 2024 13:17:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206955 runqemu can fail with RuntimeError exception. Non-cought exception causes cooker process leaks which bind to successive bitbake command line calls and that can cause really odd errors to users, e.g. when build/tmp is wiped and cooker processes expect files to be there. Signed-off-by: Mikko Rapeli --- meta/classes-recipe/testimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index 19075ce1f3..a9b031093a 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -371,7 +371,7 @@ def testimage_main(d): complete = True if results.hasAnyFailingTest(): run_failed_tests_post_actions(d, tc) - except (KeyboardInterrupt, BlockingIOError) as err: + except (KeyboardInterrupt, BlockingIOError, RuntimeError) as err: if isinstance(err, KeyboardInterrupt): bb.error('testimage interrupted, shutting down...') else: