From 8dcaef613becc49067e938b962eb312a89f319ca Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Tue, 10 Dec 2024 14:39:52 +0800 Subject: [PATCH] Optimize spec file, merge architecture code (cherry picked from commit d5c01e31bc9cb556230a38d1de55b549c2e9df03) --- 0001-add-riscv64-support-for-efi-arch.patch | 9 +++++---- efi-rpm-macros-Add-sw64-architecture.patch | 7 ++++--- efi-rpm-macros.spec | 9 ++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/0001-add-riscv64-support-for-efi-arch.patch b/0001-add-riscv64-support-for-efi-arch.patch index bbcb30d..9fb3fff 100644 --- a/0001-add-riscv64-support-for-efi-arch.patch +++ b/0001-add-riscv64-support-for-efi-arch.patch @@ -3,6 +3,7 @@ From: ouuleilei Date: Wed, 29 May 2024 22:29:59 +0800 Subject: [PATCH] add riscv64 support for efi arch +Signed-off-by: yueyuankun --- macros.efi-srpm.in | 2 ++ 1 file changed, 2 insertions(+) @@ -11,10 +12,10 @@ 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") +@@ -41,6 +41,8 @@ + return("loongarch64") + elseif arch("%{sw_64}") then + return("sw_64") + elseif arch("riscv64") then + return("riscv64") else diff --git a/efi-rpm-macros-Add-sw64-architecture.patch b/efi-rpm-macros-Add-sw64-architecture.patch index 3c54c1a..f6b4850 100644 --- a/efi-rpm-macros-Add-sw64-architecture.patch +++ b/efi-rpm-macros-Add-sw64-architecture.patch @@ -4,6 +4,7 @@ Date: Fri, 2 Dec 2022 08:58:46 +0800 Subject: [PATCH] Add sw64 architecture Signed-off-by: Wu Zixuan +Signed-off-by: yueyuankun --- macros.efi-srpm.in | 2 ++ 1 file changed, 2 insertions(+) @@ -12,10 +13,10 @@ 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 +@@ -39,6 +39,8 @@ return("arm") + elseif arch("loongarch64") then + return("loongarch64") + elseif arch("%{sw_64}") then + return("sw_64") else diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec index 48f1b83..e97ff9d 100644 --- a/efi-rpm-macros.spec +++ b/efi-rpm-macros.spec @@ -4,18 +4,14 @@ Name: efi-rpm-macros Version: 4 -Release: 10 +Release: 11 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 -%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 @@ -66,6 +62,9 @@ git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64 riscv64" %{_prefix}/lib/rpm/brp-boot-efi-times %changelog +* Tue Dec 10 2024 yueyuankun - 4-11 +- Optimize spec file, merge architecture code + * Wed May 29 2024 Ouuleilei - 4-10 - Add riscv64 architecture -- Gitee