From 75c7847afc2cafae9662e938f3584b8517d4fafd Mon Sep 17 00:00:00 2001 From: yangzhenyu Date: Wed, 4 Dec 2024 18:39:17 +0800 Subject: [PATCH] * remove the architecture judgment in the patches section --- efi-rpm-macros.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec index 48f1b83..c7296d8 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 @@ -43,7 +39,18 @@ information of EIF machines, it contains the basic directory layout for EFI machine bootloaders and tools. %prep -%autosetup -S git -n %{name}-4 +%setup -S git -n %{name}-4 + +%ifarch loongarch64 +%patch 0 -p1 +%endif + +%ifarch sw_64 +%patch 1 -p1 +%endif + +%autopatch -m2 -p1 + 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 riscv64" @@ -66,6 +73,10 @@ git config --local --add efi.arches "x86_64 aarch64 loongarch64 sw_64 riscv64" %{_prefix}/lib/rpm/brp-boot-efi-times %changelog +* Wed Dec 04 2024 yangzhenyu - 4-11 +- remove the architecture judgment in the patches section; +- include all patches in the source package. + * Wed May 29 2024 Ouuleilei - 4-10 - Add riscv64 architecture -- Gitee