summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.04.bb6
-rw-r--r--meta/recipes-bsp/grub/grub_2.04.bb11
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() {
70 install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}${EFI_FILES_PATH}/${GRUB_IMAGE} 70 install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}${EFI_FILES_PATH}/${GRUB_IMAGE}
71} 71}
72 72
73do_install_append_aarch64() {
74 rm -rf ${D}/${prefix}/
75}
76
77GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ 73GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \
78 efi_gop iso9660 configfile search loadenv test" 74 efi_gop iso9660 configfile search loadenv test"
79 75
@@ -88,8 +84,6 @@ FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \
88 ${EFI_FILES_PATH}/${GRUB_IMAGE} \ 84 ${EFI_FILES_PATH}/${GRUB_IMAGE} \
89 " 85 "
90 86
91FILES_${PN}_remove_aarch64 = "${libdir}/grub/${GRUB_TARGET}-efi"
92
93# 64-bit binaries are expected for the bootloader with an x32 userland 87# 64-bit binaries are expected for the bootloader with an x32 userland
94INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" 88INSANE_SKIP_${PN}_append_linux-gnux32 = " arch"
95INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch" 89INSANE_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 = " \
16 ${sbindir} \ 16 ${sbindir} \
17 ${datadir}/grub \ 17 ${datadir}/grub \
18" 18"
19 19ALLOW_EMPTY_${PN} = "1"
20FILES_${PN}-common_append_aarch64 = " \
21 ${libdir}/${BPN} \
22"
23 20
24do_install_append () { 21do_install_append () {
22 # Avoid conflicts with the EFI package for systems such as arm64 where we
23 # need to build grub and grub-efi but only EFI is supported by removing EFI
24 # from this package.
25 rm -rf ${D}${libdir}/grub/*-efi/
26 rmdir --ignore-fail-on-non-empty ${D}${libdir}/grub ${D}${libdir}
27
25 install -d ${D}${sysconfdir}/grub.d 28 install -d ${D}${sysconfdir}/grub.d
26 # Remove build host references... 29 # Remove build host references...
27 find "${D}" -name modinfo.sh -type f -exec \ 30 find "${D}" -name modinfo.sh -type f -exec \