Skip to contentSkip to conversation

poky-tiny: don't blacklist core-image-base and core-image-full-cmdline

PATCH New Ross Burton 1 participant 2 messages Feb 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 poky-tiny: don't blacklist core-image-base and core-image-full-cmdline

Building a "tiny" core-image-full-cmdline may not make a lot of sense, but it build, so don't blacklist these images.

---
 meta-poky/conf/distro/poky-tiny.conf | 2 --
 1 file changed, 2 deletions(-)
meta-poky/conf/distro/poky-tiny.conf +0 -2
index b6c4eeccd0..8fae126cbc 100644
@@ -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"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 poky-tiny: set QB_DEFAULT_FSTYPE correctly

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.

---
 meta-poky/conf/distro/poky-tiny.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-poky/conf/distro/poky-tiny.conf +1 -2
index 8fae126cbc..efa111d5b1 100644
@@ -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
Signature · 1 line
2.25.1