From c23b43a61f164e2f5b14eb88c9cab991a495288d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E4=B8=8A=E9=93=9C=2010332738?=
 <guo.shangtong@zte.com.cn>
Date: Wed, 11 Jun 2025 16:18:10 +0800
Subject: [PATCH] fix build error on riscv64

---
 add_support_for_riscv64.patch | 58 -----------------------------------
 edk2-build                    | 15 +++++++++
 edk2.spec                     |  9 ++++--
 3 files changed, 21 insertions(+), 61 deletions(-)
 delete mode 100644 add_support_for_riscv64.patch

diff --git a/add_support_for_riscv64.patch b/add_support_for_riscv64.patch
deleted file mode 100644
index 5ab44f2..0000000
--- a/add_support_for_riscv64.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ruN rpm_ori/SOURCES/50-edk2-riscv-qcow2.json SOURCES/50-edk2-riscv-qcow2.json
---- rpm_ori/SOURCES/50-edk2-riscv-qcow2.json	1969-12-31 19:00:00.000000000 -0500
-+++ SOURCES/50-edk2-riscv-qcow2.json	2025-05-09 04:39:33.961317297 -0400
-@@ -0,0 +1,32 @@
-+{
-+    "description": "UEFI firmware for RISC-V virtual machines",
-+    "interface-types": [
-+        "uefi"
-+    ],
-+    "mapping": {
-+        "device": "flash",
-+        "mode" : "split",
-+        "executable": {
-+            "filename": "/usr/share/edk2/riscv/RISCV_VIRT_CODE.qcow2",
-+            "format": "qcow2"
-+        },
-+        "nvram-template": {
-+            "filename": "/usr/share/edk2/riscv/RISCV_VIRT_VARS.qcow2",
-+            "format": "qcow2"
-+        }
-+    },
-+    "targets": [
-+        {
-+            "architecture": "riscv64",
-+            "machines": [
-+                "virt-*"
-+            ]
-+        }
-+    ],
-+    "features": [
-+
-+    ],
-+    "tags": [
-+
-+    ]
-+}
-diff -ruN rpm_ori/SOURCES/edk2-build SOURCES/edk2-build
---- rpm_ori/SOURCES/edk2-build	2024-11-30 02:30:46.000000000 -0500
-+++ SOURCES/edk2-build	2025-05-09 04:45:37.862189455 -0400
-@@ -155,3 +155,18 @@
- cpy1 = FV/QEMU_EFI.fd  QEMU_EFI.silent.fd
- cpy2 = FV/QEMU_EFI.fd  QEMU_EFI-silent-pflash.raw
- pad2 = QEMU_EFI-silent-pflash.raw 4m
-+
-+#####################################################################
-+# riscv
-+
-+[build.riscv.qemu]
-+conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
-+arch = RISCV64
-+plat = RiscVVirtQemu
-+dest = edk2-build-dir/riscv
-+cpy1 = FV/RISCV_VIRT_CODE.fd
-+cpy2 = FV/RISCV_VIRT_CODE.fd RISCV_VIRT_CODE.raw
-+cpy3 = FV/RISCV_VIRT_VARS.fd
-+cpy4 = FV/RISCV_VIRT_VARS.fd RISCV_VIRT_VARS.raw
-+pad1 = RISCV_VIRT_CODE.raw 32m
-+pad2 = RISCV_VIRT_VARS.raw 32m
diff --git a/edk2-build b/edk2-build
index f49bbeb..9e6652e 100644
--- a/edk2-build
+++ b/edk2-build
@@ -155,3 +155,18 @@ dest = edk2-build-dir/loongarch64
 cpy1 = FV/QEMU_EFI.fd  QEMU_EFI.silent.fd
 cpy2 = FV/QEMU_EFI.fd  QEMU_EFI-silent-pflash.raw
 pad2 = QEMU_EFI-silent-pflash.raw 4m
+
+#####################################################################
+# riscv
+
+[build.riscv.qemu]
+conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
+arch = RISCV64
+plat = RiscVVirtQemu
+dest = edk2-build-dir/riscv
+cpy1 = FV/RISCV_VIRT_CODE.fd
+cpy2 = FV/RISCV_VIRT_CODE.fd RISCV_VIRT_CODE.raw
+cpy3 = FV/RISCV_VIRT_VARS.fd
+cpy4 = FV/RISCV_VIRT_VARS.fd RISCV_VIRT_VARS.raw
+pad1 = RISCV_VIRT_CODE.raw 32m
+pad2 = RISCV_VIRT_VARS.raw 32m
diff --git a/edk2.spec b/edk2.spec
index 1fae1d9..7cf8e54 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -1,4 +1,4 @@
-%define anolis_release 13
+%define anolis_release 14
 
 %undefine _auto_set_build_flags
 ExclusiveArch: x86_64 aarch64 loongarch64 riscv64
@@ -447,7 +447,7 @@ install -m 0644 \
 
 %if %{build_riscv64}
 install -m 0644 \
-        50-edk2-riscv-qcow2.json \
+        52-edk2-riscv-qcow2.json \
         %{buildroot}%{_datadir}/qemu/firmware
 
 rm -f %{buildroot}%{_datadir}/edk2/riscv/*.raw
@@ -528,7 +528,7 @@ rm -f %{buildroot}%{_datadir}/edk2/riscv/*.raw
 %common_files
 %{_datadir}/%{name}/riscv/*.fd
 %{_datadir}/%{name}/riscv/*.qcow2
-%{_datadir}/qemu/firmware/50-edk2-riscv-qcow2.json
+%{_datadir}/qemu/firmware/52-edk2-riscv-qcow2.json
 %endif
 
 %files tools
@@ -559,6 +559,9 @@ rm -f %{buildroot}%{_datadir}/edk2/riscv/*.raw
 
 
 %changelog
+* Wed Jun 11 2025 Shangtong Guo <guo.shangtong@zte.com.cn> - 202402-14
+- fix build error on riscv64
+
 * Thu Jun 05 2025 Shangtong Guo <guo.shangtong@zte.com.cn> - 202402-13
 - add support for riscv64
 
-- 
Gitee