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

Remove more shim from templates 

mm<arch> is also coming from shim.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-09-01 12:46:35 +03:00
parent b5cf4528b4
commit fdabead2d0
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 12 additions and 7 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.3.riscv64%{?dist}
Release: 1.4.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-4.0.riscv64
- Remove more shim for riscv64.
* Fri Sep 01 2023 David Abdurachmanov <davidlt@rivosinc.com> 38.12-3.0.riscv64
- Fix GRUB install.

14
lorax_riscv.patch
View File

@ -62,18 +62,19 @@ index 0000000..1ce5d33
+ }
+}
diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl
index 80600d2..85f080c 100644
index 80600d2..4bf890f 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"
@@ -8,8 +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 boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
+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
%if efiarch32:
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
@ -123,18 +124,19 @@ 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..4ef1bfd 100644
index 813f91e..8870c55 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"
@@ -8,8 +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 boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
+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
%if efiarch32:
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