Upgrade: efi-rpm-macros version to 5 (#10928)

Author: SumitJenaHCL

SPECS-EXTENDED/efi-rpm-macros/0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch

@@ -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

SPECS-EXTENDED/efi-rpm-macros/0002-Makefile-fix-permission-on-boot-efi-EFI.patch

@@ -0,0 +1,29 @@
+From 110b9c24200ff90c5d09cc2bf41df728810a0e0e Mon Sep 17 00:00:00 2001
+From: Sandro Bonazzola <sbonazzo@redhat.com>
+Date: Wed, 3 May 2023 11:20:36 +0200
+Subject: [PATCH] Makefile: fix permission on /boot/efi/EFI
+
+Ensure /boot/efi/EFI is created with 0700 mode.
+
+Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=2144459
+
+Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 7d56eae..37e97a5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,6 +65,7 @@ install : $(TARGETS)
+ 		install -d -m 0755 $(DESTDIR)/boot ; \
+ 	fi
+ 	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)
++	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)/EFI
+ 	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)/EFI/BOOT
+ 	install -d -m 0700 $(DESTDIR)/$(EFI_ESP_ROOT)/EFI/$(EFI_VENDOR)
+ 
+-- 
+2.40.1
+

SPECS-EXTENDED/efi-rpm-macros/efi-rpm-macros.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "efi-rpm-macros-4.tar.gz": "896865fd477441f74c0cbbc971f4622a91c1605041fd5a9127b02cc329b778ac"
+  "efi-rpm-macros-5.tar.bz2": "d313f5f9ff33990692e22c88df63e21f5a26146a96454cb47a7b267465702a8f"
  }
-}
+}

SPECS-EXTENDED/efi-rpm-macros/efi-rpm-macros.spec

@@ -3,54 +3,59 @@
 
 Summary:        Common RPM Macros for building EFI-related packages
 Name:           efi-rpm-macros
-Version:        4
-Release:        6%{?dist}
-License:        GPLv3
+Version:        5
+Release:        1%{?dist}
+License:        GPL-3.0-or-later
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://github.com/rhboot/%{name}/
-Source0:        https://github.com/rhboot/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+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: 0002-Makefile-fix-permission-on-boot-efi-EFI.patch
 
 BuildArch:      noarch
 
 BuildRequires:  %{_sysconfdir}/os-release
 BuildRequires:  bash
 BuildRequires:  git
 BuildRequires:  sed
+BuildRequires: make
 
 %description
 %{name} provides a set of RPM macros for use in EFI-related packages.
 
 %package -n efi-srpm-macros
 Summary:        Common SRPM Macros for building EFI-related packages
-
-Requires:       rpm
+BuildArch: noarch
+Requires: rpm
 
 %description -n efi-srpm-macros
 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
-
-Requires:       filesystem
+BuildArch: noarch
+Requires: filesystem
 
 %description -n efi-filesystem
 The efi-filesystem package contains the basic directory layout for EFI
 machine bootloaders and tools.
 
 %prep
-%autosetup -S git
+%autosetup -S git_am -n %{name}-5
 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}"
 
 %build
-%make_build SHELL=/bin/bash clean all
+%make_build clean all
 
 %install
-%make_install SHELL=/bin/bash
+%make_install
 
 %files -n efi-srpm-macros
+%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README
 %{_rpmmacrodir}/macros.efi-srpm
@@ -64,6 +69,9 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 %dir /boot/efi/EFI/%{_efi_vendor_}
 
 %changelog
+* Mon Nov 04 2024 Sumit Jena <v-sumtjena@microsoft.com> - 5-1
+- Update to version 5.
+
 * Wed May 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 4-6
 - Fixing package build by adding an explicit BR on '/etc/os-release'.
 - License verified.

cgmanifest.json

@@ -3188,8 +3188,8 @@
         "type": "other",
         "other": {
           "name": "efi-rpm-macros",
-          "version": "4",
-          "downloadUrl": "https://github.com/rhboot/efi-rpm-macros/archive/refs/tags/4.tar.gz"
+          "version": "5",
+          "downloadUrl": "https://github.com/rhboot/efi-rpm-macros/releases/download/5/efi-rpm-macros-5.tar.bz2"
         }
       }
     },