From: Mikko Rapeli <mikko.rapeli@linaro.org>
Date: Thu, 4 Jan 2024 10:14:37 +0000 (+0200)
Subject: runqemu: match .rootfs. in addition to -image- for rootfs
X-Git-Tag: uninative-4.4~558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=107d0db3dc3678e6f0ae4035f4c0b86c6b421168;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

runqemu: match .rootfs. in addition to -image- for rootfs

Also change path.exists() and !path.isdir() to a single
path.isfile() which should be equal.

Enables running tests against image recipes which are not called
"bla-image" but plain "bla". Currently they fail with do_testimage/runqemu
error:

runqemu - ERROR - Unknown path arg /home/builder/src/base/build/tmp_qemuarm64/deploy/images/qemuarm64/img-qemuarm64.rootfs.wic

Suggested-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/runqemu b/scripts/runqemu
index f4d04201092..69cd44864e5 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -375,7 +375,7 @@ class BaseConfig(object):
              re.search('zImage', p) or re.search('vmlinux', p) or \
              re.search('fitImage', p) or re.search('uImage', p):
             self.kernel =  p
-        elif os.path.exists(p) and (not os.path.isdir(p)) and '-image-' in os.path.basename(p):
+        elif os.path.isfile(p) and ('-image-' in os.path.basename(p) or '.rootfs.' in os.path.basename(p)):
             self.rootfs = p
             # Check filename against self.fstypes can handle <file>.cpio.gz,
             # otherwise, its type would be "gz", which is incorrect.