diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2018-02-28 18:15:02 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-06 06:35:42 -0800 |
commit | bfd48060e362bebdeee8688f4ce60b9dc84b9aa7 (patch) | |
tree | 0f97358b29389f796d45afc9d9ba5fcd3d08863f /meta | |
parent | 3afd4a5fa04ca97bdead6bb3794396f7492bc7dc (diff) | |
download | poky-bfd48060e362bebdeee8688f4ce60b9dc84b9aa7.tar.gz |
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.
(From OE-Core rev: d8a670726fb6b2553c792a1c66346f975f040135)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 3 |
1 files changed, 3 insertions, 0 deletions
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" | |||
23 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" | 23 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" |
24 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" | 24 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" |
25 | 25 | ||
26 | EFI_PROVIDER ??= "grub-efi" | ||
27 | |||
26 | SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ | 28 | SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ |
27 | modutils-initscripts \ | 29 | modutils-initscripts \ |
28 | init-ifupdown \ | 30 | init-ifupdown \ |
@@ -35,6 +37,7 @@ RDEPENDS_${PN} = "\ | |||
35 | ${VIRTUAL-RUNTIME_base-utils} \ | 37 | ${VIRTUAL-RUNTIME_base-utils} \ |
36 | ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ | 38 | ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ |
37 | ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ | 39 | ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ |
40 | ${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)} \ | ||
38 | netbase \ | 41 | netbase \ |
39 | ${VIRTUAL-RUNTIME_login_manager} \ | 42 | ${VIRTUAL-RUNTIME_login_manager} \ |
40 | ${VIRTUAL-RUNTIME_init_manager} \ | 43 | ${VIRTUAL-RUNTIME_init_manager} \ |