1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-05 02:20:30 +00:00

runfvp: strip all suffixes from the image when calculating .fvpconf name

Until testimage tells the controller the basename of the image, make sure
to strip all suffixes from the image name to get the base name, not just
one.  Machines such as corstone500 have images called .wic.nopt, so just
stripping one isn't sufficient.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2022-03-31 19:31:13 +01:00
committed by Jon Mason
parent 58f3251598
commit 3a0dbcd37f
+3 -1
View File
@@ -16,7 +16,9 @@ class OEFVPTarget(oeqa.core.target.ssh.OESSHTarget):
**kwargs):
super().__init__(logger, target_ip, server_ip, timeout, user, port)
image_dir = pathlib.Path(dir_image)
basename = pathlib.Path(rootfs).stem
# rootfs may have multiple extensions so we need to strip *all* suffixes
basename = pathlib.Path(rootfs)
basename = basename.name.replace("".join(basename.suffixes), "")
self.fvpconf = image_dir / (basename + ".fvpconf")
if not self.fvpconf.exists():