From: Adrian Freihofer Date: Sat, 8 Jun 2019 07:59:46 +0000 (+0200) Subject: testimage: consider QB_DEFAULT_FSTYPE X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~14233 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aedb6bf9b6ccf37f69372642bc4c5dbbca92d0d9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git testimage: consider QB_DEFAULT_FSTYPE testimage.bbclass starts qemu with the first image type found in the IMAGE_FSTYPES list. It's weird: this ['wic', 'tar'] works but this ['tar'. 'wic'] does not. If QB_DEFAULT_FSTYPE is defined, this fstype is booted. Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie --- diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 9bb5a5cb0ba..525c5a61735 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -210,7 +210,11 @@ def testimage_main(d): bb.fatal('Unsupported image type built. Add a comptible image to ' 'IMAGE_FSTYPES. Supported types: %s' % ', '.join(supported_fstypes)) - rootfs = '%s.%s' % (image_name, fstypes[0]) + qfstype = fstypes[0] + qdeffstype = d.getVar("QB_DEFAULT_FSTYPE") + if qdeffstype: + qfstype = qdeffstype + rootfs = '%s.%s' % (image_name, qfstype) # Get tmpdir (not really used, just for compatibility) tmpdir = d.getVar("TMPDIR")