From 1f9d53ec1f064644076f0cabf0f80bf451261b8e Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Wed, 4 Sep 2024 13:23:49 +0800 Subject: [PATCH 1/3] change base_release_version to 23 --- anolis-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anolis-release.spec b/anolis-release.spec index ac9ec72..ac0880b 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -1,7 +1,7 @@ -%define anolis_release 8 +%define anolis_release 9 %define debug_package %{nil} %define product_family Anolis OS -%define base_release_version 23.1 +%define base_release_version 23 %define full_release_version 23.1 %define dist .an%{base_release_version} @@ -147,6 +147,9 @@ rm -rf %{buildroot} /etc/pki/rpm-gpg/ %changelog +* Wed Sep 04 2024 mgb01105731 - 23-9 +- change base_release_version to 23 + * Wed Aug 07 2024 mgb01105731 - 23-8 - change release version to 23.1 -- Gitee From c97dfc382406851fd55eaa9f2af9b37311759f9d Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Tue, 5 Nov 2024 17:15:14 +0800 Subject: [PATCH 2/3] add DDE repo --- AnolisOS-Debuginfo.repo | 7 +++++++ AnolisOS-Source.repo | 7 +++++++ AnolisOS.repo | 7 +++++++ anolis-release.spec | 5 ++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/AnolisOS-Debuginfo.repo b/AnolisOS-Debuginfo.repo index 8408bf0..d349116 100644 --- a/AnolisOS-Debuginfo.repo +++ b/AnolisOS-Debuginfo.repo @@ -12,6 +12,13 @@ enabled=0 gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS gpgcheck=1 +[DDE-debuginfo] +name=AnolisOS-$releasever - DDE Debuginfo +baseurl=https://mirrors.openanolis.cn/anolis/$releasever/DDE/$basearch/debug +enabled=0 +gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS +gpgcheck=1 + [kernel-6-debuginfo] name=AnolisOS-$releasever - kernel-6 Debuginfo baseurl=https://mirrors.openanolis.cn/anolis/$releasever/kernel-6/$basearch/debug diff --git a/AnolisOS-Source.repo b/AnolisOS-Source.repo index 79e8668..f0d24cd 100644 --- a/AnolisOS-Source.repo +++ b/AnolisOS-Source.repo @@ -12,6 +12,13 @@ enabled=0 gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS gpgcheck=1 +[DDE-source] +name=AnolisOS-$releasever - DDE Source +baseurl=https://mirrors.openanolis.cn/anolis/$releasever/DDE/source/ +enabled=0 +gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS +gpgcheck=1 + [kernel-source] name=AnolisOS-$releasever - kernel-6 Source baseurl=https://mirrors.openanolis.cn/anolis/$releasever/kernel-6/source/ diff --git a/AnolisOS.repo b/AnolisOS.repo index 0df1cef..ae96ed7 100644 --- a/AnolisOS.repo +++ b/AnolisOS.repo @@ -12,6 +12,13 @@ enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS gpgcheck=1 +[DDE] +name=AnolisOS-$releasever - DDE +baseurl=http://mirrors.openanolis.cn/anolis/$releasever/DDE/$basearch/os +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS +gpgcheck=1 + [kernel-6] name=AnolisOS-$releasever - kernel-6 baseurl=http://mirrors.openanolis.cn/anolis/$releasever/kernel-6/$basearch/os diff --git a/anolis-release.spec b/anolis-release.spec index ac0880b..92f75c4 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -1,4 +1,4 @@ -%define anolis_release 9 +%define anolis_release 10 %define debug_package %{nil} %define product_family Anolis OS %define base_release_version 23 @@ -147,6 +147,9 @@ rm -rf %{buildroot} /etc/pki/rpm-gpg/ %changelog +* Tue Nov 05 2024 mgb01105731 - 23-10 +- add DDE repo + * Wed Sep 04 2024 mgb01105731 - 23-9 - change base_release_version to 23 -- Gitee From 062db9163b0bd39e6b73d1fe1b1a65620e933a43 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Wed, 6 Nov 2024 14:05:06 +0800 Subject: [PATCH 3/3] change full_release_version to 23.2 --- AnolisOS-DDE.repo | 20 ++++++++++++++++++++ AnolisOS-Debuginfo.repo | 7 ------- AnolisOS-Source.repo | 7 ------- AnolisOS.repo | 7 ------- anolis-release.spec | 9 +++++++-- 5 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 AnolisOS-DDE.repo diff --git a/AnolisOS-DDE.repo b/AnolisOS-DDE.repo new file mode 100644 index 0000000..fd09ea4 --- /dev/null +++ b/AnolisOS-DDE.repo @@ -0,0 +1,20 @@ +[DDE] +name=AnolisOS-$releasever - DDE +baseurl=http://mirrors.openanolis.cn/anolis/$releasever/DDE/$basearch/os +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS +gpgcheck=1 + +[DDE-source] +name=AnolisOS-$releasever - DDE Source +baseurl=https://mirrors.openanolis.cn/anolis/$releasever/DDE/source/ +enabled=0 +gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS +gpgcheck=1 + +[DDE-debuginfo] +name=AnolisOS-$releasever - DDE Debuginfo +baseurl=https://mirrors.openanolis.cn/anolis/$releasever/DDE/$basearch/debug +enabled=0 +gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS +gpgcheck=1 diff --git a/AnolisOS-Debuginfo.repo b/AnolisOS-Debuginfo.repo index d349116..8408bf0 100644 --- a/AnolisOS-Debuginfo.repo +++ b/AnolisOS-Debuginfo.repo @@ -12,13 +12,6 @@ enabled=0 gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS gpgcheck=1 -[DDE-debuginfo] -name=AnolisOS-$releasever - DDE Debuginfo -baseurl=https://mirrors.openanolis.cn/anolis/$releasever/DDE/$basearch/debug -enabled=0 -gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS -gpgcheck=1 - [kernel-6-debuginfo] name=AnolisOS-$releasever - kernel-6 Debuginfo baseurl=https://mirrors.openanolis.cn/anolis/$releasever/kernel-6/$basearch/debug diff --git a/AnolisOS-Source.repo b/AnolisOS-Source.repo index f0d24cd..79e8668 100644 --- a/AnolisOS-Source.repo +++ b/AnolisOS-Source.repo @@ -12,13 +12,6 @@ enabled=0 gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS gpgcheck=1 -[DDE-source] -name=AnolisOS-$releasever - DDE Source -baseurl=https://mirrors.openanolis.cn/anolis/$releasever/DDE/source/ -enabled=0 -gpgkey=https://mirrors.openanolis.cn/anolis/RPM-GPG-KEY-ANOLIS -gpgcheck=1 - [kernel-source] name=AnolisOS-$releasever - kernel-6 Source baseurl=https://mirrors.openanolis.cn/anolis/$releasever/kernel-6/source/ diff --git a/AnolisOS.repo b/AnolisOS.repo index ae96ed7..0df1cef 100644 --- a/AnolisOS.repo +++ b/AnolisOS.repo @@ -12,13 +12,6 @@ enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS gpgcheck=1 -[DDE] -name=AnolisOS-$releasever - DDE -baseurl=http://mirrors.openanolis.cn/anolis/$releasever/DDE/$basearch/os -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ANOLIS -gpgcheck=1 - [kernel-6] name=AnolisOS-$releasever - kernel-6 baseurl=http://mirrors.openanolis.cn/anolis/$releasever/kernel-6/$basearch/os diff --git a/anolis-release.spec b/anolis-release.spec index 92f75c4..2285c2d 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -1,8 +1,8 @@ -%define anolis_release 10 +%define anolis_release 11 %define debug_package %{nil} %define product_family Anolis OS %define base_release_version 23 -%define full_release_version 23.1 +%define full_release_version 23.2 %define dist .an%{base_release_version} Name: anolis-release @@ -28,6 +28,7 @@ Source11: 99-default-disable.preset Source100: AnolisOS.repo Source101: AnolisOS-Source.repo Source102: AnolisOS-Debuginfo.repo +Source103: AnolisOS-DDE.repo %description %{product_family} %{base_release_version} release files @@ -97,6 +98,7 @@ mkdir -p -m 755 %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE100} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE101} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE102} %{buildroot}/etc/yum.repos.d +install -m 644 %{SOURCE103} %{buildroot}/etc/yum.repos.d # set up the dist tag macros install -d -m 755 %{buildroot}%{_rpmmacrodir} @@ -147,6 +149,9 @@ rm -rf %{buildroot} /etc/pki/rpm-gpg/ %changelog +* Wed Nov 06 2024 mgb01105731 - 23-11 +- change full_release_version to 23.2 + * Tue Nov 05 2024 mgb01105731 - 23-10 - add DDE repo -- Gitee