mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

grub-efi: if installed and EFI_PROVIDER, install as bootx64 or bootia32

Browse Source 
This way we could theoretically support multiple bootloaders, and we
keep the convention of boot(x64|ia32).

(From OE-Core rev: 8d158bb4382fd4ef31d37ea5558e07d5eb33145e)

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
California Sullivan
2018-02-28 18:15:01 -08:00
committed by Richard Purdie
parent 531f7b4445
commit 3afd4a5fa0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/grub/grub-efi_2.02.bb
+8 -5
View File
@@ -15,16 +15,19 @@ S = "${WORKDIR}/grub-${PV}"
python __anonymous () { python __anonymous () {
import re import re
target = d.getVar('TARGET_ARCH') target = d.getVar('TARGET_ARCH')
prefix = "" if d.getVar('EFI_PROVIDER') == "grub-efi" else "grub-efi-"
if target == "x86_64": if target == "x86_64":
grubtarget = 'x86_64' grubtarget = 'x86_64'
grubimage = "grub-efi-bootx64.efi" grubimage = prefix + "bootx64.efi"
elif re.match('i.86', target): elif re.match('i.86', target):
grubtarget = 'i386' grubtarget = 'i386'
grubimage = "grub-efi-bootia32.efi" grubimage = prefix + "bootia32.efi"
else: else:
raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" % target) raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" % target)
d.setVar("GRUB_TARGET", grubtarget) d.setVar("GRUB_TARGET", grubtarget)
d.setVar("GRUB_IMAGE", grubimage) d.setVar("GRUB_IMAGE", grubimage)
prefix = "grub-efi-" if prefix == "" else ""
d.setVar("GRUB_IMAGE_PREFIX", prefix)
} }
inherit deploy inherit deploy
@@ -41,7 +44,7 @@ do_mkimage() {
# Search for the grub.cfg on the local boot media by using the # Search for the grub.cfg on the local boot media by using the
# built in cfg file provided via this recipe # built in cfg file provided via this recipe
grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \
-O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \
${GRUB_BUILDIN} ${GRUB_BUILDIN}
} }
@@ -55,7 +58,7 @@ do_install_append_class-target() {
install -d ${D}/boot install -d ${D}/boot
install -d ${D}/boot/EFI install -d ${D}/boot/EFI
install -d ${D}/boot/EFI/BOOT install -d ${D}/boot/EFI/BOOT
install -m 644 ${B}/${GRUB_IMAGE} ${D}/boot/EFI/BOOT/ install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}/boot/EFI/BOOT/${GRUB_IMAGE}
} }
do_install_class-native() { do_install_class-native() {
@@ -79,7 +82,7 @@ GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \
efi_gop iso9660 configfile search loadenv test" efi_gop iso9660 configfile search loadenv test"
do_deploy() { do_deploy() {
install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR} install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${DEPLOYDIR}
} }
do_deploy_class-native() { do_deploy_class-native() {