From ca58315f95b74ab9c783119a5a2549d612082c6e Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Wed, 25 Nov 2020 11:04:00 +0800 Subject: [PATCH 1/4] update level and release --- generic-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index 83af29a..ec6d213 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -4,8 +4,8 @@ %define variant_lowercase server %define dist_release_version 8 %define generic_version 20.03 -%define generic_patch_level LTS -%define generic_release 37 +%define generic_patch_level LTS-SP1 +%define generic_release 38 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Mon Nov 25 2020 miao_kaibo - 1.0-38 +- change generic_patch_level and generic_release + * Mon May 18 2020 shenyangyang - 1.0-37 - add equal sign in color.sh -- Gitee From c44fb213468de200201ab2d14614002b90422d48 Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Wed, 25 Nov 2020 11:15:06 +0800 Subject: [PATCH 2/4] update --- generic-release.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index ec6d213..30600ab 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -4,7 +4,7 @@ %define variant_lowercase server %define dist_release_version 8 %define generic_version 20.03 -%define generic_patch_level LTS-SP1 +%define generic_patch_level LTS %define generic_release 38 %define builtin_release_version 1.0 @@ -14,7 +14,7 @@ %endif Name: %{product_family}-release -Version: %{generic_version}%{generic_patch_level} +Version: %{generic_version}%{generic_patch_level}-SP1 Release: %{generic_release} Summary: %{product_family} release file License: Mulan PSL v2 -- Gitee From e25edaaaa744225aa2c80cf150d2ba106207bef2 Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Wed, 25 Nov 2020 11:26:54 +0800 Subject: [PATCH 3/4] update --- generic-release.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index 30600ab..4215fcf 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -4,7 +4,7 @@ %define variant_lowercase server %define dist_release_version 8 %define generic_version 20.03 -%define generic_patch_level LTS +%define generic_patch_level LTS_SP1 %define generic_release 38 %define builtin_release_version 1.0 @@ -14,7 +14,7 @@ %endif Name: %{product_family}-release -Version: %{generic_version}%{generic_patch_level}-SP1 +Version: %{generic_version}%{generic_patch_level} Release: %{generic_release} Summary: %{product_family} release file License: Mulan PSL v2 -- Gitee From 71c5f8ebfc3beb57418f9d298c46b2e46316477e Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Wed, 25 Nov 2020 14:37:14 +0800 Subject: [PATCH 4/4] update --- generic-release.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index 4215fcf..c94ce99 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -4,7 +4,8 @@ %define variant_lowercase server %define dist_release_version 8 %define generic_version 20.03 -%define generic_patch_level LTS_SP1 +%define generic_patch_level LTS +%define generic_patch_level_extend SP1 %define generic_release 38 %define builtin_release_version 1.0 @@ -14,14 +15,14 @@ %endif Name: %{product_family}-release -Version: %{generic_version}%{generic_patch_level} +Version: %{generic_version}%{generic_patch_level}_%{generic_patch_level_extend} Release: %{generic_release} Summary: %{product_family} release file License: Mulan PSL v2 Provides: %{product_family}-release Provides: %{_vendor}-release Provides: generic-release -Provides: system-release = %{generic_version}%{generic_patch_level} +Provides: system-release = %{generic_version}%{generic_patch_level}_%{generic_patch_level_extend} Source0: generic-release-%{builtin_release_version}.tar.gz Source1: 85-display-manager.preset Source2: 90-default.preset @@ -52,16 +53,16 @@ echo OK %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "%{product_family} release %{generic_version} (%{generic_patch_level})" > $RPM_BUILD_ROOT/etc/%{product_family}-release +echo "%{product_family} release %{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" > $RPM_BUILD_ROOT/etc/%{product_family}-release ln -sf %{product_family}-release $RPM_BUILD_ROOT/etc/system-release # create /etc/os-release cat << EOF >>$RPM_BUILD_ROOT/etc/os-release NAME="%{product_family}" -VERSION="%{generic_version} (%{generic_patch_level})" +VERSION="%{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" ID="%{product_family}" VERSION_ID="%{generic_version}" -PRETTY_NAME="%{product_family} %{generic_version} (%{generic_patch_level})" +PRETTY_NAME="%{product_family} %{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" ANSI_COLOR="0;31" EOF -- Gitee