rpms/lorax
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add downstream patch to fix grub2 fonts location.

Browse Source
This commit is contained in:
Kevin Fenzi 2021-07-08 12:04:34 -07:00
parent 7fbe63bcb4
commit 434e3d7e24
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lorax-35.5-grub2-fonts.patch Normal file
View File

@ -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")}

8
lorax.spec
View File

@ -4,7 +4,7 @@
Name: lorax Name: lorax
Version: 35.5 Version: 35.5
Release: 1%{?dist} Release: 2%{?dist}
Summary: Tool for creating the anaconda install images Summary: Tool for creating the anaconda install images
License: GPLv2+ License: GPLv2+
@ -14,6 +14,7 @@ URL: https://github.com/weldr/lorax
# git checkout -b archive-branch lorax-%%{version}-%%{release} # git checkout -b archive-branch lorax-%%{version}-%%{release}
# tito build --tgz # tito build --tgz
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch1: lorax-35.5-grub2-fonts.patch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: make BuildRequires: make
@ -136,6 +137,8 @@ Lorax templates for creating the boot.iso and live isos are placed in
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1
%build %build
%install %install
@ -175,6 +178,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_datadir}/lorax/templates.d/* %{_datadir}/lorax/templates.d/*
%changelog %changelog
* Thu Jul 08 2021 Kevin Fenzi <kevin@scrye.com> - 35.5-2
- Add downstream patch to fix grub2 fonts location.
* Fri Jun 11 2021 Brian C. Lane <bcl@redhat.com> 35.5-1 * Fri Jun 11 2021 Brian C. Lane <bcl@redhat.com> 35.5-1
- pylorax: Fix mksparse ftruncate size handling (bcl@redhat.com) - pylorax: Fix mksparse ftruncate size handling (bcl@redhat.com)