aboutsummaryrefslogtreecommitdiffstats
path: root/platforms
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2023-04-20 20:53:22 +0000
committerPascal Terjan <pterjan@gmail.com>2023-04-20 20:56:04 +0000
commit166ecfd9e4aac73372ead7529d04a29888b69896 (patch)
tree7084f6dec84016bdc379a28f2c798107fd970ed7 /platforms
parent5a055e6111fa8f31c987ecda06fb342e94e66916 (diff)
downloadmageia4arm-166ecfd9e4aac73372ead7529d04a29888b69896.tar
mageia4arm-166ecfd9e4aac73372ead7529d04a29888b69896.tar.gz
mageia4arm-166ecfd9e4aac73372ead7529d04a29888b69896.tar.bz2
mageia4arm-166ecfd9e4aac73372ead7529d04a29888b69896.tar.xz
mageia4arm-166ecfd9e4aac73372ead7529d04a29888b69896.zip
Fix GRUB setup for rpi-aarch64
Diffstat (limited to 'platforms')
-rwxr-xr-xplatforms/rpi-aarch64/boot/EFI/BOOT/bootaa64.efibin1382256 -> 0 bytes
-rw-r--r--platforms/rpi-aarch64/second_stage_install.sh2
-rwxr-xr-xplatforms/rpi-aarch64/specialFunctions.sh3
3 files changed, 4 insertions, 1 deletions
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
--- a/platforms/rpi-aarch64/boot/EFI/BOOT/bootaa64.efi
+++ /dev/null
Binary files 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
}