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

Merge pull request #1733 from CC2130/aarch64-support

Browse Source 
[bootloader] add support for aarch64
This commit is contained in:
Adriaan de Groot 2021-06-28 15:50:18 +02:00 committed by GitHub
commit d068371e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 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,