From 3dce393dcc7a9fd3f05d91c7705111d107ee2ac3 Mon Sep 17 00:00:00 2001 From: Jia Chao Date: Fri, 25 Jun 2021 17:42:36 +0800 Subject: [PATCH] bootloader: add-support_for_aarch64 --- src/modules/bootloader/main.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 3e384a018..7d6a05045 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -24,6 +24,8 @@ import os import shutil import subprocess +import platform + import libcalamares from libcalamares.utils import check_target_env_call @@ -299,14 +301,21 @@ def install_grub(efi_directory, fw_type): efi_bootloader_id = efi_label() efi_bitness = efi_word_size() + cpu_type = platform.machine() + if efi_bitness == "32": efi_target = "i386-efi" efi_grub_file = "grubia32.efi" efi_boot_file = "bootia32.efi" elif efi_bitness == "64": - efi_target = "x86_64-efi" - efi_grub_file = "grubx64.efi" - efi_boot_file = "bootx64.efi" + if cpu_type == "aarch64": + efi_target = "arm64-efi" + efi_grub_file = "grubaa64.efi" + efi_boot_file = "bootaa64.efi" + else: + efi_target = "x86_64-efi" + efi_grub_file = "grubx64.efi" + efi_boot_file = "bootx64.efi" check_target_env_call([libcalamares.job.configuration["grubInstall"], "--target=" + efi_target,