diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb | 57 |
1 files changed, 42 insertions, 15 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb index 128da162d..7bfc8eece 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb @@ -3,7 +3,7 @@ require grub2.inc GRUBPLATFORM = "efi" DEPENDS_append_class-target = " grub-efi-native" -RDEPENDS_${PN}_class-target = "diffutils freetype" +RDEPENDS_${PN}_class-target = "diffutils freetype grub-common virtual/grub-bootconf" SRC_URI += " \ file://cfg \ @@ -15,16 +15,22 @@ S = "${WORKDIR}/grub-${PV}" python __anonymous () { import re target = d.getVar('TARGET_ARCH') + prefix = "" if d.getVar('EFI_PROVIDER') == "grub-efi" else "grub-efi-" if target == "x86_64": grubtarget = 'x86_64' - grubimage = "grub-efi-bootx64.efi" + grubimage = prefix + "bootx64.efi" elif re.match('i.86', target): grubtarget = 'i386' - grubimage = "grub-efi-bootia32.efi" + grubimage = prefix + "bootia32.efi" + elif re.match('aarch64', target): + grubtarget = 'arm64' + grubimage = prefix + "bootaa64.efi" else: - raise bb.parse.SkipPackage("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_IMAGE", grubimage) + prefix = "grub-efi-" if prefix == "" else "" + d.setVar("GRUB_IMAGE_PREFIX", prefix) } inherit deploy @@ -36,12 +42,36 @@ EXTRA_OECONF += "--enable-efiemu=no" # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo) CFLAGS_append_class-native = " -Wno-error=trampolines" +do_mkimage() { + cd ${B} + # Search for the grub.cfg on the local boot media by using the + # built in cfg file provided via this recipe + grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ + -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \ + ${GRUB_BUILDIN} +} + +addtask mkimage before do_install after do_compile + +do_mkimage_class-native() { + : +} + +do_install_append_class-target() { + install -d ${D}/boot + install -d ${D}/boot/EFI + install -d ${D}/boot/EFI/BOOT + install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}/boot/EFI/BOOT/${GRUB_IMAGE} +} + do_install_class-native() { install -d ${D}${bindir} install -m 755 grub-mkimage ${D}${bindir} } -do_install_append_class-target() { +do_install_class-target() { + oe_runmake 'DESTDIR=${D}' -C grub-core install + # Remove build host references... find "${D}" -name modinfo.sh -type f -exec \ sed -i \ @@ -52,15 +82,10 @@ do_install_append_class-target() { } GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ - efi_gop iso9660 search loadenv test" + efi_gop iso9660 configfile search loadenv test" do_deploy() { - # Search for the grub.cfg on the local boot media by using the - # built in cfg file provided via this recipe - grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ - -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ - ${GRUB_BUILDIN} - install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR} + install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${DEPLOYDIR} } do_deploy_class-native() { @@ -69,9 +94,11 @@ do_deploy_class-native() { addtask deploy after do_install before do_build -FILES_${PN} += "${libdir}/grub/${GRUB_TARGET}-efi \ - ${datadir}/grub \ - " +FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ + ${datadir}/grub \ + /boot/EFI/BOOT/${GRUB_IMAGE} \ + " + # 64-bit binaries are expected for the bootloader with an x32 userland INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" |
