rpms/grub2
3
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-10-18 17:56:30 +00:00
Code Issues 21 Projects 4 Releases Packages Wiki Activity Actions

Put the font in /boot again because lorax is PTO

Browse source 
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-11-23 21:42:33 +00:00
parent faaff39599
commit 84e22f6104
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub.macros
View file

@ -522,6 +522,8 @@ install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \
%ifarch %{arm} \ %ifarch %{arm} \
install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \ install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \
%endif \ %endif \
install -D -m 700 unicode.pf2 \\\
${RPM_BUILD_ROOT}/boot/%{name}/fonts/unicode.pf2 \
${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv \\\ ${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv \\\
${RPM_BUILD_ROOT}/boot/%{name}/grubenv create \ ${RPM_BUILD_ROOT}/boot/%{name}/grubenv create \
%{expand:%%do_install_protected_file %{name}-%{package_arch}} \ %{expand:%%do_install_protected_file %{name}-%{package_arch}} \
@ -619,6 +621,7 @@ ln -s ../boot/%{name}/grub.cfg \\\
%ifarch %{arm} \ %ifarch %{arm} \
%attr(0700,root,root)%{efi_esp_boot}/BOOTARM.EFI \ %attr(0700,root,root)%{efi_esp_boot}/BOOTARM.EFI \
%endif \ %endif \
%attr(0700,root,root)/boot/%{name}/fonts \
%dir %attr(0700,root,root)/boot/loader/entries \ %dir %attr(0700,root,root)/boot/loader/entries \
%ghost %config(noreplace) /boot/%{name}/grub.cfg \ %ghost %config(noreplace) /boot/%{name}/grub.cfg \
%ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \ %ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \
@ -640,4 +643,5 @@ ln -s ../boot/%{name}/grub.cfg \\\
%{expand:%%files %{1}-cdboot} \ %{expand:%%files %{1}-cdboot} \
%defattr(-,root,root,-) \ %defattr(-,root,root,-) \
%attr(0700,root,root)%{efi_esp_dir}/%{3} \ %attr(0700,root,root)%{efi_esp_dir}/%{3} \
%attr(0700,root,root)/boot/%{name}/fonts \
%{nil} %{nil}

5
grub2.spec
View file

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 13%{?dist} Release: 14%{?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/
@ -524,6 +524,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Wed Nov 23 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-14
- Put the font in /boot again because lorax is PTO
* Tue Nov 22 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-13 * Tue Nov 22 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-13
- Bundle unicode.pf2 with images - Bundle unicode.pf2 with images
- Resolves: #2143725 - Resolves: #2143725