[elbe-devel] [PATCH 06/10] elbepack: check-build: dynamically find package image file

[Thomas Weißschuh]

The actual filename of the image in the output directory differs depending on
the used packer. Allow users to specify the same unpacked image name in <check>
as is done in <images>.

As the noop packer is also checked first, this is backwards compatible.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/commands/check-build.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/elbepack/commands/check-build.py b/elbepack/commands/check-build.py
index ebf81a6dc4cd768194c9cd498ee7875ad8be0dbe..cc89a4fbb80ff83069744b18d5354bf3debe8d8e 100644
--- a/elbepack/commands/check-build.py
+++ b/elbepack/commands/check-build.py
@@ -19,6 +19,7 @@ from elbepack.aptpkgutils import parse_built_using
 from elbepack.filesystem import TmpdirFilesystem
 from elbepack.log import elbe_logging
 from elbepack.main import run_elbe_subcommand
+from elbepack.packers import find_packed_image
 from elbepack.shellhelper import env_add
 from elbepack.treeutils import etree
 from elbepack.version import is_devel
@@ -454,7 +455,11 @@ class CheckImage(CheckBase):
 
     def do_img(self, tag):
 
-        img_name = self.directory / tag.text('./img')
+        img = tag.text('./img')
+        img_name = find_packed_image(self.directory, img)
+        if img_name is None:
+            raise ValueError(f'Could not find image file: {img}')
+
         qemu = tag.text('./interpreter')
 
         fw_opts = ''

-- 
2.48.1