From: Vincent Davis Jr <vince@underview.tech>
To: openembedded-core@lists.openembedded.org
Cc: Vincent Davis Jr <vince@underview.tech>
Subject: [OE-core][PATCH v3 7/8] oe-selftest[wic]: add test_grub_install_biosplusefi
Date: Fri, 5 Sep 2025 12:41:35 -0400 [thread overview]
Message-ID: <20250905164136.2896809-7-vince@underview.tech> (raw)
In-Reply-To: <20250905164136.2896809-1-vince@underview.tech>
Commit adds test to check if required files
are found in the EFI directory and that
grub modules for both EFI and BIOS are found
on the same partition as the grub config.
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
---
meta/lib/oeqa/selftest/cases/wic.py | 54 +++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index 44442e402d..10c3497519 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1456,6 +1456,60 @@ run_wic_cmd() {
out = glob(os.path.join(self.resultdir, "%s-*.direct" % wksname))
self.assertEqual(1, len(out))
+ @skipIfNotArch(['x86_64'])
+ def test_grub_install_biosplusefi(self):
+ """
+ Test the installation of the grub in hybrid boot mode.
+ """
+
+ # create a temporary file for the WKS content
+ with NamedTemporaryFile("w", suffix=".wks") as wks:
+ wks.write(
+ 'part bios_boot --label bios_boot --fstype none --offset 1024 --fixed-size 1M ' \
+ '--part-type 21686148-6449-6E6F-744E-656564454649 --source bootimg_biosplusefi ' \
+ '--sourceparams="loader=grub-efi,loader-bios=grub,install-kernel-into-boot-dir=false"\n' \
+ 'part efi_system --label efi_system --fstype vfat --fixed-size 48M ' \
+ '--part-type C12A7328-F81F-11D2-BA4B-00A0C93EC93B --source bootimg_biosplusefi ' \
+ '--sourceparams="loader=grub-efi,loader-bios=grub,install-kernel-into-boot-dir=false"\n' \
+ 'part grub_data --label grub_data --fstype ext4 --fixed-size 78M ' \
+ '--part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --source bootimg_biosplusefi ' \
+ '--sourceparams="loader=grub-efi,loader-bios=grub,install-kernel-into-boot-dir=false"\n' \
+ 'bootloader --ptable gpt --source bootimg_biosplusefi\n'
+ )
+ wks.flush()
+
+ img = "core-image-minimal"
+ config = 'DEPENDS:pn-%s += "grub-native grub grub-efi"' % (img)
+
+ self.append_config(config)
+ bitbake(img)
+ self.remove_config(config)
+
+ cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir)
+ runCmd(cmd)
+
+ wksname = os.path.splitext(os.path.basename(wks.name))[0]
+ out = glob(os.path.join(self.resultdir, "%s-*.direct" % wksname))
+ self.assertEqual(1, len(out))
+
+ sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
+
+ # Check if grub UEFI application (core.img) installed
+ result = runCmd("wic ls %s:2/EFI/BOOT -n %s" % (out[0], sysroot))
+ self.assertIn('bootx64', result.output)
+
+ # Check if grub.cfg is installed
+ result = runCmd("wic ls %s:3/boot/grub -n %s" % (out[0], sysroot))
+ self.assertIn('grub', result.output)
+
+ # Check if normal.mod is installed
+ result = runCmd("wic ls %s:3/boot/grub/i386-pc -n %s" % (out[0], sysroot))
+ self.assertIn('normal', result.output)
+
+ # Check if normal.mod is installed
+ result = runCmd("wic ls %s:3/boot/grub/x86_64-efi -n %s" % (out[0], sysroot))
+ self.assertIn('normal', result.output)
+
@skipIfNotArch(['i586', 'i686', 'x86_64', 'aarch64'])
def test_uefi_kernel(self):
""" Test uefi-kernel in wic """
--
2.43.0
next prev parent reply other threads:[~2025-09-05 16:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-05 16:41 [OE-core][PATCH v3 1/8] bootimg_pcbios: support grub hybrid boot Vincent Davis Jr
2025-09-05 16:41 ` [OE-core][PATCH v3 2/8] bootimg_efi: " Vincent Davis Jr
2025-09-05 16:41 ` [OE-core][PATCH v3 3/8] bootimg_efi: copy grub modules Vincent Davis Jr
2025-09-05 16:41 ` [OE-core][PATCH v3 4/8] bootimg_pcbios: update default boot timeout to zero Vincent Davis Jr
2025-09-05 16:41 ` [OE-core][PATCH v3 5/8] bootimg_biosplusefi: add grub only examples Vincent Davis Jr
2025-09-05 16:41 ` [OE-core][PATCH v3 6/8] grub-efi: support custom embedded grub configs Vincent Davis Jr
2025-09-05 16:41 ` Vincent Davis Jr [this message]
2025-09-05 16:41 ` [OE-core][PATCH v3 8/8] oe-selftest[wic]: add test_grub_install_biosplusefi_qemu Vincent Davis Jr
2025-09-07 14:02 ` [OE-core][PATCH v3 1/8] bootimg_pcbios: support grub hybrid boot Mathieu Dubois-Briand
2025-09-07 15:47 ` Vincent Davis
2025-09-08 12:25 ` Mathieu Dubois-Briand
2025-09-13 4:29 ` [PATCH " Vincent Davis Jr
2025-09-15 12:17 ` [OE-core] " Mathieu Dubois-Briand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250905164136.2896809-7-vince@underview.tech \
--to=vince@underview.tech \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.