Remove arm as an alt for aarch64 (would require cross compiler)

This commit is contained in:
Robbie Harwood 2021-09-02 18:49:22 +00:00
parent f5f6d7db0b
commit 8f7a9b09aa
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 31 Aug 2021 16:33:07 -0400
Subject: [PATCH] Don't have arm as an alt arch of aarch64
The compiler isn't actually set up in a way that lets us do this without
a cross compiler, so we shouldn't do this this way.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
macros.efi-srpm.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
index 4d7b019..00503f1 100644
--- a/macros.efi-srpm.in
+++ b/macros.efi-srpm.in
@@ -45,8 +45,6 @@
local function getaltarch()
if arch("x86_64") then
return("ia32")
- elseif arch("aarch64") then
- return("arm")
else
return("none")
end

View File

@ -1,7 +1,7 @@
Summary: Common RPM Macros for building EFI-related packages
Name: efi-rpm-macros
Version: 5
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3+
URL: https://github.com/rhboot/%{name}/
BuildRequires: git sed
@ -10,6 +10,8 @@ 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
%global debug_package %{nil}
%global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
@ -66,6 +68,9 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
%dir /boot/efi/EFI/%{_efi_vendor_}
%changelog
* Thu Sep 02 2021 Robbie Harwood <rharwood@redhat.com> - 5-4
- Remove arm as an alt for aarch64 (would require cross compiler)
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild