rpms/efi-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c10s' into a10s

Browse Source
This commit is contained in:
eabdullin 2024-12-17 15:21:04 +03:00
commit ccbb79d90c
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
efi-rpm-macros.spec
View File

@ -1,7 +1,7 @@
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: 6 Version: 6
Release: 4%{?dist}.alma.1 Release: 6%{?dist}.alma.1
License: GPL-3.0-or-later License: GPL-3.0-or-later
URL: https://github.com/rhboot/%{name}/ URL: https://github.com/rhboot/%{name}/
BuildRequires: git sed BuildRequires: git sed
@ -68,9 +68,17 @@ 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 Sep 26 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 6-4.alma.1 * Tue Dec 17 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 6-6.alma.1
- Add support for versioned x86_64 arches - Add support for versioned x86_64 arches
* Thu Dec 12 2024 Nicolas Frayer <nfrayer@redhat.com> - 6-6
- Bump release for previous commit
- Related: #RHELMISC-8249
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6-5
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Sep 20 2024 Nicolas Frayer <nfrayer@redhat.com> - 6-4 * Fri Sep 20 2024 Nicolas Frayer <nfrayer@redhat.com> - 6-4
- source: Updated the archive to match upstream - source: Updated the archive to match upstream
- Resolves: #RHEL-54694 - Resolves: #RHEL-54694

12
tests/macros.efi-srpm_test.sh Normal file → Executable file
View File

@ -3,6 +3,8 @@
# exit when any command fails # exit when any command fails
set -e set -e
os_name=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
declare -A archs declare -A archs
archs[ia64]="efi_alt_arch=none archs[ia64]="efi_alt_arch=none
efi_alt_arch_upper=NONE efi_alt_arch_upper=NONE
@ -10,11 +12,11 @@ archs[ia64]="efi_alt_arch=none
efi_arch_upper=IA64 efi_arch_upper=IA64
efi_has_alt_arch=00 efi_has_alt_arch=00
efi_has_arch=01" efi_has_arch=01"
archs[x86_64]="efi_alt_arch=ia32 archs[x86_64]="efi_alt_arch=none
efi_alt_arch_upper=IA32 efi_alt_arch_upper=NONE
efi_arch=x64 efi_arch=x64
efi_arch_upper=X64 efi_arch_upper=X64
efi_has_alt_arch=01 efi_has_alt_arch=00
efi_has_arch=01" efi_has_arch=01"
archs["%{ix86}"]="efi_alt_arch=none archs["%{ix86}"]="efi_alt_arch=none
efi_alt_arch_upper=NONE efi_alt_arch_upper=NONE
@ -36,10 +38,10 @@ archs["%{arm}"]="efi_alt_arch=none
efi_has_arch=01" efi_has_arch=01"
common="efi_esp_boot=/boot/efi/EFI/BOOT 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_efi=/boot/efi/EFI
efi_esp_root=/boot/efi efi_esp_root=/boot/efi
efi_vendor=redhat" efi_vendor=$os_name"
output=$(mktemp) output=$(mktemp)