From e1e72648497b6b8271f36a09b4332ad39b50da19 Mon Sep 17 00:00:00 2001 From: lxpzero Date: Thu, 18 Jan 2024 10:04:29 +0800 Subject: [PATCH 1/3] Disabled 4.18 Kernel plus repo --- anolis-release.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anolis-release.spec b/anolis-release.spec index 341a0c7..cff87a5 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -178,7 +178,7 @@ if [[ -f /etc/yum.repos.d/AnolisOS-kernel-5.10.repo ]];then sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AnolisOS-kernel-5.10.repo fi -%triggerin -n anolis-repos -- kernel < 5.10 +%triggerin -n anolis-repos -- kernel = 4.19.91 if [[ -f /etc/yum.repos.d/AnolisOS-Plus.repo ]];then sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AnolisOS-Plus.repo fi @@ -186,6 +186,7 @@ fi %changelog * Mon Jan 15 2024 Funda Wang - 8.8-4 - Move scripts from post to triggerin +- Disabled 4.18 Kernel plus repo * Tue Aug 8 2023 Zhiyuan Zhao - 8.8-3 - Provide /usr/lib/os-release for bash error after toolbox installed -- Gitee From 5a742072e378f7f3f589ac2db6a70c56f2d93107 Mon Sep 17 00:00:00 2001 From: lxpzero Date: Thu, 18 Jan 2024 10:05:48 +0800 Subject: [PATCH 2/3] Update to 8.9 --- anolis-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anolis-release.spec b/anolis-release.spec index cff87a5..544b9de 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -1,9 +1,9 @@ -%define anolis_release 4 +%define anolis_release 1 %define debug_package %{nil} %define product_family Anolis OS %define base_release_version 8 -%define full_release_version 8.8 +%define full_release_version 8.9 %define compat_release_version 8 %define dist .an%{base_release_version} @@ -184,6 +184,9 @@ if [[ -f /etc/yum.repos.d/AnolisOS-Plus.repo ]];then fi %changelog +* Thu Jan 18 2024 Xiaoping Liu - 8.9-1 +- Update to 8.9 + * Mon Jan 15 2024 Funda Wang - 8.8-4 - Move scripts from post to triggerin - Disabled 4.18 Kernel plus repo -- Gitee From a04416c3e61c14150743ecd99aa1cb679153c635 Mon Sep 17 00:00:00 2001 From: lxpzero Date: Thu, 18 Jan 2024 11:34:25 +0800 Subject: [PATCH 3/3] Add 5.10 source and debug repo --- AnolisOS-kernel-5.10.repo | 14 ++++++++++++++ anolis-release.spec | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/AnolisOS-kernel-5.10.repo b/AnolisOS-kernel-5.10.repo index 307d0f4..40ac6d2 100644 --- a/AnolisOS-kernel-5.10.repo +++ b/AnolisOS-kernel-5.10.repo @@ -4,3 +4,17 @@ baseurl=http://mirrors.openanolis.cn/anolis/$releasever/kernel-5.10/$basearch/os enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS gpgcheck=1 + +[kernel-5.10-source] +name=AnolisOS-$releasever - Kernel 5.10 source +baseurl=http://mirrors.openanolis.cn/anolis/$releasever/kernel-5.10/source +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS +gpgcheck=1 + +[kernel-5.10-debug] +name=AnolisOS-$releasever - Kernel 5.10 debug +baseurl=http://mirrors.openanolis.cn/anolis/$releasever/kernel-5.10/$basearch/debug +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS +gpgcheck=1 diff --git a/anolis-release.spec b/anolis-release.spec index 544b9de..ee429bd 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -169,13 +169,15 @@ rm -rf %{buildroot} %files -n anolis-repos %config(noreplace) /etc/yum.repos.d/* +%exclude /etc/yum.repos.d/AnolisOS-kernel-5.10.repo +/etc/yum.repos.d/AnolisOS-kernel-5.10.repo %files -n anolis-gpg-keys /etc/pki/rpm-gpg/ %triggerin -n anolis-repos -- kernel >= 5.10 if [[ -f /etc/yum.repos.d/AnolisOS-kernel-5.10.repo ]];then - sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AnolisOS-kernel-5.10.repo + sed -i "4s/enabled=0/enabled=1/g" /etc/yum.repos.d/AnolisOS-kernel-5.10.repo fi %triggerin -n anolis-repos -- kernel = 4.19.91 @@ -186,6 +188,7 @@ fi %changelog * Thu Jan 18 2024 Xiaoping Liu - 8.9-1 - Update to 8.9 +- Add 5.10 source and debug repo * Mon Jan 15 2024 Funda Wang - 8.8-4 - Move scripts from post to triggerin -- Gitee