0001-add-riscv64-support-for-efi-arch.patch

@@ -1,25 +0,0 @@
-From 9befa934b3fc15217c9080a29b4dc607cdeef380 Mon Sep 17 00:00:00 2001
-From: ouuleilei <wangliu@iscas.ac.cn>
-Date: Wed, 29 May 2024 22:29:59 +0800
-Subject: [PATCH] add riscv64 support for efi arch
-
----
- macros.efi-srpm.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-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.41.0
-

add-loongarch64-support-for-efi-arch.patch

@@ -1,25 +0,0 @@
-From 121dc2cdef4532106e390f6eb2be4eb64ef1d511 Mon Sep 17 00:00:00 2001
-From: yanglu <yanglu@h-partners.com>
-Date: Mon, 21 Nov 2022 15:37:03 +0800
-Subject: [PATCH] add loongarch64 support for efi arch
-
----
- macros.efi-srpm.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
-index 00503f1..fbeb2c0 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("loongarch64") then
-+      return("loongarch64")
-     else
-       return("none")
-     end
--- 
-2.33.0
-

efi-rpm-macros-Add-sw64-architecture.patch

@@ -1,26 +0,0 @@
-From 2d977a8424d0a25c4650865224d1494a709ce25a Mon Sep 17 00:00:00 2001
-From: Wu Zixuan <wuzx1226@qq.com>
-Date: Fri, 2 Dec 2022 08:58:46 +0800
-Subject: [PATCH] Add sw64 architecture
-
-Signed-off-by: Wu Zixuan <wuzx1226@qq.com>
----
- macros.efi-srpm.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
-index 00503f1..e33a54d 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("%{sw_64}") then
-+      return("sw_64")
-     else
-       return("none")
-     end
--- 
-2.33.0
-

efi-rpm-macros.spec

@@ -4,20 +4,13 @@
 
 Name:          efi-rpm-macros
 Version:       4
-Release:       10
+Release:       5
 Summary:       A set of EFI-related RPM Macros
 License:       GPLv3+
 URL:           https://github.com/rhboot/%{name}/
 Source0:       https://github.com/rhboot/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-%ifarch  loongarch64
-Patch0:        add-loongarch64-support-for-efi-arch.patch
-%endif
-%ifarch sw_64
-Patch1:        efi-rpm-macros-Add-sw64-architecture.patch
-%endif
-Patch2:        0001-add-riscv64-support-for-efi-arch.patch
-
+#patch backport from upstream community
 BuildRequires: git sed
 BuildArch:     noarch
 
@@ -46,7 +39,7 @@ machine bootloaders and tools.
 %autosetup -S git -n %{name}-4
 git config --local --add efi.vendor "%{_vendor}"
 git config --local --add efi.esp-root /boot/efi
-git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64 riscv64"
+git config --local --add efi.arches "x86_64 aarch64"
 
 %build
 %make_build EFI_VENDOR=%{_efi_vendor_} clean all
@@ -66,26 +59,11 @@ git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64 riscv64"
 %{_prefix}/lib/rpm/brp-boot-efi-times
 
 %changelog
-* Wed May 29 2024 Ouuleilei <wangliu@iscas.ac.cn> - 4-10
-- Add riscv64 architecture
-
-* Tue Nov 29 2022 wuzx<wuzx1226@qq.com> - 4-9
-- Add sw64 architecture
-
-* Thu Nov 24 2022 yanglu <yanglu72@h-partners.com> - 4-8
-- DESC:add loongarch64 support for efi_arch
-
-* Sat Nov 19 2022 Wenlong Zhang <zhangwenlong@loongson.cn> - 4-7
-- add loongarch support for efi-rpm-macros
-
-* Thu Jun 16 2022 yanglu <yanglu72@h-partners.com> - 4-6
-- DESC:delete macros in changelog
-
 * Tue Aug 17 2021 gaihuiying <gaihuiying1@huawei.com> - 4-5
-- DESC:revert "delete -S git from autosetup, and delete BuildRequires git"
+- DESC:revert "delete -S git from %autosetup, and delete BuildRequires git"
 
 * Tue Aug 03 2021 chenyanpanHW <chenyanpan@huawei.com> - 4-4
-- DESC: delete -S git from autosetup, and delete BuildRequires git
+- DESC: delete -S git from %autosetup, and delete BuildRequires git
 
 * Thu Sep 10 2020 hanzhijun <hanzhijun1@huawei.com> - 4-3
 - solve source url problem