From d8a670726fb6b2553c792a1c66346f975f040135 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 28 Feb 2018 18:15:02 -0800 Subject: packagegroup-core-boot: add bootloader to EFI systems Since the bootloader is now installed instead of added at image creation time, this is necessary for booting. Also set the default to grub-efi. This is done because a default of grub-efi is already used by live-vm-common.bbclass, and in the event that EFI_PROVIDER isn't defined errors would occur. Signed-off-by: California Sullivan Signed-off-by: Richard Purdie --- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 04bc0f2b69..0fcb8ba919 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -23,6 +23,8 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit" VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" +EFI_PROVIDER ??= "grub-efi" + SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ modutils-initscripts \ init-ifupdown \ @@ -35,6 +37,7 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_base-utils} \ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)} \ netbase \ ${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ -- cgit 1.2.3-korg