From 746d5b3bfddf81af8747e97a056b6ac582a9d991 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 15 Dec 2019 00:15:04 +0000 Subject: oeqa/systemd_boot: Ensure wic-tools are available If mtools isn't present on the underlying system this test would fail. Ensure wic-tools is available in a similar way to other wic selftests in OE-Core. (From meta-yocto rev: 5d48d41a3f93ca0e7085ce3c0f646b1d0c8d52d1) Signed-off-by: Richard Purdie --- meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-yocto-bsp') diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py index b3db226d7e..57599e19aa 100644 --- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py +++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py @@ -30,7 +30,7 @@ class Systemdboot(OESelftestTestCase): runCmd('rm -f %s' % systemdbootfile) # Build a genericx86-64/efi systemdboot image - bitbake('mtools-native core-image-minimal') + bitbake('mtools-native core-image-minimal wic-tools') found = os.path.isfile(systemdbootfile) self.assertTrue(found, 'Systemd-Boot file %s not found' % systemdbootfile) @@ -57,8 +57,10 @@ class Systemdboot(OESelftestTestCase): if os.path.isfile(imagebootfile): runCmd('rm -f %s' % imagebootfile) - runCmd('wic cp %s:1/EFI/BOOT/bootx64.efi %s' % (systemdbootimage, - imagebootfile)) + sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') + + runCmd('wic cp %s:1/EFI/BOOT/bootx64.efi %s -n %s' % (systemdbootimage, + imagebootfile, sysroot)) found = os.path.isfile(imagebootfile) self.assertTrue(found, 'bootx64.efi file %s was not copied from image' -- cgit v1.2.3-54-g00ecf