From 2db3b9f64a528c50f190f106c4a0e87133fbde28 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 30 Oct 2024 21:37:04 +0300
Subject: [PATCH] Added aarch64 support

---
 .shim.metadata         |  3 +++
 SOURCES/shim.rpmmacros |  2 +-
 SPECS/shim.spec        | 16 +++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.shim.metadata b/.shim.metadata
index f2e0f70..e611938 100644
--- a/.shim.metadata
+++ b/.shim.metadata
@@ -1,3 +1,6 @@
+752e659f67bd7843621c0541010b0181691e805a  SOURCES/fbaa64.efi
+d698a35d8a0a0a888ae18a8d01e37d75a00a911a  SOURCES/mmaa64.efi
+7dbef0fa3ddbdeb410dbc86d3cf2f0058c8b1ee7  SOURCES/shimaa64.efi
 628c6f1c89f367a37180648d9fef870fc47bea05  SOURCES/fbx64.efi
 a644618036c4a3d8527c001d590194e1581987ee  SOURCES/mmx64.efi
 7ebdbf62e1257c3c7b86a148fdc0487b92274d0d  SOURCES/shimx64.efi
diff --git a/SOURCES/shim.rpmmacros b/SOURCES/shim.rpmmacros
index e372d0d..199ddfa 100644
--- a/SOURCES/shim.rpmmacros
+++ b/SOURCES/shim.rpmmacros
@@ -19,7 +19,7 @@
 %global mmefix64 %{expand:%{SOURCE42}}
 #%%global mmefiarm %%{expand:%%{SOURCE43}
 
-%global shimveraa64 15-6.el9
+%global shimveraa64 15.8-2.el9.inferit
 %global shimverx64 15.8-1.el9.inferit
 #%%global shimverarm 15-1.el8
 
diff --git a/SPECS/shim.spec b/SPECS/shim.spec
index f0edf43..7fd173b 100644
--- a/SPECS/shim.spec
+++ b/SPECS/shim.spec
@@ -1,6 +1,6 @@
 Name:		shim
 Version:	15.8
-Release:	4.el9_4.inferit
+Release:	4.el9_4.inferit.1
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/
@@ -17,11 +17,10 @@ Source2:	spheresecurebootca.cer
 
 # keep these two lists of sources synched up arch-wise.  That is 0 and 10
 # match, 1 and 11 match, ...
-#Source10:	BOOTAA64.CSV
-#Source20:	shimaa64.efi
-#Source30:	mmaa64.efi
-#Source40:	fbaa64.efi
-# MSVSphere note: currently we support only the x86_64 architecture
+Source10:	BOOTAA64.CSV
+Source20:	shimaa64.efi
+Source30:	mmaa64.efi
+Source40:	fbaa64.efi
 Source12:	BOOTX64.CSV
 Source22:	shimx64.efi
 Source32:	mmx64.efi
@@ -44,7 +43,7 @@ BuildRequires:	pesign >= 0.112-20.fc27
 BuildRequires:	shim-unsigned-x64 = 15.8-1.el9.inferit
 %endif
 %ifarch aarch64
-BuildRequires:	%{unsignedaa64} = %{shimveraa64}
+BuildRequires:	shim-unsigned-aarch64 = 15.8-2.el9.inferit
 %endif
 #%%ifarch arm
 #BuildRequires:	%%{unsignedarm} = %%{shimverarm}
@@ -105,6 +104,9 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %endif
 
 %changelog
+* Wed Oct 30 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 15.8-4.el9_4.inferit.1
+- Added aarch64 support
+
 * Wed May  1 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 15.8-1.el9_4.inferit
 - Rebuilt for MSVSphere 9.4