!37 [sync] PR-34: add riscv64 support

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-06-19 02:59:25 +00:00 committed by Gitee
commit 8588f4394b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,25 @@
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

View File

@ -4,7 +4,7 @@
Name: efi-rpm-macros
Version: 4
Release: 9
Release: 10
Summary: A set of EFI-related RPM Macros
License: GPLv3+
URL: https://github.com/rhboot/%{name}/
@ -16,6 +16,7 @@ Patch0: add-loongarch64-support-for-efi-arch.patch
%ifarch sw_64
Patch1: efi-rpm-macros-Add-sw64-architecture.patch
%endif
Patch2: 0001-add-riscv64-support-for-efi-arch.patch
BuildRequires: git sed
BuildArch: noarch
@ -45,7 +46,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"
git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64 riscv64"
%build
%make_build EFI_VENDOR=%{_efi_vendor_} clean all
@ -65,6 +66,9 @@ git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64"
%{_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