[2/2] poky-tiny: set QB_DEFAULT_FSTYPE correctly

Message ID 20220221173253.768983-2-ross.burton@arm.com
State New
Headers show
Series [1/2] poky-tiny: don't blacklist core-image-base and core-image-full-cmdline | expand

Commit Message

Ross Burton Feb. 21, 2022, 5:32 p.m. UTC
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 <ross.burton@arm.com>
---
 meta-poky/conf/distro/poky-tiny.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

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