summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-15 00:15:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-15 00:15:47 +0000
commit0a8b94cf4ccff78c08a4386b9a7a95956cb15d7b (patch)
tree3d5b56e266f5efdb2acae56e375fcaa5b0e3f5e7
parent8cce1493f625664c21c156a36d9c9fb6d4dd4b1f (diff)
downloadmeta-yocto-master-next.tar.gz
meta-yocto-master-next.tar.bz2
meta-yocto-master-next.zip
oeqa/systemd_boot: Ensure wic-tools are availablemaster-next
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py8
1 files changed, 5 insertions, 3 deletions
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 b3db226..57599e1 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'