diff mbox series

[01/14] oe-selftest: wic fix deps of test_efi_plugin_unified_kernel_image_qemu

Message ID 20240704071013.2982700-2-adrian.freihofer@gmail.com
State New
Headers show
Series Use the kernel from sstate when building fitImages | expand

Commit Message

Adrian Freihofer July 4, 2024, 7:09 a.m. UTC 
From: Adrian Freihofer <adrian.freihofer@siemens.com>

oe-selftest wic.Wic2.test_efi_plugin_unified_kernel_image_qemu failed
with:
  AssertionError: Command
    'bitbake  core-image-minimal core-image-minimal-initramfs ovmf'
    returned non-zero exit status 1:

bitbake reported:
  FileNotFoundError: [Errno 2] No such file or directory:
  '.../build-st-242167/tmp/deploy/images/qemux86-64/core-image-minimal-initramfs-qemux86-64.cpio.gz'
  WARNING: .../build-st-242167/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/temp/run.do_image_wic.986859:162
    exit 1 from 'BUILDDIR="/home/adrian/projets/oss/poky/build-st-242167" PSEUDO_UNLOAD=1
    wic create "$wks" --vars ".../build-st-242167/tmp/sysroots/qemux86-64/imgdata/"
       -e "core-image-minimal" -o "$build_wic/" -w "$tmp_wic"'

Creating a configuration as the test does and calling
  bitbake -g core-image-minimal
does not show a dependency from core-image-minimal:do_image_wic on
core-image-minimal-initramfs:do_image_complete.
Adding the dependency directly to the test case resolves the issue.

Since the dependency is basically created by the wks file solving this
in a more generic way, e.g. by handling the dependency in
image_types_wic.bbclass does not look like simple.

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
---
 meta/lib/oeqa/selftest/cases/wic.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index b616759209a..b1315c5b432 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1294,7 +1294,11 @@  class Wic2(WicTestCase):
                  'WKS_FILE = "test_efi_plugin.wks"\n'\
                  'MACHINE_FEATURES:append = " efi"\n'
         self.append_config(config)
-        bitbake('core-image-minimal core-image-minimal-initramfs ovmf')
+        # Rather than creating a special image which adds the dependency which is needed by the wks file
+        # core-image-minimal:do_image_wic[depends] += "core-image-minimal-initramfs:do_image_complete"
+        # core-image-minimal-initramf is built before it is used by core-image-minimal.
+        bitbake('core-image-minimal-initramfs')
+        bitbake('core-image-minimal ovmf')
         self.remove_config(config)
 
         with runqemu('core-image-minimal', ssh=False,