From cfa24881ac9011a7874353a47eb1ddb0d3a91bf7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 8 Jul 2021 11:47:49 -0700 Subject: [PATCH] grub2 changed location of fonts in rawhide grub2 used to install efi fonts in boot/efi/EFI/*/fonts/ but now it's installing them in boot/grub2/fonts/ Adjust the lorax templates to install the new location. This should hopefully fix the rawhide compose error: DEBUG util.py:446: 2021-07-08 16:10:05,585: template command error in x86.tmpl: DEBUG util.py:446: template command error in x86.tmpl: DEBUG util.py:446: 2021-07-08 16:10:05,585: install boot/efi/EFI//fonts/unicode.pf2 EFI/BOOT/fonts/ DEBUG util.py:446: install boot/efi/EFI//fonts/unicode.pf2 EFI/BOOT/fonts/ DEBUG util.py:446: 2021-07-08 16:10:05,586: OSError: nothing matching /var/tmp/lorax/lorax.t80f74er/installroot/boot/efi/EFI//fonts/unicode.pf2 in / DEBUG util.py:446: OSError: nothing matching /var/tmp/lorax/lorax.t80f74er/installroot/boot/efi/EFI//fonts/unicode.pf2 in / Signed-off-by: Kevin Fenzi --- share/templates.d/99-generic/efi.tmpl | 3 +-- share/templates.d/99-generic/live/efi.tmpl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl index d73d2d73..307fbd67 100644 --- a/share/templates.d/99-generic/efi.tmpl +++ b/share/templates.d/99-generic/efi.tmpl @@ -6,7 +6,6 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" %> mkdir ${EFIBOOTDIR} -mkdir ${EFIBOOTDIR}/fonts/ %if efiarch64: install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ @@ -17,7 +16,7 @@ install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32} install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi %endif -install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/grub2/fonts/unicode.pf2 grub2/fonts/ ## actually make the EFI images ${make_efiboot("images/efiboot.img")} diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl index 572e07d2..d654fddd 100644 --- a/share/templates.d/99-generic/live/efi.tmpl +++ b/share/templates.d/99-generic/live/efi.tmpl @@ -6,7 +6,6 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" %> mkdir ${EFIBOOTDIR} -mkdir ${EFIBOOTDIR}/fonts/ %if efiarch64: install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ @@ -17,7 +16,7 @@ install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32} install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi %endif -install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/grub2/fonts/unicode.pf2 grub2/fonts/ ## actually make the EFI images ${make_efiboot("images/efiboot.img")}