MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

image_types_wic.bbclass: add "grub-efi" back to WKS_FILE_DEPENDS_BOOTLOADERS on x86-64

Browse Source 
This was removed by me without good reasons in commit
2f0ef8cd0e
"wic bootimg-efi.py: change UKI support from wic plugin to uki.bbclass"
and results in grub-efi binaries missing from
genereted ESP partition on qemux86-64.

Fixes oeqa selftest
overlayfs.OverlayFSEtcRunTimeTests.test_image_feature_is_missing
after wic detects missing EFI loader files on ESP partition.

Test case was passing due qemu syslinux boot using kernel directly
from /boot and not using UEFI firmware to boot.

Fixes: 2f0ef8cd0e ("wic bootimg-efi.py: change UKI support from wic plugin to uki.bbclass")

WKS_FILE_DEPENDS_BOOTLOADERS needs to list all EFI loaders because
it's used in DEPENDS and thus can't use conditional python macros
to select which loader is actually needed in sysroot when
wic builds the images and ESP partition.

(From OE-Core rev: c6eb09f45900367df01958ee7012e9de974b401f)

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mikko Rapeli 2025-05-30 14:37:45 +03:00 committed by Richard Purdie
parent a2bd18fb36
commit fa5cf8a808
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes-recipe/image_types_wic.bbclass
View File

@ -114,7 +114,7 @@ WKS_FILE_DEPENDS_BOOTLOADERS = ""
WKS_FILE_DEPENDS_BOOTLOADERS:aarch64 = "grub-efi systemd-boot"
WKS_FILE_DEPENDS_BOOTLOADERS:arm = "systemd-boot"
WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot"
WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux systemd-boot"
WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot"
WKS_FILE_DEPENDS_BOOTLOADERS:x86-x32 = "syslinux grub-efi"
WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}"