diff --git a/0001-add-boot-iso-for-loongarch64.patch b/0001-add-boot-iso-for-loongarch64.patch new file mode 100644 index 0000000000000000000000000000000000000000..907ad09df0673aa004ea5996970f712580cb6440 --- /dev/null +++ b/0001-add-boot-iso-for-loongarch64.patch @@ -0,0 +1,51 @@ +From 3e6d682aa2f575a7367aff99a90d2ff04419ea24 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Mon, 30 Jan 2023 20:39:32 +0800 +Subject: [PATCH] add boot iso for loongarch64 + +--- + 80-anolis/efi.tmpl | 7 ++++++- + 80-anolis/loongarch64.tmpl | 2 +- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/80-anolis/efi.tmpl b/80-anolis/efi.tmpl +index a92d541..4a51faf 100644 +--- a/80-anolis/efi.tmpl ++++ b/80-anolis/efi.tmpl +@@ -7,7 +7,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" + + mkdir ${EFIBOOTDIR} + mkdir ${EFIBOOTDIR}/fonts/ +-%if efiarch64: ++%if efiarch64 and efiarch64 != 'LOONGARCH64': + 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}/grub${efiarch64|lower}.efi +@@ -17,6 +17,11 @@ install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32} + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif ++%if efiarch64 == 'LOONGARCH64': ++install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI ++install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/BOOTLOONGARCH.EFI ++install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi ++%endif + install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ + + ## actually make the EFI images +diff --git a/80-anolis/loongarch64.tmpl b/80-anolis/loongarch64.tmpl +index 54ba054..d955753 100644 +--- a/80-anolis/loongarch64.tmpl ++++ b/80-anolis/loongarch64.tmpl +@@ -134,7 +134,7 @@ mkdir ${KERNELDIR} + <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> + %endfor + +-%if exists("boot/efi/EFI/*/gcdaa64.efi"): ++%if exists("boot/efi/EFI/*/grubloongarch64.efi"): + ## make boot.iso + runcmd mkisofs -o ${outroot}/images/boot.iso \ + ${efiargs} -R -J -V '${isolabel}' -T ${udfargs} \ +-- +2.31.1 + diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 8b167d6069249289525d64977dd49246e49808e9..123bc2ad7667c1f1b4079f3c5f226e2aee21776a 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 13 +%define anolis_release 14 Name: lorax-templates-anolis Version: 8.3 Release: 4.%{anolis_release}%{?dist} @@ -17,6 +17,7 @@ Patch1004: 1004-shift-default-boot-number.patch Patch1005: 0001-add-BOOTLOONGARCH64.EFI-to-support-new-firmware.patch Patch1006: 0001-loongarch-install-different-kernel-for-loongarch.patch Patch1007: 1005-Add-5.10-kmod-pack.patch +Patch1008: 0001-add-boot-iso-for-loongarch64.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -35,6 +36,7 @@ placed in %{templatedir} %patch1005 -p1 %patch1006 -p1 %patch1007 -p1 +%patch1008 -p1 %build # nothing to build @@ -49,6 +51,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Mon Jan 30 2023 Wenlong Zhang - 8.3-4.14 +- add boot iso for loongarch64 + * Mon Jan 09 2023 Chang Gao - 8.3-4.13 - Do not install kmod-ast on loongarch platform