From ecab1ec49f55cba0df39e83351bd10453ed42670 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Mon, 25 Mar 2024 20:05:31 +0800 Subject: [PATCH] Remove some packages to fit kernel 6.6 --- ...precated-kernel-packs-in-6.6-version.patch | 25 +++++++++++++++++++ lorax-templates-anolis.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 1016-remove-deprecated-kernel-packs-in-6.6-version.patch diff --git a/1016-remove-deprecated-kernel-packs-in-6.6-version.patch b/1016-remove-deprecated-kernel-packs-in-6.6-version.patch new file mode 100644 index 0000000..e5e65b6 --- /dev/null +++ b/1016-remove-deprecated-kernel-packs-in-6.6-version.patch @@ -0,0 +1,25 @@ +From 7b1d5e61ba18a00d614ef20e62ba7f0f6417a0ad Mon Sep 17 00:00:00 2001 +From: "taifu.gc" +Date: Mon, 25 Mar 2024 19:32:12 +0800 +Subject: [PATCH] remove deprecated kernel packs in 6.6 version + +--- + 80-anolis/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/80-anolis/runtime-install.tmpl b/80-anolis/runtime-install.tmpl +index a51bbc5..9358dee 100644 +--- a/80-anolis/runtime-install.tmpl ++++ b/80-anolis/runtime-install.tmpl +@@ -16,7 +16,7 @@ installpkg pigz + ## kernel and firmware + ## NOTE: Without explicitly including kernel-modules-extra dnf will choose kernel-debuginfo-* + ## to satify a gfs2-utils kmod requirement +-installpkg kernel kernel-modules kernel-modules-extra ++installpkg kernel + installpkg grubby + %if basearch != "s390x": + ## skip the firmware for sound, video, and scanners, none of which will +-- +2.19.2 + diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index d2fe787..cf1ca1d 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 17 +%define anolis_release 18 Name: lorax-templates-anolis Version: 37.0 @@ -26,6 +26,7 @@ Patch1012: 1012-add-kmod-ast-in-anaconda.patch Patch1013: 1013-remove-strace-in-loongarch.patch Patch1014: 1014-add-loongarch64-support-for-lorax-templates-anolis.patch Patch1015: 1015-add-boot.iso-for-loongarch64.patch +Patch1016: 1016-remove-deprecated-kernel-packs-in-6.6-version.patch # Where are these supposed to end up? @@ -51,6 +52,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Mon Mar 25 2024 Chang Gao - 37.0.1-18 +- Remove deprecated kernel packages + * Tue Jan 23 2024 Wenlong Zhang - 37.0.1-17 - add boot.iso for loongarch64 -- Gitee