From ad0d8d2a779ce723ffe584d169b07e1cbf055d49 Mon Sep 17 00:00:00 2001 From: Chee Yang Lee Date: Tue, 3 Dec 2019 13:35:59 +0800 Subject: 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. (From meta-yocto rev: 8cce1493f625664c21c156a36d9c9fb6d4dd4b1f) Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 0a3a2cdc4b..b3db226d7e 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 """ - 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) -- cgit v1.2.3-54-g00ecf