From 434e3d7e24c25aee7e3fc623be17acdff1e02ece Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 8 Jul 2021 12:04:34 -0700 Subject: [PATCH] Add downstream patch to fix grub2 fonts location. --- lorax-35.5-grub2-fonts.patch | 40 ++++++++++++++++++++++++++++++++++++ lorax.spec | 8 +++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 lorax-35.5-grub2-fonts.patch diff --git a/lorax-35.5-grub2-fonts.patch b/lorax-35.5-grub2-fonts.patch new file mode 100644 index 0000000..861a05e --- /dev/null +++ b/lorax-35.5-grub2-fonts.patch @@ -0,0 +1,40 @@ +diff --color -Nur lorax-35.5.orig/share/templates.d/99-generic/efi.tmpl lorax-35.5/share/templates.d/99-generic/efi.tmpl +--- lorax-35.5.orig/share/templates.d/99-generic/efi.tmpl 2021-06-11 10:19:38.000000000 -0700 ++++ lorax-35.5/share/templates.d/99-generic/efi.tmpl 2021-07-08 11:43:37.539689458 -0700 +@@ -6,7 +6,6 @@ + %> + + 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/*/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/unicode.pf2 + + ## actually make the EFI images + ${make_efiboot("images/efiboot.img")} +diff --color -Nur lorax-35.5.orig/share/templates.d/99-generic/live/efi.tmpl lorax-35.5/share/templates.d/99-generic/live/efi.tmpl +--- lorax-35.5.orig/share/templates.d/99-generic/live/efi.tmpl 2021-06-11 10:19:38.000000000 -0700 ++++ lorax-35.5/share/templates.d/99-generic/live/efi.tmpl 2021-07-08 11:43:07.788631007 -0700 +@@ -6,7 +6,6 @@ + %> + + 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/*/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/lorax.spec b/lorax.spec index 92d31d1..2ec8c4d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,7 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +Patch1: lorax-35.5-grub2-fonts.patch BuildRequires: python3-devel BuildRequires: make @@ -136,6 +137,8 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch1 -p1 + %build %install @@ -175,6 +178,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 08 2021 Kevin Fenzi - 35.5-2 +- Add downstream patch to fix grub2 fonts location. + * Fri Jun 11 2021 Brian C. Lane 35.5-1 - pylorax: Fix mksparse ftruncate size handling (bcl@redhat.com)