diff options
-rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.04.bb | 5 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_2.04.bb | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb b/meta/recipes-bsp/grub/grub-efi_2.04.bb index b797bb7445..aaa198ea23 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb | |||
@@ -81,6 +81,10 @@ do_install_class-target() { | |||
81 | {} + | 81 | {} + |
82 | } | 82 | } |
83 | 83 | ||
84 | do_install_append_aarch64() { | ||
85 | rm -rf ${D}/${prefix}/ | ||
86 | } | ||
87 | |||
84 | GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ | 88 | GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ |
85 | efi_gop iso9660 configfile search loadenv test" | 89 | efi_gop iso9660 configfile search loadenv test" |
86 | 90 | ||
@@ -99,6 +103,7 @@ FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ | |||
99 | /boot/EFI/BOOT/${GRUB_IMAGE} \ | 103 | /boot/EFI/BOOT/${GRUB_IMAGE} \ |
100 | " | 104 | " |
101 | 105 | ||
106 | FILES_${PN}_remove_aarch64 = "${libdir}/grub/${GRUB_TARGET}-efi" | ||
102 | 107 | ||
103 | # 64-bit binaries are expected for the bootloader with an x32 userland | 108 | # 64-bit binaries are expected for the bootloader with an x32 userland |
104 | INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" | 109 | INSANE_SKIP_${PN}_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 e0973759fb..1d1a45670c 100644 --- a/meta/recipes-bsp/grub/grub_2.04.bb +++ b/meta/recipes-bsp/grub/grub_2.04.bb | |||
@@ -14,6 +14,10 @@ FILES_${PN}-common = " \ | |||
14 | ${datadir}/grub \ | 14 | ${datadir}/grub \ |
15 | " | 15 | " |
16 | 16 | ||
17 | FILES_${PN}-common_append_aarch64 = " \ | ||
18 | ${libdir}/${BPN} \ | ||
19 | " | ||
20 | |||
17 | do_install_append () { | 21 | do_install_append () { |
18 | install -d ${D}${sysconfdir}/grub.d | 22 | install -d ${D}${sysconfdir}/grub.d |
19 | # Remove build host references... | 23 | # Remove build host references... |