diff options
| author |   Mikko Rapeli <mikko.rapeli@linaro.org> | 2024-01-04 12:14:37 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-04 23:47:04 +0000 |
| commit | 107d0db3dc3678e6f0ae4035f4c0b86c6b421168 (patch) | |
| tree | f3e843ad6e01e6cba36f6bf3b4c458a0b8bfe912 /scripts | |
| parent | 720f48c0692a4cbb00535151b049704645748216 (diff) | |
| download | openembedded-core-contrib-107d0db3dc3678e6f0ae4035f4c0b86c6b421168.tar.gz | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/runqemu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index f4d0420109..69cd44864e 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. |