From patchwork Mon Aug 4 13:46:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 68032 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 6E2F7C87FCB for ; Mon, 4 Aug 2025 13:46:35 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web11.18142.1754315187908618549 for ; Mon, 04 Aug 2025 06:46:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=hBxkXW5Q; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.48, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-455fdfb5d04so23891145e9.2 for ; Mon, 04 Aug 2025 06:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1754315186; x=1754919986; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=vyhNyAAXbAo4145GkTRU1ps4jqUlYkzCQ76tI1a/Kb4=; b=hBxkXW5QS6mj24iPk5ho3DErW/etScK719tvD9PPbnfdczyx1AFAY32c7aKpucjSOZ 4wXxn1ezlAZcULxjA5gJg6IIZcGtkpZDQP0CYQSGEw1AadVGjUEu2GE24+B2wsW6SM13 krTaiy0yBIihSk7gR3SniuGW3PrB74CJlGW2Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754315186; x=1754919986; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vyhNyAAXbAo4145GkTRU1ps4jqUlYkzCQ76tI1a/Kb4=; b=wAvVva2hm4jcV4Srf4S4dkWi5QhE4YAUthAMBj/ARAs52EJdJPA2zJotGBpNPYvcUK h8Xr87WCjl9L6ABNzU5Ti0M2XZfW4e9Py8AI1DRFYlDFgocDy/FFtyImRpbzmwygmf4H HAEPK5u8LsnR3KOuSNCPX4rsQO8tgocyRqmd/tewatt2o25ShvQkkK66ctuQSh6rOvpD jhplppCGT2SqJQ9Oo0/ms28WnFmStkSZdMMrJjycOKfar/U0hXcy/nHHGtI9zBhjx3mD KestVTfZGtE8sKgjWeQQptU5+wRXIzVDcgL/Ks3FJV8RCX2OmwoEcT02/kOOmUM8pedD +Lug== X-Gm-Message-State: AOJu0YwoYsKjgG3vnTktpTdN9weS9lvsWC5FvBV3CScGyIL+DG+KAtVz mGIbv+umH4OCa9PZ+hlbnWwo0jb7AkWKnvmRXMLxGAm/hC5sArCE6YpaeO1oAZgB/IUrEHPRy2x J2avF X-Gm-Gg: ASbGnctFHyfx/t8y/ADlF1VxkBvNAbuf3FdM/pod5dDoIQ9DyV86GUa/mFaUz1OkBvr zmpD9tcwFgskHbLXnah21ejqhSPc7oJGcqOZXTQdiK5hhnA0Si1TifsJujbgJ8MbjiDe+zhvG81 MJdOXNHdYtOJQUnM0O+St7e8EBTTBwtk8gAGZ65+zqz9IMN0/Kr6wCdNkMNT+qzxOQQiZy1U/uR 9Z8kBppSfjyuv5sNAkR2cZBJrFPGL5rPQ0Qhpi9OA+gAOhSsFUHBADvjcGuC5qFGQLKiHqurBO5 ahRedgPRMIhh28ly4ezWzPqHy2HA9AXQOZnCVmpBtUlfZGdrUx9o6t/BrIA6/M1keConJa9NY9z L1U2e9WasIYLGONn1FTeoK1LctWGXDcIgg4pvNiHfLt8whhPbYc4= X-Google-Smtp-Source: AGHT+IGgY1rkmWRIPxkBIBomMLDRQ4rTVRlOPJoRU9j/6h8DnmTABMXmUF/0RgDwy4TWG87gP/hW7w== X-Received: by 2002:a05:600c:1608:b0:456:285b:db3c with SMTP id 5b1f17b1804b1-458b7d10520mr50908305e9.3.1754315185769; Mon, 04 Aug 2025 06:46:25 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:2c76:58bb:66fc:3164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458b4f9e952sm104869005e9.9.2025.08.04.06.46.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 06:46:25 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] oeqa/qemu: Add compressed image types that are now supported Date: Mon, 4 Aug 2025 14:46:21 +0100 Message-ID: <20250804134624.1412716-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 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, 04 Aug 2025 13:46:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/221428 Add compressed image types that are now supported to the supported fstypes list. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/target/qemu.py | 2 +- meta/lib/oeqa/targetcontrol.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index d93b3ac94a2..769a6fec7e0 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -15,7 +15,7 @@ from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner -supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] +supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic', 'wic.zst', 'ext3.zst', 'ext4.zst'] class OEQemuTarget(OESSHTarget): def __init__(self, logger, server_ip, timeout=300, user='root', diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index cdf382ee216..a9080077e2e 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -86,7 +86,7 @@ class BaseTarget(object, metaclass=ABCMeta): class QemuTarget(BaseTarget): - supported_image_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] + supported_image_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic', 'ext3.zst', 'ext4.zst', 'wic.zst'] def __init__(self, d, logger, image_fstype=None, boot_patterns=None): From patchwork Mon Aug 4 13:46:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 68031 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 6F93BC87FDA for ; Mon, 4 Aug 2025 13:46:35 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.18165.1754315189741776665 for ; Mon, 04 Aug 2025 06:46:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=ZVmRaWky; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.53, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-458b2d9dba5so16626835e9.1 for ; Mon, 04 Aug 2025 06:46:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1754315187; x=1754919987; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=syVz5lZi2/wdmfi/XFa0DpbB3DMbTTmgglqDwXYAcYU=; b=ZVmRaWkyDy2RbVwjDZURTfKRwZjjs82qJMO0VCfgIRf+jTjAqwBKWCzc0G9Cy8Jeid bcXPThZO04hw7sMzJ5UrNVu04AaL5PwgIEGBrNY7ebYbMd43JDXTBXVzQy3xtx4AKbvy iREr5W6/bxrA1wKmTpeZuoYheWr4P02nW03rs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754315187; x=1754919987; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=syVz5lZi2/wdmfi/XFa0DpbB3DMbTTmgglqDwXYAcYU=; b=liujeRiFRn0i9tVZ4oteEPN3TXVgi4lnVLlIqi4CwnUUvMwtr4A5VsHeHLmzzP0J6h 9iiYHu9yYpljF/7ekJaFunVX3JnUHa2cT5Z0LB1NNQoGZOfkBwCz728u0tTAF6ZlH9ro LtLlUFDkRAOjrVM7fqx5+KOnSKCTaONmSPu7Sr8MLZ2SJo46D9U1RjBzM8DmbcJ9mvEx BYNLyGdSH1WPWLTj2mv1jOe0fpfuh7aWj9qGxsdGtFXjsvFtf7HBpIEe9vqt3p4MTbi4 9pwSSVl2+i9NtnkvPAx2r+OQYpSY1go/5suyqpTy/b2UELEpvQIr18PwLLr1hZldkju4 wQDQ== X-Gm-Message-State: AOJu0YzOkV68ZwRCYvYXgEPhaADr2e7qdXAroH2rf8ajZ/TOE/oyLJy2 +wocdck2DXy2HRu84o2lUd0bTk1JWoER9hbft8Ac/2sa1DZREx0eiy/Cgve6jy3Td1VDrm9vSU7 r7sei X-Gm-Gg: ASbGnctiYF+oZsqTIJM0liXbTyuI/Cd+g/u6JPRAxOMbZ//By6pbcmH5ZoFXyp4HTl8 dp+7sZpPT9k7KPZlc1g9McLx9CdnT7V9I44vH18rGp7emX0kfTPoBt0IYnBmp9f/j4GAxEJYjmr k2vfOhh9O09u2n0Oyok7y5kBmTF7g5I2Ofi1Imrj+E6VfBO8k5KrM/bfUrlDTKSrFfirfmmIoku nFAhDyfDTGPkrrxqajRoIM0TOqO3pioz5CQkvG2BCuw7ZElygTLlgWP0953NTKWXn5zzPhPoP2y ssX9YxcFHhOeKoPR9/+t6J1eoU8Uhm9JxnZpzBOATR/C6g6ju70OwQjr7pGlxP4TV+9XN7Bpk67 vrZQCvAxmVSyZKOnuN3vr1lvBHDnCIXwAJqRZBtmZftIy6KCFxgRauMKSmzzGCg== X-Google-Smtp-Source: AGHT+IFjG+es/XYlbCMTp47KIGKBYarpPAuA7jN8uKzNtBdOo6G5GoURZbJSXitV3GWj+DDIIqM0iQ== X-Received: by 2002:a05:600c:1394:b0:456:43c:dcdc with SMTP id 5b1f17b1804b1-458b6b551b3mr64094855e9.33.1754315187125; Mon, 04 Aug 2025 06:46:27 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:2c76:58bb:66fc:3164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458b4f9e952sm104869005e9.9.2025.08.04.06.46.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 06:46:26 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] scripts/runqemu: Update the fstypes list with newly supported compressed images types Date: Mon, 4 Aug 2025 14:46:22 +0100 Message-ID: <20250804134624.1412716-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250804134624.1412716-1-richard.purdie@linuxfoundation.org> References: <20250804134624.1412716-1-richard.purdie@linuxfoundation.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, 04 Aug 2025 13:46:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/221429 Update the interal list of types within runqemu with the newly added compression formats it supports. This fixes autodetection of qemuboot file locations. Signed-off-by: Richard Purdie --- scripts/runqemu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index a57fe794dc8..827300080a2 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -198,8 +198,9 @@ class BaseConfig(object): self.bitbake_e = '' self.snapshot = False self.wictypes = ('wic.zst', 'wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi', "wic.vhd", "wic.vhdx") - self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', - 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz', + self.fstypes = ('ext2', 'ext3', 'ext4', 'ext2.zst', 'ext3.zst', 'ext4.zst', + 'jffs2', 'nfs', 'btrfs', 'cpio.gz', 'cpio', 'ramfs', + 'tar.bz2', 'tar.gz', 'tar.zst', 'squashfs', 'squashfs-xz', 'squashfs-lzo', 'squashfs-lz4', 'squashfs-zst') self.vmtypes = ('hddimg', 'iso') From patchwork Mon Aug 4 13:46:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 68030 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 72311C87FD1 for ; Mon, 4 Aug 2025 13:46:35 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web10.18166.1754315190333551530 for ; Mon, 04 Aug 2025 06:46:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Nu2WzpVg; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.49, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3b780bdda21so2953420f8f.3 for ; Mon, 04 Aug 2025 06:46:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1754315188; x=1754919988; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JeEQNP/L5SDW69RIAvDLnTwqI+ORCRco+aBaADHFzcE=; b=Nu2WzpVgl2OhXAWGG7Jy4OcNtPsSlxWKPkBTRuVM3+vRPfFOMl6DAHt5rpvFae9xXt 68jHUj3C+7pL0qmZwshdJLt4KeShDH/Z2P/e2RJctzZP4adRVkrLibRod3m887HNTavv Y4hFH7MIlbVjdBSoBmBYFwVHwlDjs0psIvfCU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754315188; x=1754919988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JeEQNP/L5SDW69RIAvDLnTwqI+ORCRco+aBaADHFzcE=; b=Pu44VLik308ckFwTwY6+st2yadC1A2owEZ1Sqt6FFtZpRN2HEb7h9TWrCtW9CYJelS BXs5EAKiSAA85rHl0qcNwyV5+pauHa2n2tHZuIhwmZsuH73JHWPkl31ZBDqEC/qs1utN jp35A0TibamsMZVuEqWXPvyJ7VV0IinktXIapfYzpa6J9VlpVZGoEHMNZIxNLW2s0muF caOFcjr9W0eo3oBeSDoTGchg1r6/KZWEGT6qzA2Qi4O/a3ghEjWfBBiEesHKiPpWfVQ5 2qr9BAFEnZM2PmByBhy/6j8FS+SN/T+OW7fJB/d8Gr+/g6/PolC8vVWFFFtOe0Nl+NE+ dqYg== X-Gm-Message-State: AOJu0YycqmhZ47EcrXCNiL+NxDj4Klt4wAYRveh9bcayU4Lno1jhxWZn 1mww1qdMCnCICh7yjRcO1MaClL3t56bUosia3WKUSzntVtvwpR9yVQTllO0//tES9FRtC8vdhAq 0zENY X-Gm-Gg: ASbGncsRgeWCEMlKruh2Gxa863IIn5mbQyBeMjVWaxcqtCt+fmnF9kIJz/Pw4FJpUr9 G9QS0JoIZk6dSNdEIKYyJ7hBFUIgI6Ns6LZLliW4reA4vxi52hxypkujzAT1+kSDZUxShrvr471 +kzGI4Ji3QNb8lhJqHh2GSeu8haKZhc7KdVwNfyjNrfa0V+9K7WovcEsc9rQPltlP6yTVpaZpxt T0peC+KygTx2XWXTTJw8yT8S53Tqq27jQDzYTFBPoLUrQ0pC3oU7YeqPUsCVCNmup93zTWalBj6 ewxpSuB5VpTwhoZsp0GHXUlMO8e4bCk04KtbP2SvAb6TEa/aIj3Kq7YnZ+AB0/Fq5d5TGnrABzp KBeepbcQjopUcXIQplbnWuq7IOiwRYu3tqFjuYrakdbgRGAg8Dcx5vWVzzvYHdw== X-Google-Smtp-Source: AGHT+IHgENLWMAiUtM+KTwcwtgLrWUlTPpYxKHGp1nxwqgl2ho9nxHb1aekxMc+PNUeAEXamybvH4w== X-Received: by 2002:a05:6000:2383:b0:3b7:810f:6caf with SMTP id ffacd0b85a97d-3b8d94bc74bmr6949123f8f.32.1754315188235; Mon, 04 Aug 2025 06:46:28 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:2c76:58bb:66fc:3164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458b4f9e952sm104869005e9.9.2025.08.04.06.46.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 06:46:27 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] oeqa/selftest/runqemu: Use snapshot mode for image testing Date: Mon, 4 Aug 2025 14:46:23 +0100 Message-ID: <20250804134624.1412716-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250804134624.1412716-1-richard.purdie@linuxfoundation.org> References: <20250804134624.1412716-1-richard.purdie@linuxfoundation.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, 04 Aug 2025 13:46:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/221430 We don't need to preserve changes to these images so use snapshot mode so we don't save writes to them. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/runqemu.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index bedcf975487..74d47a6db1b 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -33,7 +33,7 @@ class RunqemuTests(OESelftestTestCase): if self.machine == "qemux86-64": self.fstypes += " wic.vmdk wic.qcow2 wic.vdi wic.zst" - self.cmd_common = "runqemu nographic" + self.cmd_common = "runqemu nographic snapshot" kvm = oe.types.qemu_use_kvm(get_bb_var('QEMU_USE_KVM'), self.td["TARGET_ARCH"]) if kvm: self.cmd_common += " kvm" @@ -192,7 +192,7 @@ class QemuTest(OESelftestTestCase): cls.machine = get_bb_var('MACHINE') cls.deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') cls.image_link_name = get_bb_var('IMAGE_LINK_NAME', cls.recipe) - cls.cmd_common = "runqemu nographic" + cls.cmd_common = "runqemu nographic snapshot" cls.qemuboot_conf = "%s.qemuboot.conf" % (cls.image_link_name) cls.qemuboot_conf = os.path.join(cls.deploy_dir_image, cls.qemuboot_conf) bitbake(cls.recipe) @@ -218,7 +218,7 @@ class QemuTest(OESelftestTestCase): def test_qemu_can_shutdown(self): self.assertExists(self.qemuboot_conf) - cmd = "%s %s" % (self.cmd_common, self.qemuboot_conf) + cmd = "%s snapshot %s" % (self.cmd_common, self.qemuboot_conf) shutdown_timeout = 120 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: qemu_shutdown_succeeded = self._start_qemu_shutdown_check_if_shutdown_succeeded(qemu, shutdown_timeout) From patchwork Mon Aug 4 13:46:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 68033 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 81506CA0EC0 for ; Mon, 4 Aug 2025 13:46:35 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.18144.1754315191600495558 for ; Mon, 04 Aug 2025 06:46:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Fts3PEUm; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.41, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-458bece40fcso9444865e9.3 for ; Mon, 04 Aug 2025 06:46:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1754315189; x=1754919989; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nbGMXdpHmzw898yzv148hsbFQ/n09JJCdcBVMEuKuCU=; b=Fts3PEUmoW8mCP3ULoLc3RWuE/fuk/2yMMw7NXIKyPWnVwhWzD30+KTgOJfwbxQpZt 1HO88Rbf9ksi84F1eke8gPIuOkz79wwVXpNClMHzIOCLG0NhFG7isJFI++ONFSDLLdQR 4Px4cf11Ev66DmP8Wy9P5S36a6wR6Ma/U75Pg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754315189; x=1754919989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nbGMXdpHmzw898yzv148hsbFQ/n09JJCdcBVMEuKuCU=; b=O7SBoBGpM73sPTzL3uwX0I/JIU79qm5rbjbEMnA7DTYXLmUz7Yz/iJ0AImMHfqMruR CoNEX1f2SBHd6zC6GmXOpNmDtFEQoPMR7ahiwqYUZ3FdVwGG4G8BrQ2c4JADIgPeuXry Q+BWYJI5nQSqhQI+nU25Io/owT7F840C+IgdN/oqcMGSFv/JO+dH8HschiPkT/zDBRbd jZoN5zZlZAgkTUrIxMbJXffbcgcmVgurb78dV8Xj53oATxkIsFKKh2dK5Ch0KnLVsW7q DtoLr+MgLwjHsAAbU6i41yOQjcq8eEMNY0v0I+JkqGnCPy9wk4AptUxZRW8EI76EAmCS mSVw== X-Gm-Message-State: AOJu0YyMohnRH6TG9Zx10sZ43m1LiZuyRCiNK5VqTVxwLrhrkovrr1IC kLYd6VWBg0ReA9brURC3jpbUHgmTYho0+fn8Ft+g3LBWbAo0Bcc5bCEfa5ioooc1VSDnE5niGvx kWBWD X-Gm-Gg: ASbGncu40Q0rxr7ZpxHW+3sR7d3Menk4TyW1k2BEOFN8Si6LJg7hhSDK/qM8UyzDORN IsAN+MwV4NI/xZmJchZieMg7/SgiVKLoBt+jOoDvysgCGlfAQsFu+2SlfaaPOTLJsrIM0SOrMcE URWDCDsttpVP7viaqZ5k+wmbQZSczGHv2LJyHmd44fokUCM7+1eIRootXqosp6uuAZNUh4Q0AbU unBkW/JPwDGsxi3YProLMr6+qpcnfhAMVmpw12wuDjQ4YgpMmHA4opyplA9SAe59Z6z9ZXzPW3T iw1xkj+XZkfUGLYNru9z14znv2EhK/7vk/EpDMyxPfK6kzPTDoBz2fGXzqHV13QYxvrBfNkO62i +sdblxU6pJW5Lbo+xj2fXO/DoZDklNnr1cQ83uyZbGcR1L4qVaY4= X-Google-Smtp-Source: AGHT+IHtGmFcXQqJz3qUo0kR6aZqB7UO6n+ZEP0HwvODspqFGjgXL2Rw1Njw65l7wC+4m/lWfZIJdA== X-Received: by 2002:a05:600c:17d8:b0:453:5c30:a1fd with SMTP id 5b1f17b1804b1-458b71903edmr46945815e9.8.1754315189436; Mon, 04 Aug 2025 06:46:29 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:2c76:58bb:66fc:3164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458b4f9e952sm104869005e9.9.2025.08.04.06.46.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 06:46:28 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] bitbake/conf: Default to zstd compressed image output Date: Mon, 4 Aug 2025 14:46:24 +0100 Message-ID: <20250804134624.1412716-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250804134624.1412716-1-richard.purdie@linuxfoundation.org> References: <20250804134624.1412716-1-richard.purdie@linuxfoundation.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, 04 Aug 2025 13:46:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/221431 Switch our default qemu images to use .zst compressed images by default since this is the output format we release during the release process and is the one that users would prefer to download. This makes the release process use the actual generated output from the system and avoids post processing. Signed-off-by: Richard Purdie --- .../multiconfig/multiconfig-image-packager_0.1.bb | 2 +- meta/classes-recipe/qemuboot.bbclass | 2 +- meta/conf/bitbake.conf | 4 ++-- meta/conf/machine/include/qemu.inc | 2 +- meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- meta/conf/machine/include/x86/x86-base.inc | 2 +- meta/lib/oeqa/selftest/cases/gdbserver.py | 1 + meta/lib/oeqa/selftest/cases/runqemu.py | 6 ++++++ 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb index d7785cee2e1..f6cf0a47c89 100644 --- a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb +++ b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 MCMACHINE:virtclass-mcextend-musl = "qemux86-64" MCMACHINE:virtclass-mcextend-tiny = "qemux86" -MCIMGTYPE:virtclass-mcextend-musl = "ext4" +MCIMGTYPE:virtclass-mcextend-musl = "ext4.zst" MCIMGTYPE:virtclass-mcextend-tiny = "cpio.gz" MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}" diff --git a/meta/classes-recipe/qemuboot.bbclass b/meta/classes-recipe/qemuboot.bbclass index 0f80c60ab58..69cd12ec545 100644 --- a/meta/classes-recipe/qemuboot.bbclass +++ b/meta/classes-recipe/qemuboot.bbclass @@ -97,7 +97,7 @@ QB_MEM ?= "-m 256" QB_SMP ?= "" QB_SERIAL_OPT ?= "-serial mon:stdio -serial null" QB_DEFAULT_KERNEL ?= "${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin", "${KERNEL_IMAGETYPE}", d)}" -QB_DEFAULT_FSTYPE ?= "ext4" +QB_DEFAULT_FSTYPE ?= "ext4.zst" QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" QB_OPT_APPEND ?= "" QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fb26e72669c..fad397776e0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -839,8 +839,8 @@ include conf/bblock.conf DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" -IMAGE_FSTYPES ?= "tar.gz" -IMAGE_FSTYPES_DEBUGFS ?= "tar.gz" +IMAGE_FSTYPES ?= "tar.zst" +IMAGE_FSTYPES_DEBUGFS ?= "tar.zst" INITRAMFS_FSTYPES ?= "cpio.gz" # The maximum size in Kbytes for the generated initramfs image size. diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index c143e37f710..79016ad9cce 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -8,7 +8,7 @@ MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" MACHINEOVERRIDES =. "qemuall:" -IMAGE_FSTYPES += "tar.bz2 ext4" +IMAGE_FSTYPES += "tar.zst ext4.zst" # Don't include kernels in standard images RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 65cbfd66ee4..35961272022 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -11,7 +11,7 @@ KEEPUIMAGE = "no" SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0" -IMAGE_FSTYPES += "ext4 wic.qcow2" +IMAGE_FSTYPES += "ext4.zst wic.qcow2" WKS_FILE ?= "qemuriscv.wks" diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc index fc6c39148db..fc8200d8f09 100644 --- a/meta/conf/machine/include/x86/x86-base.inc +++ b/meta/conf/machine/include/x86/x86-base.inc @@ -8,7 +8,7 @@ MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \ acpi serial usbgadget alsa" -IMAGE_FSTYPES ?= "wic" +IMAGE_FSTYPES ?= "wic.zst" KERNEL_IMAGETYPE ?= "bzImage" diff --git a/meta/lib/oeqa/selftest/cases/gdbserver.py b/meta/lib/oeqa/selftest/cases/gdbserver.py index b6b7c5c4733..1c713331900 100644 --- a/meta/lib/oeqa/selftest/cases/gdbserver.py +++ b/meta/lib/oeqa/selftest/cases/gdbserver.py @@ -19,6 +19,7 @@ class GdbServerTest(OESelftestTestCase): features = """ IMAGE_GEN_DEBUGFS = "1" +IMAGE_FSTYPES += "tar.bz2" IMAGE_FSTYPES_DEBUGFS = "tar.bz2" CORE_IMAGE_EXTRA_INSTALL = "gdbserver" """ diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index 74d47a6db1b..7ed89e80de8 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -195,6 +195,12 @@ class QemuTest(OESelftestTestCase): cls.cmd_common = "runqemu nographic snapshot" cls.qemuboot_conf = "%s.qemuboot.conf" % (cls.image_link_name) cls.qemuboot_conf = os.path.join(cls.deploy_dir_image, cls.qemuboot_conf) + + cls.write_config(cls, +""" +IMAGE_FSTYPES += "tar.bz2" +""") + bitbake(cls.recipe) def _start_qemu_shutdown_check_if_shutdown_succeeded(self, qemu, timeout):