Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
daabc65c45 | ||
|
8f7a9b09aa | ||
|
f5f6d7db0b | ||
|
f7f3261c0e | ||
|
d7136f1d06 | ||
|
92e3d8cdea | ||
|
ffa85d64c2 | ||
|
53e42294ce | ||
|
c1411ee8ef |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,5 @@
|
|||||||
*~
|
*~
|
||||||
|
*.sw?
|
||||||
*.rpm
|
*.rpm
|
||||||
*.tar.*
|
*.tar.*
|
||||||
.*.sw?
|
.*.sw?
|
||||||
|
26
0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch
Normal file
26
0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch
Normal 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
|
@ -1,13 +1,16 @@
|
|||||||
Summary: Common RPM Macros for building EFI-related packages
|
Summary: Common RPM Macros for building EFI-related packages
|
||||||
Name: efi-rpm-macros
|
Name: efi-rpm-macros
|
||||||
Version: 4
|
Version: 5
|
||||||
Release: 3%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://github.com/rhboot/%{name}/
|
URL: https://github.com/rhboot/%{name}/
|
||||||
BuildRequires: git sed
|
BuildRequires: git sed
|
||||||
|
BuildRequires: make
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-4.tar.bz2
|
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 debug_package %{nil}
|
||||||
%global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
|
%global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
|
||||||
@ -33,7 +36,7 @@ The efi-filesystem package contains the basic directory layout for EFI
|
|||||||
machine bootloaders and tools.
|
machine bootloaders and tools.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -S git -n %{name}-4
|
%autosetup -S git_am -n %{name}-5
|
||||||
git config --local --add efi.vendor "%{_efi_vendor_}"
|
git config --local --add efi.vendor "%{_efi_vendor_}"
|
||||||
git config --local --add efi.esp-root /boot/efi
|
git config --local --add efi.esp-root /boot/efi
|
||||||
git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
|
git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
|
||||||
@ -65,6 +68,30 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
|
|||||||
%dir /boot/efi/EFI/%{_efi_vendor_}
|
%dir /boot/efi/EFI/%{_efi_vendor_}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Tue Apr 06 2021 Peter Jones <pjones@redhat.com> - 5-2
|
||||||
|
- There's always a typo.
|
||||||
|
|
||||||
|
* Tue Apr 06 2021 Peter Jones <pjones@redhat.com> - 5-1
|
||||||
|
- Add arm as an alt for aarch64
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (efi-rpm-macros-4.tar.bz2) = 0c580902ec053d3bac167086a70fefd5785ddfd93873a48bb7801ab287b2b7af9db325a1f6e3609ad996656cfff713f741f911d012e89b48250ae108fedb789c
|
SHA512 (efi-rpm-macros-5.tar.bz2) = 571d35b76e982bfc3cfbc5d09a871057ac47aa78814262e853ef121e36853886d41b140d79e591976091b8f3b015f85eafa2c881eb468b7d10c1618381013954
|
||||||
|
Loading…
Reference in New Issue
Block a user