summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChee Yang Lee <chee.yang.lee@intel.com>2019-12-03 13:35:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 12:04:15 +0000
commit8cce1493f625664c21c156a36d9c9fb6d4dd4b1f (patch)
tree3e28f0d28af513f150ce203be28d86e0eb0db492
parent11ecd2febed95e923c8cc68e2c438cd846a88d02 (diff)
downloadmeta-yocto-8cce1493f625664c21c156a36d9c9fb6d4dd4b1f.tar.gz
meta-yocto-8cce1493f625664c21c156a36d9c9fb6d4dd4b1f.tar.bz2
meta-yocto-8cce1493f625664c21c156a36d9c9fb6d4dd4b1f.zip
selftest/systemd-boot: test against wic image
effort to remove live for x86 from default image see https://bugzilla.yoctoproject.org/show_bug.cgi?id=11291 reduce dependency on hddimg, change the test to based on wic image. Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py9
1 files changed, 4 insertions, 5 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 0a3a2cd..b3db226 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
+++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
@@ -38,9 +38,9 @@ class Systemdboot(OESelftestTestCase):
"""
Summary: Check if EFI bootloader for systemd is correctly build
Dependencies: Image was built correctly on testcase 1445
- Steps: 1. Copy bootx64.efi file form the hddimg created
+ Steps: 1. Copy bootx64.efi file from the wic created
under build/tmp/deploy/images/genericx86-64
- 2. Check bootx64.efi was copied form hddimg
+ 2. Check bootx64.efi was copied from wic
3. Verify the checksums from the copied and previously
created file are equal.
Expected : Systemd-bootx64.efi and bootx64.efi should be the same
@@ -50,15 +50,14 @@ class Systemdboot(OESelftestTestCase):
AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com>
"""
- systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.hddimg')
+ systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.wic')
imagebootfile = os.path.join(deploydir, 'bootx64.efi')
- mcopynative = os.path.join(get_bb_var('STAGING_BINDIR_NATIVE', "core-image-minimal"), 'mcopy')
# Clean environment before start the test
if os.path.isfile(imagebootfile):
runCmd('rm -f %s' % imagebootfile)
- runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage,
+ runCmd('wic cp %s:1/EFI/BOOT/bootx64.efi %s' % (systemdbootimage,
imagebootfile))
found = os.path.isfile(imagebootfile)