From 06c5bab6131b57a152ff90ffde488c35f90ff7a4 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Tue, 15 Feb 2022 12:59:41 +0000
Subject: [PATCH] oniro-image: use x-gpt-efi-disk for SECO B68
This, coupled with the earlier EFI_PROVIDER change allows the generated
disk image to correctly boot with GRUB under QEMU/EFI. There is some
loss of functionality: the early-boot microcode patch system is gone,
for the moment, until we figure out how to bring it back with improved
and unified GRUB configuration files.
This was tested with:
qemu-system-x86_64 -cpu IvyBridge -machine q35 -bios ovmf.qcow2 \
oniro-image-base-seco-intel-b68.wic -m 1024 -nographic
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
meta-oniro-core/classes/oniro-image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oniro-core/classes/oniro-image.bbclass b/meta-oniro-core/classes/oniro-image.bbclass
index 02a98821..0c435ea1 100644
--- a/meta-oniro-core/classes/oniro-image.bbclass
+++ b/meta-oniro-core/classes/oniro-image.bbclass
@@ -32,7 +32,7 @@ IMAGE_FSTYPES:append = " squashfs"
WKS_FILE:raspberrypi4-64 ?= "x-raspberrypi.wks.in"
-WKS_FILE:seco-intel-b68 ?= "x-efi-systemd-microcode.wks.in"
+WKS_FILE:seco-intel-b68 ?= "x-gpt-efi-disk.wks.in"
IMAGE_FSTYPES:append:seco-intel-b68 = " wic.bz2 wic.bmap"
# We avoid any other fstypes (for qemu) by default as the OS depends on a
--
GitLab