From 2977911266932aeadb0a70b8a3c1c932d43e1ee3 Mon Sep 17 00:00:00 2001
From: Hailiang <mahailiang@uniontech.com>
Date: Wed, 12 Mar 2025 15:07:39 +0800
Subject: [PATCH] Merge all schema support patches

---
 0001-add-riscv64-support-for-efi-arch.patch   | 25 ------------------
 ...tch => add-loongarch64-sw_64-riscv64.patch | 22 +++++++++-------
 efi-rpm-macros-Add-sw64-architecture.patch    | 26 -------------------
 efi-rpm-macros.spec                           | 13 ++++------
 4 files changed, 18 insertions(+), 68 deletions(-)
 delete mode 100644 0001-add-riscv64-support-for-efi-arch.patch
 rename add-loongarch64-support-for-efi-arch.patch => add-loongarch64-sw_64-riscv64.patch (42%)
 delete mode 100644 efi-rpm-macros-Add-sw64-architecture.patch

diff --git a/0001-add-riscv64-support-for-efi-arch.patch b/0001-add-riscv64-support-for-efi-arch.patch
deleted file mode 100644
index bbcb30d..0000000
--- a/0001-add-riscv64-support-for-efi-arch.patch
+++ /dev/null
@@ -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
-
diff --git a/add-loongarch64-support-for-efi-arch.patch b/add-loongarch64-sw_64-riscv64.patch
similarity index 42%
rename from add-loongarch64-support-for-efi-arch.patch
rename to add-loongarch64-sw_64-riscv64.patch
index af88bca..c75890b 100644
--- a/add-loongarch64-support-for-efi-arch.patch
+++ b/add-loongarch64-sw_64-riscv64.patch
@@ -1,25 +1,29 @@
-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
+From 34eff1b4129262d40e7b9eb4575f5857b41ea171 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 12 Mar 2025 15:04:31 +0800
+Subject: [PATCH] add loongarch64 sw_64 riscv64
 
 ---
- macros.efi-srpm.in | 2 ++
- 1 file changed, 2 insertions(+)
+ macros.efi-srpm.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
-index 00503f1..fbeb2c0 100644
+index 00503f1..be036fe 100644
 --- a/macros.efi-srpm.in
 +++ b/macros.efi-srpm.in
-@@ -37,6 +37,8 @@
+@@ -37,6 +37,12 @@
        return("aa64")
      elseif arch("%{arm}") then
        return("arm")
 +    elseif arch("loongarch64") then
 +      return("loongarch64")
++    elseif arch("sw_64") then
++      return("sw_64")
++    elseif arch("riscv64") then
++      return("riscv64")
      else
        return("none")
      end
 -- 
-2.33.0
+2.20.1
 
diff --git a/efi-rpm-macros-Add-sw64-architecture.patch b/efi-rpm-macros-Add-sw64-architecture.patch
deleted file mode 100644
index 3c54c1a..0000000
--- a/efi-rpm-macros-Add-sw64-architecture.patch
+++ /dev/null
@@ -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
-
diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec
index 48f1b83..884e6c9 100644
--- a/efi-rpm-macros.spec
+++ b/efi-rpm-macros.spec
@@ -4,19 +4,13 @@
 
 Name:          efi-rpm-macros
 Version:       4
-Release:       10
+Release:       11
 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
+Patch0:        add-loongarch64-sw_64-riscv64.patch
 
 BuildRequires: git sed
 BuildArch:     noarch
@@ -66,6 +60,9 @@ git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64 riscv64"
 %{_prefix}/lib/rpm/brp-boot-efi-times
 
 %changelog
+* Wed May 12 2025 mahailiang <mahailiang@uniontech.com> - 4-11
+- Merge all schema support patches
+
 * Wed May 29 2024 Ouuleilei <wangliu@iscas.ac.cn> - 4-10
 - Add riscv64 architecture
 
-- 
Gitee