From 72b5799e19277e042d8993a086e192e5102b135d Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 29 Oct 2024 08:22:28 -0700 Subject: [PATCH 1/3] Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 --- efi-rpm-macros.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec index 022df8b..748fe5c 100644 --- a/efi-rpm-macros.spec +++ b/efi-rpm-macros.spec @@ -1,7 +1,7 @@ Summary: Common RPM Macros for building EFI-related packages Name: efi-rpm-macros Version: 6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-3.0-or-later URL: https://github.com/rhboot/%{name}/ BuildRequires: git sed @@ -66,6 +66,10 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}" %dir /boot/efi/EFI/%{_efi_vendor_} %changelog +* Tue Oct 29 2024 Troy Dawson - 6-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Fri Sep 20 2024 Nicolas Frayer - 6-4 - source: Updated the archive to match upstream - Resolves: #RHEL-54694 From 79cca509377c93cba2e82e38dcb978d9e8f32b49 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Thu, 5 Dec 2024 11:15:28 +0100 Subject: [PATCH 2/3] Remove 32 bit alt arch from test --- tests/macros.efi-srpm_test.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 tests/macros.efi-srpm_test.sh diff --git a/tests/macros.efi-srpm_test.sh b/tests/macros.efi-srpm_test.sh old mode 100644 new mode 100755 index 7875cea..442e3ff --- a/tests/macros.efi-srpm_test.sh +++ b/tests/macros.efi-srpm_test.sh @@ -3,6 +3,8 @@ # exit when any command fails set -e +os_name=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g') + declare -A archs archs[ia64]="efi_alt_arch=none efi_alt_arch_upper=NONE @@ -10,11 +12,11 @@ archs[ia64]="efi_alt_arch=none efi_arch_upper=IA64 efi_has_alt_arch=00 efi_has_arch=01" -archs[x86_64]="efi_alt_arch=ia32 - efi_alt_arch_upper=IA32 +archs[x86_64]="efi_alt_arch=none + efi_alt_arch_upper=NONE efi_arch=x64 efi_arch_upper=X64 - efi_has_alt_arch=01 + efi_has_alt_arch=00 efi_has_arch=01" archs["%{ix86}"]="efi_alt_arch=none efi_alt_arch_upper=NONE @@ -36,10 +38,10 @@ archs["%{arm}"]="efi_alt_arch=none efi_has_arch=01" common="efi_esp_boot=/boot/efi/EFI/BOOT - efi_esp_dir=/boot/efi/EFI/redhat + efi_esp_dir=/boot/efi/EFI/$os_name efi_esp_efi=/boot/efi/EFI efi_esp_root=/boot/efi - efi_vendor=redhat" + efi_vendor=$os_name" output=$(mktemp) From 4c666a84a8b783a0abf88ed24ca61875adc651bb Mon Sep 17 00:00:00 2001 From: Nicolas Frayer Date: Thu, 12 Dec 2024 10:25:03 +0100 Subject: [PATCH 3/3] Bump release for previous commit Related: #RHELMISC-8249 Signed-off-by: Nicolas Frayer --- efi-rpm-macros.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec index 748fe5c..309f83d 100644 --- a/efi-rpm-macros.spec +++ b/efi-rpm-macros.spec @@ -1,7 +1,7 @@ Summary: Common RPM Macros for building EFI-related packages Name: efi-rpm-macros Version: 6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-3.0-or-later URL: https://github.com/rhboot/%{name}/ BuildRequires: git sed @@ -66,6 +66,10 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}" %dir /boot/efi/EFI/%{_efi_vendor_} %changelog +* Thu Dec 12 2024 Nicolas Frayer - 6-6 +- Bump release for previous commit +- Related: #RHELMISC-8249 + * Tue Oct 29 2024 Troy Dawson - 6-5 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018