From: Luca Boccassi <bluca@debian.org>
Date: Sat, 20 Aug 2022 15:03:58 +0000 (+0100)
Subject: boot: do not hard-code EFI stub architecture
X-Git-Tag: v14~68^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7374440543b346f44c2befc97516c3c5bf60f21;p=thirdparty%2Fmkosi.git

boot: do not hard-code EFI stub architecture
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index b9fee1d45..53126a159 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -425,6 +425,15 @@ DEBIAN_KERNEL_ARCHITECTURES = {
     "s390x": "s390x",
 }
 
+# EFI has its own conventions too
+EFI_ARCHITECTURES = {
+    "x86_64": "x64",
+    "x86": "ia32",
+    "aarch64": "aa64",
+    "armhfp": "arm",
+    "riscv64:": "riscv64",
+}
+
 
 class GPTRootTypeTriplet(NamedTuple):
     root: uuid.UUID
@@ -4065,7 +4074,7 @@ def install_unified_kernel(
                 "--add-section", f".cmdline={cmdline}",   "--change-section-vma", ".cmdline=0x30000",
                 "--add-section", f".linux={root / kimg}", "--change-section-vma", ".linux=0x2000000",
                 "--add-section", f".initrd={initrd}",     "--change-section-vma", ".initrd=0x3000000",
-                root / "lib/systemd/boot/efi/linuxx64.efi.stub",
+                root / f"lib/systemd/boot/efi/linux{EFI_ARCHITECTURES[args.architecture]}.efi.stub",
                 boot_binary,
             ]