!30 添加sw架构

From: @wuzx065891 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2022-12-02 03:25:39 +00:00 committed by Gitee
commit b4fc0a58b5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 2 deletions

View File

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

View File

@ -4,7 +4,7 @@
Name: efi-rpm-macros Name: efi-rpm-macros
Version: 4 Version: 4
Release: 8 Release: 9
Summary: A set of EFI-related RPM Macros Summary: A set of EFI-related RPM Macros
License: GPLv3+ License: GPLv3+
URL: https://github.com/rhboot/%{name}/ URL: https://github.com/rhboot/%{name}/
@ -13,6 +13,9 @@ Source0: https://github.com/rhboot/%{name}/archive/%{version}.tar.gz#/%{na
%ifarch loongarch64 %ifarch loongarch64
Patch0: add-loongarch64-support-for-efi-arch.patch Patch0: add-loongarch64-support-for-efi-arch.patch
%endif %endif
%ifarch sw_64
Patch1: efi-rpm-macros-Add-sw64-architecture.patch
%endif
BuildRequires: git sed BuildRequires: git sed
BuildArch: noarch BuildArch: noarch
@ -42,7 +45,7 @@ machine bootloaders and tools.
%autosetup -S git -n %{name}-4 %autosetup -S git -n %{name}-4
git config --local --add efi.vendor "%{_vendor}" git config --local --add efi.vendor "%{_vendor}"
git config --local --add efi.esp-root /boot/efi git config --local --add efi.esp-root /boot/efi
git config --local --add efi.arches "x86_64 aarch64 loongarch64" git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64"
%build %build
%make_build EFI_VENDOR=%{_efi_vendor_} clean all %make_build EFI_VENDOR=%{_efi_vendor_} clean all
@ -62,6 +65,9 @@ git config --local --add efi.arches "x86_64 aarch64 loongarch64"
%{_prefix}/lib/rpm/brp-boot-efi-times %{_prefix}/lib/rpm/brp-boot-efi-times
%changelog %changelog
* Tue Nov 29 2022 wuzx<wuzx1226@qq.com> - 4-9
- Add sw64 architecture
* Thu Nov 24 2022 yanglu <yanglu72@h-partners.com> - 4-8 * Thu Nov 24 2022 yanglu <yanglu72@h-partners.com> - 4-8
- DESC:add loongarch64 support for efi_arch - DESC:add loongarch64 support for efi_arch