summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAdrian Freihofer <adrian.freihofer@siemens.com>2019-06-08 09:59:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-08 16:01:41 +0100
commit13aa3bea40a177d34b50745427257bc6b513f084 (patch)
tree4f8b4ea51058cfd8df5f826636008aa20fa5fae7 /meta/classes
parentd6c4039e3f90c78c908807e6b7f5139aa8ac5567 (diff)
downloadpoky-13aa3bea40a177d34b50745427257bc6b513f084.tar.gz
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. (From OE-Core rev: aedb6bf9b6ccf37f69372642bc4c5dbbca92d0d9) Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/testimage.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 9bb5a5cb0b..525c5a6173 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -210,7 +210,11 @@ def testimage_main(d):
210 bb.fatal('Unsupported image type built. Add a comptible image to ' 210 bb.fatal('Unsupported image type built. Add a comptible image to '
211 'IMAGE_FSTYPES. Supported types: %s' % 211 'IMAGE_FSTYPES. Supported types: %s' %
212 ', '.join(supported_fstypes)) 212 ', '.join(supported_fstypes))
213 rootfs = '%s.%s' % (image_name, fstypes[0]) 213 qfstype = fstypes[0]
214 qdeffstype = d.getVar("QB_DEFAULT_FSTYPE")
215 if qdeffstype:
216 qfstype = qdeffstype
217 rootfs = '%s.%s' % (image_name, qfstype)
214 218
215 # Get tmpdir (not really used, just for compatibility) 219 # Get tmpdir (not really used, just for compatibility)
216 tmpdir = d.getVar("TMPDIR") 220 tmpdir = d.getVar("TMPDIR")