PR#23: Go back to installing unicode.pf2 - rpms/grub2

rpms / grub2

#23 Go back to installing unicode.pf2

Merged 2 years ago by humaton. Opened 2 years ago by adamwill.

put-font-back into rawhide

Adam Williamson • 2 years ago

1af3942

grub.macros

file modified

		`@@ -585,6 +585,8 @@`
		`%ifarch %{arm} \`
		`install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \`
		`%endif \`
		`+ install -D -m 700 unicode.pf2 \\\`
		`+ ${RPM_BUILD_ROOT}/boot/grub2/fonts/unicode.pf2 \`
		`${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv \\\`
		`${RPM_BUILD_ROOT}/boot/grub2/grubenv create \`
		`%{expand:%%do_install_protected_file grub2-%{package_arch}} \`
		`@@ -692,6 +694,7 @@`
		`%ifarch %{arm} \`
		`%attr(0700,root,root) %verify(not mtime) %{efi_esp_boot}/BOOTARM.EFI \`
		`%endif \`
		`+ %attr(0700,root,root)/boot/grub2/fonts \`
		`%dir %attr(0700,root,root)/boot/loader/entries \`
		`%ghost %config(noreplace) %attr(0700,root,root)/boot/grub2/grub.cfg \`
		`%ghost %config(noreplace) %verify(not mtime) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \`
		`@@ -713,4 +716,5 @@`
		`%{expand:%%files %{1}-cdboot} \`
		`%defattr(-,root,root,-) \`
		`%attr(0700,root,root) %verify(not mtime) %{efi_esp_dir}/%{3} \`
		`+ %attr(0700,root,root)/boot/grub2/fonts \`
		`%{nil}`

adamwill commented 2 years ago

lorax has its own code for building EFI images, and it needs the
font file to do that successfully, so let's make sure it's there
for lorax to find. This doesn't revert the embedding change,
it just reverts the part where we don't bother to install the
font to /boot/grub2/fonts any more.

Signed-off-by: Adam Williamson awilliam@redhat.com

adamwill commented 2 years ago

See https://github.com/weldr/lorax/blob/master/share/templates.d/99-generic/efi.tmpl#L20 and https://github.com/weldr/lorax/blob/master/share/templates.d/99-generic/live/efi.tmpl#L20 . It's possible we might want to do something different here long-term, but the issue seems complex (why do we apparently have these entirely separate paths for doing the same thing, in grub2's macros and lorax?) and this seems like the most obviously safe and simple short-term fix.

This is an urgent problem as it breaks the distribution compose, lorax errors out on the missing file so any image built using these lorax templates (which includes several critical ones) fails to build.

Edited 2 years ago by adamwill

adamwill commented 2 years ago

@bcl for reference , the breaking change here was https://src.fedoraproject.org/rpms/grub2/c/0ccadff7a2be9fcc858e0a1cb7825beb5d81f8c6?branch=rawhide .

Edited 2 years ago by adamwill

zuul commented 2 years ago

Build succeeded.

check-for-arches : SUCCESS in 55s
rpm-scratch-build : SUCCESS in 12m 58s
rpm-scratch-build-s390x : SKIPPED (non-voting)
rpm-scratch-build-ppc64le : SKIPPED (non-voting)
rpm-scratch-build-i686 : SKIPPED (non-voting)
rpm-scratch-build-aarch64 : SKIPPED (non-voting)
rpm-linter : FAILURE in 4m 24s (non-voting)
rpm-rpminspect : SUCCESS in 9m 28s (non-voting)
check-for-sti-tests : SUCCESS in 20s
check-for-fmf-tests : SUCCESS in 22s
rpm-install-test : SUCCESS in 1m 46s
rpm-tmt-test : SKIPPED
rpm-sti-test : SKIPPED

siosm commented 2 years ago

LGTM. We should probably change the lorax template to stop installing this file.

adamwill commented 2 years ago

I'm not sure just simplistically doing that is safe, though? Wouldn't lorax also need to embed the font into the image it's creating, like grub2 was changed to do? And in order to do that, it presumably needs a copy to embed, from somewhere...

Edited 2 years ago by adamwill

adamwill commented 2 years ago

I did a scratch build and ran openQA tests on it, they look fine. Installer build and live image build both worked, and the built images install and boot fine.