starlingx
/
integ
Code Issues Proposed changes

rebase centos-release patch to CentOS7.5 

Story: 2003389
Task: 24476

Change-Id: I25c301e966610475d982223ef4d1ce1344906603
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-14 01:04:57 +08:00 committed by chenyan
parent 3bfc1448da
commit 2f07c07e53
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/centos-release/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,4 +1,4 @@
From d5890a17f5b07a9d17665c2b4138bb244ab6c680 Mon Sep 17 00:00:00 2001
From 328f19996b93b5be5cd856e600111d0dc87c8616 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:58:59 -0400
Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
@ -8,18 +8,18 @@ Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec
index be95b1b..91dad61 100644
index ce64be4..8c05c28 100644
--- a/SPECS/centos-release.spec
+++ b/SPECS/centos-release.spec
@@ -13,7 +13,7 @@
@@ -14,7 +14,7 @@
Name: centos-release
Version: %{base_release_version}
-Release: %{centos_rel}%{?dist}
+Release: %{centos_rel}.el7.centos%{?_tis_dist}.%{tis_patch_ver}
-Release: %{centos_rel}.1%{?dist}
+Release: %{centos_rel}.1.el7.centos%{?_tis_dist}.%{tis_patch_ver}
Summary: %{product_family} release file
Group: System Environment/Base
License: GPLv2
--
1.9.1
2.7.4

14
base/centos-release/centos/meta_patches/centos-release-include-TiS-changes.patch
View File

@ -1,4 +1,4 @@
From 4905ace48eb3feae48a02d2bd61e3778f8062532 Mon Sep 17 00:00:00 2001
From e18f905977fa94fa20a2d9a9cc565dc8d7fe8dac Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:58:59 -0400
Subject: [PATCH 1/2] WRS: centos-release-include-TiS-changes.patch
@ -8,10 +8,10 @@ Subject: [PATCH 1/2] WRS: centos-release-include-TiS-changes.patch
1 file changed, 8 insertions(+)
diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec
index af82c8b..be95b1b 100644
index 67f1550..ce64be4 100644
--- a/SPECS/centos-release.spec
+++ b/SPECS/centos-release.spec
@@ -25,6 +25,8 @@ Provides: system-release(releasever) = %{base_release_version}
@@ -27,6 +27,8 @@ Provides: system-release(releasever) = %{base_release_version}
Source0: centos-release-%{base_release_version}-%{centos_rel}.tar.gz
Source1: 85-display-manager.preset
Source2: 90-default.preset
@ -20,9 +20,9 @@ index af82c8b..be95b1b 100644
%description
%{product_family} release files
@@ -118,6 +120,12 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/
@@ -123,6 +125,12 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/
%posttrans
/usr/bin/uname -m | grep -q 'x86_64' && echo 'centos' >/etc/yum/vars/contentdir || echo 'altarch' > /etc/yum/vars/contentdir
+# Overwrite default issue files with cgcs related files.
+install -m 0644 %{SOURCE3} %{buildroot}/etc/issue
@ -34,5 +34,5 @@ index af82c8b..be95b1b 100644
%clean
rm -rf %{buildroot}
--
1.9.1
2.7.4

2
base/centos-release/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/centos-release-7-4.1708.el7.centos.src.rpm
mirror:Source/centos-release-7-5.1804.1.el7.centos.src.rpm