rpms
/
lorax
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GRUB install. 

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-09-01 07:15:02 +03:00
parent e794c2781f
commit b5cf4528b4
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lorax.spec
View File

@ -4,7 +4,7 @@
Name: lorax
Version: 38.12
Release: 1.2.riscv64%{?dist}
Release: 1.3.riscv64%{?dist}
Summary: Tool for creating the anaconda install images
License: GPL-2.0-or-later
@ -170,6 +170,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_datadir}/lorax/templates.d/*
%changelog
* Fri Sep 01 2023 David Abdurachmanov <davidlt@rivosinc.com> 38.12-3.0.riscv64
- Fix GRUB install.
* Thu Aug 31 2023 David Abdurachmanov <davidlt@rivosinc.com> 38.12-2.0.riscv64
- Update riscv64 templates (we have no shim yet)

8
lorax_riscv.patch
View File

@ -62,7 +62,7 @@ index 0000000..1ce5d33
+ }
+}
diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl
index 80600d2..f2fe385 100644
index 80600d2..85f080c 100644
--- a/share/templates.d/99-generic/efi.tmpl
+++ b/share/templates.d/99-generic/efi.tmpl
@@ -8,7 +8,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
@ -70,7 +70,7 @@ index 80600d2..f2fe385 100644
mkdir ${EFIBOOTDIR}/fonts/
%if efiarch64:
-install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
+install ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
+install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
%endif
@ -123,7 +123,7 @@ index 0000000..c874547
+ }
+}
diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl
index 813f91e..26224f8 100644
index 813f91e..4ef1bfd 100644
--- a/share/templates.d/99-generic/live/efi.tmpl
+++ b/share/templates.d/99-generic/live/efi.tmpl
@@ -8,7 +8,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
@ -131,7 +131,7 @@ index 813f91e..26224f8 100644
mkdir ${EFIBOOTDIR}/fonts/
%if efiarch64:
-install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
+install ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
+install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
%endif