diff options
| -rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.04.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub_2.04.bb | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb b/meta/recipes-bsp/grub/grub-efi_2.04.bb index f80afd95cb..287845c507 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb @@ -70,10 +70,6 @@ do_install() { install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}${EFI_FILES_PATH}/${GRUB_IMAGE} } -do_install_append_aarch64() { - rm -rf ${D}/${prefix}/ -} - GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ efi_gop iso9660 configfile search loadenv test" @@ -88,8 +84,6 @@ FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ ${EFI_FILES_PATH}/${GRUB_IMAGE} \ " -FILES_${PN}_remove_aarch64 = "${libdir}/grub/${GRUB_TARGET}-efi" - # 64-bit binaries are expected for the bootloader with an x32 userland INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch" diff --git a/meta/recipes-bsp/grub/grub_2.04.bb b/meta/recipes-bsp/grub/grub_2.04.bb index f2942b9e37..d4e09faa40 100644 --- a/meta/recipes-bsp/grub/grub_2.04.bb +++ b/meta/recipes-bsp/grub/grub_2.04.bb @@ -16,12 +16,15 @@ FILES_${PN}-common = " \ ${sbindir} \ ${datadir}/grub \ " - -FILES_${PN}-common_append_aarch64 = " \ - ${libdir}/${BPN} \ -" +ALLOW_EMPTY_${PN} = "1" do_install_append () { + # Avoid conflicts with the EFI package for systems such as arm64 where we + # need to build grub and grub-efi but only EFI is supported by removing EFI + # from this package. + rm -rf ${D}${libdir}/grub/*-efi/ + rmdir --ignore-fail-on-non-empty ${D}${libdir}/grub ${D}${libdir} + install -d ${D}${sysconfdir}/grub.d # Remove build host references... find "${D}" -name modinfo.sh -type f -exec \ |