From db294a98ccdd35d80a74cd1a9bb9e5ad3b4fdb3f Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Wed, 31 Aug 2022 23:02:03 +0800 Subject: [PATCH] template: update anck to 5.10.112 Signed-off-by: Liwei Ge --- 1001-install-kernel-with-version-suffixed.patch | 6 +++--- lorax-templates-anolis.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/1001-install-kernel-with-version-suffixed.patch b/1001-install-kernel-with-version-suffixed.patch index 88a1971..4c7de28 100644 --- a/1001-install-kernel-with-version-suffixed.patch +++ b/1001-install-kernel-with-version-suffixed.patch @@ -160,7 +160,7 @@ diff -Nur lorax-templates-anolis-8.3/80-anolis/efi.tmpl lorax-templates-anolis-8 - replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf} + + %for kernel in kernels: -+ %if kernel.version.startswith("4.19.91-"): ++ %if kernel.version.startswith("5.10.112-"): + replace @ANCKKERNELNAME@ vmlinuz-${kernel.version} ${eficonf} + replace @ANCKKERNELPATH@ /${kdir}/vmlinuz-${kernel.version} ${eficonf} + replace @ANCKINITRDPATH@ /${kdir}/initrd-${kernel.version}.img ${eficonf} @@ -197,7 +197,7 @@ diff -Nur lorax-templates-anolis-8.3/80-anolis/runtime-install.tmpl lorax-templa +%else: + installpkg kernel-4.18.0 kernel-modules-4.18.0 kernel-modules-extra-4.18.0 +%endif -+installpkg kernel-4.19.91 kernel-modules-4.19.91 kernel-modules-extra-4.19.91 ++installpkg kernel-5.10.112 kernel-modules-5.10.112 kernel-modules-extra-5.10.112 + installpkg grubby %if basearch != "s390x": @@ -214,7 +214,7 @@ diff -Nur lorax-templates-anolis-8.3/80-anolis/x86.tmpl lorax-templates-anolis-8 + installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.version} + installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.version}.img %endif -+ %if kernel.version.startswith("4.19.91-"): ++ %if kernel.version.startswith("5.10.112-"): + replace @ANCK@ ${kernel.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg + %else: + replace @RHCK@ ${kernel.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index fb36e1d..84e7d17 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} @@ -45,6 +45,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Wed Aug 31 2022 Liwei Ge - 8.3-4.10 +- update anck to 5.10.112 + * Wed Aug 03 2022 Wenlong Zhang - 8.3-4.9 - add BOOTLOONGARCH64.EFI to support new firmware -- Gitee