From 166ecfd9e4aac73372ead7529d04a29888b69896 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Thu, 20 Apr 2023 20:53:22 +0000 Subject: Fix GRUB setup for rpi-aarch64 --- platforms/rpi-aarch64/boot/EFI/BOOT/bootaa64.efi | Bin 1382256 -> 0 bytes platforms/rpi-aarch64/second_stage_install.sh | 2 +- platforms/rpi-aarch64/specialFunctions.sh | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100755 platforms/rpi-aarch64/boot/EFI/BOOT/bootaa64.efi diff --git a/platforms/rpi-aarch64/boot/EFI/BOOT/bootaa64.efi b/platforms/rpi-aarch64/boot/EFI/BOOT/bootaa64.efi deleted file mode 100755 index b04f373..0000000 Binary files a/platforms/rpi-aarch64/boot/EFI/BOOT/bootaa64.efi and /dev/null differ diff --git a/platforms/rpi-aarch64/second_stage_install.sh b/platforms/rpi-aarch64/second_stage_install.sh index 66239ae..2e48e10 100644 --- a/platforms/rpi-aarch64/second_stage_install.sh +++ b/platforms/rpi-aarch64/second_stage_install.sh @@ -36,7 +36,7 @@ export ARCH=arm64 mv /etc/grub.d/30_os-prober /tmp /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg -/usr/sbin/grub2-install --skip-fs-probe --target=arm64-efi --efi-directory=/boot/EFI --force --force-file-id +/usr/sbin/grub2-install --skip-fs-probe --target=arm64-efi --efi-directory=/boot/EFI --force --force-file-id --bootloader-id=BOOT mv /tmp/30_os-prober /etc/grub.d/ /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony diff --git a/platforms/rpi-aarch64/specialFunctions.sh b/platforms/rpi-aarch64/specialFunctions.sh index 8209db3..5d28b05 100755 --- a/platforms/rpi-aarch64/specialFunctions.sh +++ b/platforms/rpi-aarch64/specialFunctions.sh @@ -67,5 +67,8 @@ function copyingCustomSystem() # cp --preserve=mode ${BUILD_PATH}/usr/lib64/linux-*/${f} "${BOOT}/" # done + print_info "renaming GRUB EFI executable" + # u-boot only supports booting from /EFI/BOOT/bootaa64.efi + mv -v "${BOOT}/EFI/BOOT/grubaa64.efi" "${BOOT}/EFI/BOOT/bootaa64.efi" return 0 } -- cgit v1.2.1