diff --git a/0001-loongarch-install-different-kernel-for-loongarch.patch b/0001-loongarch-install-different-kernel-for-loongarch.patch new file mode 100644 index 0000000000000000000000000000000000000000..024efa217a589b298b9b7ca3d6451fe4bee4b66d --- /dev/null +++ b/0001-loongarch-install-different-kernel-for-loongarch.patch @@ -0,0 +1,47 @@ +From aa922fb499e8ba5cdaed4de24239db9ec04570a6 Mon Sep 17 00:00:00 2001 +From: Liwei Ge +Date: Wed, 16 Nov 2022 18:50:37 +0800 +Subject: [PATCH] loongarch: install different kernel for loongarch + +--- + 80-anolis/loongarch64.tmpl | 2 +- + 80-anolis/runtime-install.tmpl | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/80-anolis/loongarch64.tmpl b/80-anolis/loongarch64.tmpl +index 1a51651..54ba054 100644 +--- a/80-anolis/loongarch64.tmpl ++++ b/80-anolis/loongarch64.tmpl +@@ -49,7 +49,7 @@ mkdir ${KERNELDIR} + treeinfo images-${basearch} ${img|basename} ${img} + %endfor + +- # <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> ++ # <%include file="efi.tmpl" args="kernels=kernels, configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> + + mkdir ${EFIBOOTDIR} + mkdir ${EFIBOOTDIR}/fonts/ +diff --git a/80-anolis/runtime-install.tmpl b/80-anolis/runtime-install.tmpl +index 41c575b..655dd61 100644 +--- a/80-anolis/runtime-install.tmpl ++++ b/80-anolis/runtime-install.tmpl +@@ -20,10 +20,15 @@ installpkg anolis-repos + ## to satify a gfs2-utils kmod requirement + %if product.version == "7" and basearch == "x86_64": + installpkg kernel-3.10.0 kernel-modules-3.10.0 kernel-modules-extra-3.10.0 +-%else: ++%elif basearch != "loongarch64": + installpkg kernel-4.18.0 kernel-modules-4.18.0 kernel-modules-extra-4.18.0 + %endif ++ ++%if basearch != "loongarch64": + installpkg kernel-4.19.91 kernel-modules-4.19.91 kernel-modules-extra-4.19.91 ++%else: ++installpkg kernel-4.19.190 kernel-modules-4.19.190 kernel-modules-extra-4.19.190 ++%endif + + installpkg grubby + %if basearch != "s390x": +-- +2.27.0 + diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index fb36e1dea7bc6f35be0a72c95d32a820e42d8cec..21770be936870fb0a7e651b37321268705589e2e 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 9 +%define anolis_release 10 Name: lorax-templates-anolis Version: 8.3 Release: 4.%{anolis_release}%{?dist} @@ -15,6 +15,7 @@ Patch1002: 1002-correct-images_xen-tree-info.patch Patch1003: 1003-tmpl-update-kernels-for-aarch64-efi.patch 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 # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -31,6 +32,7 @@ placed in %{templatedir} %patch1003 -p1 %patch1004 -p1 %patch1005 -p1 +%patch1006 -p1 %build # nothing to build @@ -45,6 +47,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Wed Nov 16 2022 Liwei Ge - 8.3-4.10 +- install different kernel for loongarch64 + * Wed Aug 03 2022 Wenlong Zhang - 8.3-4.9 - add BOOTLOONGARCH64.EFI to support new firmware