rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

spec/macros: Modified spec and macros files for RHEL10 signing

Browse Source 
Related: #RHEL-51867
Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
This commit is contained in:
Peter Jones 2024-08-05 15:19:09 -04:00 committed by Nicolas Frayer
parent 824f4e8aa6
commit 91198fdd6c
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
grub.macros
View File

@ -434,11 +434,8 @@ mksquashfs memdisk memdisk.squashfs -comp lzo \
${GRUB_MODULES} \ ${GRUB_MODULES} \
%{expand:%%define ___pesign_client_cert %{?___pesign_client_cert}%{!?___pesign_client_cert:%{__pesign_client_cert}}} \ %{expand:%%define ___pesign_client_cert %{?___pesign_client_cert}%{!?___pesign_client_cert:%{__pesign_client_cert}}} \
%{?__pesign_client_cert:%{expand:%%define __pesign_client_cert %{___pesign_client_cert}}} \ %{?__pesign_client_cert:%{expand:%%define __pesign_client_cert %{___pesign_client_cert}}} \
%{expand:%%{pesign -s -i %%{2}.orig -o %%{2}.onesig -a %%{5} -c %%{6} -n %%{7}}} \ %{expand:%%{pesign -s -i %%{2}.orig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}} \
%{expand:%%{pesign -s -i %%{3}.orig -o %%{3}.onesig -a %%{5} -c %%{6} -n %%{7}}} \ %{expand:%%{pesign -s -i %%{3}.orig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}} \
%{expand:%%define __pesign_client_cert grub2-signer} \
%{expand:%%{pesign -s -i %%{2}.onesig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}} \
%{expand:%%{pesign -s -i %%{3}.onesig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}} \
%{nil} %{nil}
%endif %endif
@ -489,7 +486,7 @@ fi \
GRUB_MODULES+=%{grub_modules} \ GRUB_MODULES+=%{grub_modules} \
GRUB_MODULES+=%{efi_modules} \ GRUB_MODULES+=%{efi_modules} \
GRUB_MODULES+=%{platform_modules} \ GRUB_MODULES+=%{platform_modules} \
%{expand:%%{efi_mkimage %{1} %{2} %{3} %{4}}} \ %{expand:%efi_mkimage %%{1} %%{2} %%{3} %%{4} %%{5} %%{6} %%{7}} \
%{nil} %{nil}
%define do_ieee1275_build_images() \ %define do_ieee1275_build_images() \
@ -504,7 +501,7 @@ cd .. \
cd grub-%{1}-%{tarversion} \ cd grub-%{1}-%{tarversion} \
%{expand:%%do_efi_configure %%{4} %%{5} %%{6}} \ %{expand:%%do_efi_configure %%{4} %%{5} %%{6}} \
%do_efi_build_all \ %do_efi_build_all \
%{expand:%%do_efi_build_images %{grub_target_name} %{2} %{3} ./ } \ %{expand:%%do_efi_build_images %{grub_target_name} %%{2} %%{3} ./ %%{7} %%{8} %%{9}} \
cd .. \ cd .. \
%{nil} %{nil}
@ -513,7 +510,7 @@ cd grub-%{1}-%{tarversion} \
%{expand:%%do_efi_configure %%{4} %%{5} %%{6}} \ %{expand:%%do_efi_configure %%{4} %%{5} %%{6}} \
%do_efi_build_modules \ %do_efi_build_modules \
%{expand:%%do_efi_link_utils %{grubefiarch}} \ %{expand:%%do_efi_link_utils %{grubefiarch}} \
%{expand:%%do_efi_build_images %{alt_grub_target_name} %{2} %{3} ../grub-%{grubefiarch}-%{tarversion}/ } \ %{expand:%%do_efi_build_images %{alt_grub_target_name} %%{2} %%{3} ../grub-%{grubefiarch}-%{tarversion}/ %%{7} %%{8} %%{9}} \
cd .. \ cd .. \
%{nil} %{nil}

8
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 124%{?dist} Release: 125%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0-or-later License: GPL-3.0-or-later
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -233,7 +233,7 @@ git commit -m "After making subdirs"
%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{sb_ca} %{sb_cer} %{sb_key}} %{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{sb_ca} %{sb_cer} %{sb_key}}
%endif %endif
%if 0%{with_alt_efi_arch} %if 0%{with_alt_efi_arch}
%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags}} %{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{sb_ca} %{sb_cer} %{sb_key}}
%endif %endif
%if 0%{with_legacy_arch} %if 0%{with_legacy_arch}
%{expand:%do_legacy_build %%{grublegacyarch}} %{expand:%do_legacy_build %%{grublegacyarch}}
@ -573,6 +573,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Mon Aug 5 2024 Peter Jones <pjones@redhat.com> - 2.06-125
- spec/macros: Modified spec and macros files for RHEL10 signing
- Related: #RHEL-51867
* Thu Aug 1 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-124 * Thu Aug 1 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-124
- grub2-mkconfig: Remove mountpoint check - grub2-mkconfig: Remove mountpoint check
- Related: #RHEL-32099 - Related: #RHEL-32099