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

Update riscv64 patch 

We have no shim support yet, but older PR exist on GH (also requires
3.0.17 gnu-efi + backports from master).

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-08-31 18:30:05 +03:00
parent e0fea715e5
commit e794c2781f
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 30 additions and 1 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.1.riscv64%{?dist}
Release: 1.2.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
* Thu Aug 31 2023 David Abdurachmanov <davidlt@rivosinc.com> 38.12-2.0.riscv64
- Update riscv64 templates (we have no shim yet)
* Thu Aug 31 2023 David Abdurachmanov <davidlt@rivosinc.com> 38.12-1.0.riscv64
- Allow broken symlinks in /usr (system loop detected causes exist code 1)

26
lorax_riscv.patch
View File

@ -61,6 +61,19 @@ index 0000000..1ce5d33
+ initrd @INITRDPATH@
+ }
+}
diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl
index 80600d2..f2fe385 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"
mkdir ${EFIBOOTDIR}
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/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
%endif
diff --git a/share/templates.d/99-generic/live/config_files/riscv64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/riscv64/grub2-efi.cfg
new file mode 100644
index 0000000..c874547
@ -109,6 +122,19 @@ index 0000000..c874547
+ initrd @INITRDPATH@
+ }
+}
diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl
index 813f91e..26224f8 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"
mkdir ${EFIBOOTDIR}
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/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
%endif
diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl
index ef514ee..2367d1d 100644
--- a/share/templates.d/99-generic/live/live-install.tmpl