From patchwork Mon Feb 21 17:32:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 3940 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 BD4E7C433F5 for ; Mon, 21 Feb 2022 17:32:58 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.1753.1645464777213603406 for ; Mon, 21 Feb 2022 09:32:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1D6F61063 for ; Mon, 21 Feb 2022 09:32:56 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BBA133F70D for ; Mon, 21 Feb 2022 09:32:55 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/2] poky-tiny: don't blacklist core-image-base and core-image-full-cmdline Date: Mon, 21 Feb 2022 17:32:52 +0000 Message-Id: <20220221173253.768983-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.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, 21 Feb 2022 17:32:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/162063 Building a "tiny" core-image-full-cmdline may not make a lot of sense, but it build, so don't blacklist these images. Signed-off-by: Ross Burton --- meta-poky/conf/distro/poky-tiny.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index b6c4eeccd0..8fae126cbc 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf @@ -113,8 +113,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" RDEPENDS:${PN}-mtrace:pn-eglibc = "" PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" From patchwork Mon Feb 21 17:32:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 3939 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 EB044C433EF for ; Mon, 21 Feb 2022 17:32:57 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.1705.1645464777299013350 for ; Mon, 21 Feb 2022 09:32:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A47DB106F for ; Mon, 21 Feb 2022 09:32:56 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4FBB33F70D for ; Mon, 21 Feb 2022 09:32:56 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/2] poky-tiny: set QB_DEFAULT_FSTYPE correctly Date: Mon, 21 Feb 2022 17:32:53 +0000 Message-Id: <20220221173253.768983-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220221173253.768983-1-ross.burton@arm.com> References: <20220221173253.768983-1-ross.burton@arm.com> 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, 21 Feb 2022 17:32:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/162062 QB_DEFAULT_FSTYPE is used literally as the image extension in the testimage code, so this shouldn't be set as IMAGE_FSTYPES because that variable is a list of image types, so if IMAGE_FSTYPES is extended and testimage ran it will try to look for an image called e.g. "core-image-minimal-cpio.gz ext4". Instead, set QB_DEFAULT_FSTYPE explicitly to cpio.gz. Signed-off-by: Ross Burton --- meta-poky/conf/distro/poky-tiny.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index 8fae126cbc..efa111d5b1 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf @@ -97,8 +97,7 @@ INIT_MANAGER ?= "mdev-busybox" # udev, grub, etc. These pull in gettext, which fails to build with wide # character support. IMAGE_FSTYPES = "cpio.gz" - -QB_DEFAULT_FSTYPE = "${IMAGE_FSTYPES}" +QB_DEFAULT_FSTYPE = "cpio.gz" # Drop v86d from qemu dependency list (we support serial) # Drop grub from meta-intel BSPs