mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
bootimg/grub-efi.bbclass: allow using a different class for EFI images
Abstract away some names so one can select using EFI_PROVIDER a different class than grub-efi for populating live images, basically allowing the use of a different bootloader than grub-efi. (From OE-Core rev: 14e5de3b8f4d5902d0ac683ff45fb878e88b40ef) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
de18567e62
commit
9d04183cf8
@@ -32,7 +32,8 @@ BOOTDD_VOLUME_ID ?= "boot"
|
||||
BOOTDD_EXTRA_SPACE ?= "16384"
|
||||
|
||||
EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}"
|
||||
EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "", d)}"
|
||||
EFI_PROVIDER ?= "grub-efi"
|
||||
EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}"
|
||||
|
||||
# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
|
||||
# contain "efi". This way legacy is supported by default if neither is
|
||||
@@ -87,7 +88,7 @@ build_boot_dd() {
|
||||
syslinux_hddimg_populate $HDDDIR
|
||||
fi
|
||||
if [ "${EFI}" = "1" ]; then
|
||||
grubefi_hddimg_populate $HDDDIR
|
||||
efi_hddimg_populate $HDDDIR
|
||||
fi
|
||||
|
||||
if [ "${IS_VMDK}" = "true" ]; then
|
||||
@@ -154,7 +155,7 @@ python do_bootdirectdisk() {
|
||||
if d.getVar("PCBIOS", True) == "1":
|
||||
bb.build.exec_func('build_syslinux_cfg', d)
|
||||
if d.getVar("EFI", True) == "1":
|
||||
bb.build.exec_func('build_grub_cfg', d)
|
||||
bb.build.exec_func('build_efi_cfg', d)
|
||||
bb.build.exec_func('build_boot_dd', d)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user