rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 07:44:52 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Fix prefix setting with memdisk creation for network boot

Browse source 
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-12-21 22:35:22 +00:00
parent 55921d8655
commit 9e46a970c6
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
grub.macros
View file

@ -416,14 +416,16 @@ mkdir -p memdisk/fonts \
cp %{4}/unicode.pf2 memdisk/fonts \ cp %{4}/unicode.pf2 memdisk/fonts \
mksquashfs memdisk memdisk.squashfs -comp xz \ mksquashfs memdisk memdisk.squashfs -comp xz \
%{4}./grub-mkimage -O %{1} -o %{2}.orig \\\ %{4}./grub-mkimage -O %{1} -o %{2}.orig \\\
-p /EFI/%{efi_vendor} -d grub-core \\\ -d grub-core \\\
--sbat %{4}./sbat.csv \\\ --sbat %{4}./sbat.csv \\\
-m memdisk.squashfs \\\ -m memdisk.squashfs \\\
-p /EFI/%{efi_vendor} \\\
${GRUB_MODULES} \ ${GRUB_MODULES} \
%{4}./grub-mkimage -O %{1} -o %{3}.orig \\\ %{4}./grub-mkimage -O %{1} -o %{3}.orig \\\
-p /EFI/BOOT -d grub-core \\\ -d grub-core \\\
--sbat %{4}./sbat.csv \\\ --sbat %{4}./sbat.csv \\\
-m memdisk.squashfs \\\ -m memdisk.squashfs \\\
-p /EFI/BOOT \\\
${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}}} \
@ -460,8 +462,9 @@ if [ -x /usr/bin/rpm-sign ]; then \
fi \ fi \
# FIXME: using this prefix is fragile, must be done properly \ # FIXME: using this prefix is fragile, must be done properly \
./grub-mkimage -O %{1} -o %{2}.orig \\\ ./grub-mkimage -O %{1} -o %{2}.orig \\\
-p '/grub2' -d grub-core \\\ -d grub-core \\\
-m memdisk.squashfs \\\ -m memdisk.squashfs \\\
-p '/grub2' \\\
-x %{3} \\\ -x %{3} \\\
--appended-signature-size ${APPENDED_SIG_SIZE} \\\ --appended-signature-size ${APPENDED_SIG_SIZE} \\\
${GRUB_MODULES} \ ${GRUB_MODULES} \

5
grub2.spec
View file

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 71%{?dist} Release: 72%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -544,6 +544,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Wed Dec 21 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-72
- Fix prefix setting with memdisk creation for network boot
* Mon Dec 19 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-71 * Mon Dec 19 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-71
- Attempt to fix eln build - Attempt to fix eln build