[PATCH] EFI Loader: use correct arch suffix

[Ivan Nikolaenko <ivan.nikolaenko@unikie.com>]

Previously there were hardcoded "x64" in EFI loaders' filenames.

Signed-off-by: Ivan Nikolaenko <ivan.nikolaenko@unikie.com>
---
 img/combined/default.nix |  5 +++--
 img/live/Makefile        |  2 +-
 img/live/default.nix     |  5 +++--
 nix/eval-config.nix      | 11 ++++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/img/combined/default.nix b/img/combined/default.nix
index 3989d55..2086973 100644
--- a/img/combined/default.nix
+++ b/img/combined/default.nix
@@ -7,6 +7,7 @@
 let
   inherit (builtins) storeDir;
   inherit (pkgs.lib) removePrefix;
+  inherit (config) archSuffix;
 
   eosimages = import ./eosimages.nix { inherit config; };
 
@@ -74,8 +75,8 @@ let
     done
     mcopy -i $out ${grub}/share/grub/unicode.pf2 ::/grub/fonts
 
-    grub-mkimage -o grubx64.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat
-    mcopy -i $out grubx64.efi ::/EFI/BOOT/BOOTX64.EFI
+    grub-mkimage -o grub${archSuffix}.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat
+    mcopy -i $out grub${archSuffix}.efi ::/EFI/BOOT/BOOT${lib.toUpper archSuffix}.EFI
 
     fsck.vfat -n $out
   '';
diff --git a/img/live/Makefile b/img/live/Makefile
index 9815c88..e63c598 100644
--- a/img/live/Makefile
+++ b/img/live/Makefile
@@ -36,7 +36,7 @@ build/boot.fat: $(KERNEL) $(INITRAMFS) $(SYSTEMD_BOOT_EFI) build/spectrum.conf
 	$(MCOPY) -i $@ build/spectrum.conf ::/loader/entries
 	$(MCOPY) -i $@ $(KERNEL) ::/spectrum/linux
 	$(MCOPY) -i $@ $(INITRAMFS) ::/spectrum/initrd
-	$(MCOPY) -i $@ $(SYSTEMD_BOOT_EFI) ::/EFI/BOOT/BOOTX64.EFI
+	$(MCOPY) -i $@ $(SYSTEMD_BOOT_EFI) ::/EFI/BOOT/$(EFINAME)
 
 # veritysetup format produces two files, but Make only (portably)
 # supports one output per rule, so we combine the two outputs then
diff --git a/img/live/default.nix b/img/live/default.nix
index 65ad058..7be55ac 100644
--- a/img/live/default.nix
+++ b/img/live/default.nix
@@ -4,7 +4,7 @@
 { config ? import ../../nix/eval-config.nix {} }:
 
 let
-  inherit (config) pkgs;
+  inherit (config) pkgs archSuffix;
   inherit (pkgs.lib) cleanSource cleanSourceWith hasSuffix;
 
   extfs = pkgs.pkgsStatic.callPackage ../../host/initramfs/extfs.nix {
@@ -33,7 +33,8 @@ stdenvNoCC.mkDerivation {
   INITRAMFS = initramfs;
   KERNEL = "${rootfs.kernel}/${stdenv.hostPlatform.linux-kernel.target}";
   ROOT_FS = rootfs;
-  SYSTEMD_BOOT_EFI = "${systemd}/lib/systemd/boot/efi/systemd-bootx64.efi";
+  SYSTEMD_BOOT_EFI = "${systemd}/lib/systemd/boot/efi/systemd-boot${archSuffix}.efi";
+  EFINAME = "BOOT${lib.toUpper archSuffix}.EFI";
 
   buildFlags = [ "build/live.img" ];
   makeFlags = [ "SCRIPTS=${scripts}" ];
diff --git a/nix/eval-config.nix b/nix/eval-config.nix
index 467f877..4234321 100644
--- a/nix/eval-config.nix
+++ b/nix/eval-config.nix
@@ -8,6 +8,15 @@
   else {}
 }:
 
-({ pkgs ? import <nixpkgs> {} }: {
+({ pkgs ? import <nixpkgs> {} }: with pkgs; {
   inherit pkgs;
+
+  archSuffix =
+    if pkgs.stdenv.isx86_64 then
+      "x64"
+    else if pkgs.stdenv.isAarch64 then
+      "aa64"
+    else
+      throw "Unsupported architecture";
+
 }) config
-- 
2.25.1