.efi-rpm-macros.metadata

@@ -1 +1 @@
-572ed93a939449ed0f2f0cf7dd0ad4739eb2b9d2 SOURCES/efi-rpm-macros-6.tar.bz2
+d8c779df5999416a0376754b7a8712d990aea547 SOURCES/efi-rpm-macros-3.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/efi-rpm-macros-6.tar.bz2
+SOURCES/efi-rpm-macros-3.tar.bz2

SOURCES/0001-macros.efi-srpm-make-all-of-our-macros-always-expand.patch

@@ -0,0 +1,74 @@
+From 29e47cd8011b1569c4a73c8e395c7fb5192e6dc1 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 4 May 2018 15:02:14 -0400
+Subject: [PATCH] macros.efi-srpm: make all of our macros always expandable,
+ even if wrong
+
+In particular, arch and altarch give "none", and when they do efi_has_arch
+and efi_has_alt_arch are 0 (respectively).  if they're correct, they'll
+be 1.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ macros.efi-srpm.in | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
+index 5f8a784af8a..f3b4c68b2f9 100644
+--- a/macros.efi-srpm.in
++++ b/macros.efi-srpm.in
+@@ -38,7 +38,7 @@
+     elseif arch("%{arm}") then
+       return("arm")
+     else
+-      return("")
++      return("none")
+     end
+   end
+   -- alt arch
+@@ -46,24 +46,30 @@
+     if arch("x86_64") then
+       return("ia32")
+     else
+-      return(nil)
++      return("none")
+     end
+   end
+   -- make some macros
+   local done = rpm.expand("%{?_efi}")
+   if done == nil or done == "" then
++    local arch = getarch()
+     local alt = getaltarch()
+     print("%global _efi @@EFI_ARCHES@@\\n")
+     print("%global _efi_vendor @@EFI_VENDOR@@\\n")
++    if arch == "none" then
++      print("%global _efi_has_arch 0\\n")
++    else
++      print("%global _efi_has_arch 1\\n")
++    end
+     print("%global _efi_arch " .. getarch() .. "\\n")
+     print("%global _efi_arch_upper " .. string.upper(getarch()) .. "\\n")
+-    if alt == nil then
++    if alt == "none" then
+       print("%global _efi_has_alt_arch 0\\n")
+     else
+       print("%global _efi_has_alt_arch 1\\n")
+-      print("%global _efi_alt_arch " .. alt .. "\\n")
+-      print("%global _efi_alt_arch_upper " .. string.upper(alt) .. "\\n")
+     end
++    print("%global _efi_alt_arch " .. alt .. "\\n")
++    print("%global _efi_alt_arch_upper " .. string.upper(alt) .. "\\n")
+   end
+ }}
+ 
+@@ -79,6 +85,7 @@
+ 
+ %efi_arch %{expand:%{_efi_srpm_macros_setup}}%{_efi_arch}
+ %efi_arch_upper %{expand:%{_efi_srpm_macros_setup}}%{_efi_arch_upper}
++%efi_has_arch %{expand:%{_efi_srpm_macros_setup}}0%{_efi_has_arch}
+ %efi_has_alt_arch %{expand:%{_efi_srpm_macros_setup}}0%{_efi_has_alt_arch}
+ %efi_alt_arch %{expand:%{_efi_srpm_macros_setup}}%{?_efi_alt_arch}%{nil}
+ %efi_alt_arch_upper %{expand:%{_efi_srpm_macros_setup}}%{?_efi_alt_arch_upper}%{nil}
+-- 
+2.14.3
+

SPECS/efi-rpm-macros.spec

@@ -1,14 +1,15 @@
 Summary: Common RPM Macros for building EFI-related packages
 Name: efi-rpm-macros
-Version: 6
-Release: 2%{?dist}
+Version: 3
+Release: 3%{?dist}
+Group: Development/System
 License: GPLv3+
 URL: https://github.com/rhboot/%{name}/
 BuildRequires: git sed
-BuildRequires: make
 BuildArch: noarch
 
-Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-6.tar.bz2
+Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
+Patch0001: 0001-macros.efi-srpm-make-all-of-our-macros-always-expand.patch
 
 %global debug_package %{nil}
 %global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
@@ -18,6 +19,7 @@ Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-
 
 %package -n efi-srpm-macros
 Summary: Common SRPM Macros for building EFI-related packages
+Group: Development/System
 BuildArch: noarch
 Requires: rpm
 
@@ -26,6 +28,7 @@ efi-srpm-macros provides a set of SRPM macros for use in EFI-related packages.
 
 %package -n efi-filesystem
 Summary: The basic directory layout for EFI machines
+Group: System Environment/Base
 BuildArch: noarch
 Requires: filesystem
 
@@ -34,16 +37,13 @@ The efi-filesystem package contains the basic directory layout for EFI
 machine bootloaders and tools.
 
 %prep
-%autosetup -S git_am -n %{name}-6
-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}"
+%autosetup -S git
 
 %build
-%make_build clean all
+%make_build EFI_VENDOR=%{_efi_vendor_} clean all
 
 %install
-%make_install
+%make_install EFI_VENDOR=%{_efi_vendor_}
 
 #%%files
 #%%{!?_licensedir:%%global license %%%%doc}
@@ -56,7 +56,6 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 %license LICENSE
 %doc README
 %{_rpmmacrodir}/macros.efi-srpm
-%{_rpmconfigdir}/brp-boot-efi-times
 
 %files -n efi-filesystem
 %defattr(0700,root,root,-)
@@ -66,41 +65,9 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 %verify(not mode) %dir /boot/efi/EFI/%{_efi_vendor_}
 
 %changelog
-* Thu Apr 14 2022 Peter Jones <pjones@redhat.com> - 6-1
-- Disable ia32 as an alt for x86_64
-  Related: rhbz#1932057
-
-* Mon Nov 08 2021 Robbie Harwood <rharwood@redhat.com> - 4-9
+* Thu Nov 05 2020 Javier Martinez Canillas <javierm@redhat.com> - 3-3
 - Ignore the mode bits when doing RPM verification of files in /boot/efi
-- Resolves: rhbz#1936384
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4-8
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4-7
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* 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
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Sep 26 2018 Peter Jones <pjones@redhat.com> - 4-1
-- Provide %%{efi_build_requires} and brp-boot-efi-times
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+  Resolves: rhbz#1845052
 
 * Fri May 04 2018 Peter Jones <pjones@redhat.com> - 3-2
 - Always provide macros for efi_arch and efi_alt_arch (and their _upper
@@ -127,8 +94,6 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 
 * Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-2
 - Fix the non-efi and non-efi-alt-arch cases, hopefully.
-- Make efi-*-macros packages not be ExclusiveArch, because they need to work
-  in non-efi-arch packages.
 
 * Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-1
 - Lots of rpmlint fixups and the like.