rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

grub.macros: Install font in /boot/grub2 instead of the ESP

Browse Source 
GRUB is now using /boot/grub2 as the directory where all the resources are
loaded, but the unicode.pf2 is still installed in the EFI System Partition.

Resolves: rhbz#1739762

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2021-06-29 15:43:43 +02:00
parent fc19d7847d
commit 9cf30d96e9
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub.macros
View File

@ -517,7 +517,7 @@ install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \
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 \\\ install -D -m 700 unicode.pf2 \\\
$RPM_BUILD_ROOT%{efi_esp_dir}/fonts/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}} \
@ -615,7 +615,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 \
%dir %attr(0700,root,root)%{efi_esp_dir}/fonts \ %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 \
@ -637,5 +637,5 @@ ln -s ../boot/%{name}/grub.cfg \\\
%{expand:%%files %{1}-cdboot} \ %{expand:%%files %{1}-cdboot} \
%defattr(0700,root,root,-) \ %defattr(0700,root,root,-) \
%attr(0700,root,root)%{efi_esp_dir}/%{3} \ %attr(0700,root,root)%{efi_esp_dir}/%{3} \
%attr(0700,root,root)%{efi_esp_dir}/fonts \ %attr(0700,root,root)/boot/%{name}/fonts \
%{nil} %{nil}