napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootloader: add-support_for_aarch64

Browse Source
This commit is contained in:
Jia Chao 2021-06-25 17:42:36 +08:00
parent b54b486ee8
commit 3dce393dcc
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/bootloader/main.py
View File

@ -24,6 +24,8 @@ import os
import shutil import shutil
import subprocess import subprocess
import platform
import libcalamares import libcalamares
from libcalamares.utils import check_target_env_call 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_bootloader_id = efi_label()
efi_bitness = efi_word_size() efi_bitness = efi_word_size()
cpu_type = platform.machine()
if efi_bitness == "32": if efi_bitness == "32":
efi_target = "i386-efi" efi_target = "i386-efi"
efi_grub_file = "grubia32.efi" efi_grub_file = "grubia32.efi"
efi_boot_file = "bootia32.efi" efi_boot_file = "bootia32.efi"
elif efi_bitness == "64": elif efi_bitness == "64":
efi_target = "x86_64-efi" if cpu_type == "aarch64":
efi_grub_file = "grubx64.efi" efi_target = "arm64-efi"
efi_boot_file = "bootx64.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"], check_target_env_call([libcalamares.job.configuration["grubInstall"],
"--target=" + efi_target, "--target=" + efi_target,