Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
8588f4394b
!37 [sync] PR-34: add riscv64 support
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2024-06-19 02:59:25 +00:00
ouuleilei
b58c96fd50 add riscv64 support
(cherry picked from commit c2de704929497b7964a1a9f6ee09f7a653d3d928)
2024-05-30 15:31:56 +08:00
openeuler-ci-bot
b4fc0a58b5
!30 添加sw架构
From: @wuzx065891 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-12-02 03:25:39 +00:00
Wu Zixuan
0d009c68d2 Add sw64 architecture
Signed-off-by: Wu Zixuan <wuzx1226@qq.com>
2022-12-02 09:19:52 +08:00
openeuler-ci-bot
127341ef79
!26 add loongarch64 support for efi_arch
From: @yangl777 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-28 01:37:20 +00:00
yangl777
53c8bb9aa8 add loongarch64 support for efi_arch 2022-11-24 10:37:14 +00:00
openeuler-ci-bot
4d71415542
!21 add loongarch support for efi-rpm-macros
From: @zhangwenlong01 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-21 02:40:06 +00:00
Wenlong Zhang
bd9860f8b0 add loongarch support for efi-rpm-macros 2022-11-19 07:30:37 +00:00
openeuler-ci-bot
c5f1819241
!17 delete macros in changelog
From: @yangl777 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-06-22 08:56:43 +00:00
yangl777
e35b9e6790 delete macros in changelog 2022-06-16 16:39:45 +08:00
4 changed files with 103 additions and 5 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

@ -0,0 +1,25 @@
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
---
macros.efi-srpm.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
index 00503f1..fbeb2c0 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("loongarch64") then
+ return("loongarch64")
else
return("none")
end
--
2.33.0

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,13 +4,20 @@
Name: efi-rpm-macros
Version: 4
Release: 5
Release: 10
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
#patch backport from upstream community
%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
BuildRequires: git sed
BuildArch: noarch
@ -39,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"
git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64 riscv64"
%build
%make_build EFI_VENDOR=%{_efi_vendor_} clean all
@ -59,11 +66,26 @@ git config --local --add efi.arches "x86_64 aarch64"
%{_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
* Thu Nov 24 2022 yanglu <yanglu72@h-partners.com> - 4-8
- DESC:add loongarch64 support for efi_arch
* Sat Nov 19 2022 Wenlong Zhang <zhangwenlong@loongson.cn> - 4-7
- add loongarch support for efi-rpm-macros
* Thu Jun 16 2022 yanglu <yanglu72@h-partners.com> - 4-6
- DESC:delete macros in changelog
* Tue Aug 17 2021 gaihuiying <gaihuiying1@huawei.com> - 4-5
- DESC:revert "delete -S git from %autosetup, and delete BuildRequires git"
- DESC:revert "delete -S git from autosetup, and delete BuildRequires git"
* Tue Aug 03 2021 chenyanpanHW <chenyanpan@huawei.com> - 4-4
- DESC: delete -S git from %autosetup, and delete BuildRequires git
- DESC: delete -S git from autosetup, and delete BuildRequires git
* Thu Sep 10 2020 hanzhijun <hanzhijun1@huawei.com> - 4-3
- solve source url problem