From 8d60c08df3a7c257535cb20b1f6e957c5969c0a1 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 6 Nov 2023 15:07:44 +0000 Subject: [PATCH] add riscv64 support for efi_arch Signed-off-by: Guoguo --- 0003-add-riscv64-support-for-efi_arch.patch | 25 +++++++++++++++++++++ efi-rpm-macros.spec | 12 ++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 0003-add-riscv64-support-for-efi_arch.patch diff --git a/0003-add-riscv64-support-for-efi_arch.patch b/0003-add-riscv64-support-for-efi_arch.patch new file mode 100644 index 0000000..c543312 --- /dev/null +++ b/0003-add-riscv64-support-for-efi_arch.patch @@ -0,0 +1,25 @@ +From 5f3b035be15458b22f9e31b9edfe97554a30275f Mon Sep 17 00:00:00 2001 +From: U2FsdGVkX1 +Date: Wed, 8 Nov 2023 22:00:02 -0500 +Subject: [PATCH 2/2] 2 + +--- + macros.efi-srpm.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in +index fbeb2c0..8082be3 100644 +--- a/macros.efi-srpm.in ++++ b/macros.efi-srpm.in +@@ -39,6 +39,8 @@ + return("arm") + elseif arch("loongarch64") then + return("loongarch64") ++ elseif arch("riscv64") then ++ return("riscv64") + else + return("none") + end +-- +2.40.2 + diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec index 4129a65..6251748 100644 --- a/efi-rpm-macros.spec +++ b/efi-rpm-macros.spec @@ -1,4 +1,4 @@ -%define anolis_release 6 +%define anolis_release 7 %global debug_package %{nil} %global _efi_vendor_ anolis @@ -17,6 +17,7 @@ Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.bz2 PATCH1001: 0001-PATCH-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch Patch1002: 0002-add-loongarch64-support-for-efi_arch.patch +Patch1003: 0003-add-riscv64-support-for-efi_arch.patch %description %{name} provides a set of RPM macros for use in EFI-related packages. @@ -50,7 +51,7 @@ The %{name}-doc package contains documentation files for %{name}. %autosetup -S git_am -n %{name}-%{version} -p1 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} loongarch64" +git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86} loongarch64 riscv64" %build %make_build clean all @@ -75,10 +76,13 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86} loongarch64" %doc README %changelog -* Thu Oct 26 2023 Wenlong Zhang - 5-6 +* Mon Nov 6 2023 Guoguo - 5-7 +- add riscv64 support for efi_arch + +* Thu Oct 26 2023 Wenlong Zhang - 5-6 - add loongarch64 support for efi_arch -* Tue Oct 10 2023 Wenlong Zhang - 5-5 +* Tue Oct 10 2023 Wenlong Zhang - 5-5 - add loongarch64 support for efi-rpm-macros * Tue Apr 11 2023 Ziyang Zhang - 5-4 -- Gitee