Add riscv64 to efi arches

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -1,4 +1,5 @@
 *~
+*.sw?
 *.rpm
 *.tar.*
 .*.sw?

0001-Add-riscv64-to-efi.patch

@@ -0,0 +1,39 @@
+From 3c38c71252d53ad29827b0b8700633b7d3c4e0c6 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 21 Mar 2024 15:55:34 +0000
+Subject: [PATCH] Add riscv64 to efi
+
+---
+ Makefile           | 2 +-
+ macros.efi-srpm.in | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 37e97a5..166ee97 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ override EFI_ESP_ROOT=/boot/efi
+ endif
+ EFI_ARCHES	?= $(call get-config,arches)
+ ifeq ($(EFI_ARCHES),)
+-override EFI_ARCHES="x86_64 aarch64 %{arm} %{ix86}"
++override EFI_ARCHES="x86_64 aarch64 %{arm} %{ix86} riscv64"
+ endif
+ EFI_VENDOR	?= $(call get-config,vendor)
+ 
+diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
+index 00503f1..7f258c7 100644
+--- a/macros.efi-srpm.in
++++ b/macros.efi-srpm.in
+@@ -37,6 +37,8 @@
+       return("aa64")
+     elseif arch("%{arm}") then
+       return("arm")
++    elseif arch("riscv64") then
++      return("riscv64")
+     else
+       return("none")
+     end
+-- 
+2.44.0
+

0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 31 Aug 2021 16:33:07 -0400
+Subject: [PATCH] Don't have arm as an alt arch of aarch64
+
+The compiler isn't actually set up in a way that lets us do this without
+a cross compiler, so we shouldn't do this this way.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ macros.efi-srpm.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
+index 4d7b019..00503f1 100644
+--- a/macros.efi-srpm.in
++++ b/macros.efi-srpm.in
+@@ -45,8 +45,6 @@
+   local function getaltarch()
+     if arch("x86_64") then
+       return("ia32")
+-    elseif arch("aarch64") then
+-      return("arm")
+     else
+       return("none")
+     end

0002-Makefile-fix-permission-on-boot-efi-EFI.patch

@@ -0,0 +1,29 @@
+From 110b9c24200ff90c5d09cc2bf41df728810a0e0e Mon Sep 17 00:00:00 2001
+From: Sandro Bonazzola <sbonazzo@redhat.com>
+Date: Wed, 3 May 2023 11:20:36 +0200
+Subject: [PATCH] Makefile: fix permission on /boot/efi/EFI
+
+Ensure /boot/efi/EFI is created with 0700 mode.
+
+Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=2144459
+
+Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 7d56eae..37e97a5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,6 +65,7 @@ install : $(TARGETS)
+ 		install -d -m 0755 $(DESTDIR)/boot ; \
+ 	fi
+ 	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)
++	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)/EFI
+ 	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)/EFI/BOOT
+ 	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)/EFI/$(EFI_VENDOR)
+ 
+-- 
+2.40.1
+

efi-rpm-macros.spec

@@ -1,13 +1,18 @@
 Summary: Common RPM Macros for building EFI-related packages
 Name: efi-rpm-macros
-Version: 4
-Release: 3%{?dist}
-License: GPLv3+
+Version: 5
+Release: 11.0.riscv64%{?dist}
+License: GPL-3.0-or-later
 URL: https://github.com/rhboot/%{name}/
 BuildRequires: git sed
+BuildRequires: make
 BuildArch: noarch
 
-Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-4.tar.bz2
+Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-5.tar.bz2
+
+Patch0001: 0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch
+Patch0002: 0002-Makefile-fix-permission-on-boot-efi-EFI.patch
+Patch0003: 0001-Add-riscv64-to-efi.patch
 
 %global debug_package %{nil}
 %global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
@@ -33,10 +38,10 @@ The efi-filesystem package contains the basic directory layout for EFI
 machine bootloaders and tools.
 
 %prep
-%autosetup -S git -n %{name}-4
+%autosetup -S git_am -n %{name}-5
 git config --local --add efi.vendor "%{_efi_vendor_}"
 git config --local --add efi.esp-root /boot/efi
-git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
+git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86} riscv64"
 
 %build
 %make_build clean all
@@ -65,6 +70,56 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 %dir /boot/efi/EFI/%{_efi_vendor_}
 
 %changelog
+* Thu Mar 21 2024 David Abdurachmanov <davidlt@rivosinc.com> - 5-11.0.riscv64
+- Prepare for riscv64
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 13 2023 Nicolas Frayer <nfrayer@redhat.com>
+- Migrate to SPDX license
+- Please refer to https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 09 2023 Sandro Bonazzola <sbonazzo@redhat.com> - 5-8
+- Fixes permissions on /boot/efi/EFI
+- Resolves: rhbz#2144459
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Sep 02 2021 Robbie Harwood <rharwood@redhat.com> - 5-4
+- Remove arm as an alt for aarch64 (would require cross compiler)
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Apr 06 2021 Peter Jones <pjones@redhat.com> - 5-2
+- There's always a typo.
+
+* Tue Apr 06 2021 Peter Jones <pjones@redhat.com> - 5-1
+- Add arm as an alt for aarch64
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (efi-rpm-macros-4.tar.bz2) = 0c580902ec053d3bac167086a70fefd5785ddfd93873a48bb7801ab287b2b7af9db325a1f6e3609ad996656cfff713f741f911d012e89b48250ae108fedb789c
+SHA512 (efi-rpm-macros-5.tar.bz2) = 571d35b76e982bfc3cfbc5d09a871057ac47aa78814262e853ef121e36853886d41b140d79e591976091b8f3b015f85eafa2c881eb468b7d10c1618381013954