From 2ba5cca8387fab0fa18464da47559f1e6b6e5a29 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 23 Nov 2022 16:37:56 +0200 Subject: [PATCH] Fix the patch Signed-off-by: David Abdurachmanov --- ...macros-4-riscv64.patch => efi-rpm-macros-5-riscv64.patch | 6 +++--- efi-rpm-macros.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename efi-rpm-macros-4-riscv64.patch => efi-rpm-macros-5-riscv64.patch (89%) diff --git a/efi-rpm-macros-4-riscv64.patch b/efi-rpm-macros-5-riscv64.patch similarity index 89% rename from efi-rpm-macros-4-riscv64.patch rename to efi-rpm-macros-5-riscv64.patch index 48881b0..84a160b 100644 --- a/efi-rpm-macros-4-riscv64.patch +++ b/efi-rpm-macros-5-riscv64.patch @@ -12,11 +12,11 @@ index 7d56eae..221c46d 100644 EFI_VENDOR ?= $(call get-config,vendor) diff --git a/efi-rpm-macros.spec.in b/efi-rpm-macros.spec.in -index a9aaf6d..d36a8d5 100644 +index e03262e..64a7109 100644 --- a/efi-rpm-macros.spec.in +++ b/efi-rpm-macros.spec.in -@@ -39,7 +39,7 @@ machine bootloaders and tools. - %autosetup -S git -n %{name}-@@EFI_SOURCE_VERSION@@ +@@ -36,7 +36,7 @@ machine bootloaders and tools. + %autosetup -S git_am -n %{name}-@@EFI_SOURCE_VERSION@@ git config --local --add efi.vendor "%{_efi_vendor_}" git config --local --add efi.esp-root /boot/efi -git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}" diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec index 9ac41d1..89c5e22 100644 --- a/efi-rpm-macros.spec +++ b/efi-rpm-macros.spec @@ -11,7 +11,7 @@ BuildArch: noarch Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-5.tar.bz2 Patch0001: 0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch -Patch0002: efi-rpm-macros-4-riscv64.patch +Patch0002: efi-rpm-macros-5-riscv64.patch %global debug_package %{nil} %global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))