From 56d13166e54ad32d6fa2949c725136737b5b8227 Mon Sep 17 00:00:00 2001 From: "Martin, Chen" Date: Wed, 26 Dec 2018 08:52:19 +0800 Subject: [PATCH] rebase setup patch to CentOS 7.6 version Test: Pass build and multi-node deploy test Depends-On: https://review.openstack.org/627313 Story: 2004522 Task: 28410 Change-Id: I57f295bcab34fb81efcd3f2c34f2caca5c635b32 Signed-off-by: Martin, Chen --- ...pdate-package-versioning-for-TIS-format.patch | 6 +++--- .../0001-WRS-change-passwd-group-uidgid.patch | 16 ++++++++-------- base/setup/centos/srpm_path | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index a33932f66..247d371e9 100644 --- a/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -15,11 +15,11 @@ index 3ad2458..8f5fc46 100644 Summary: A set of system configuration and setup files Name: setup Version: 2.8.71 --Release: 9%{?dist} -+Release: 9.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 10%{?dist} ++Release: 10.el7%{?_tis_dist}.%{tis_patch_ver} License: Public Domain Group: System Environment/Base URL: https://pagure.io/setup/ --- +-- 2.7.4 diff --git a/base/setup/centos/meta_patches/0001-WRS-change-passwd-group-uidgid.patch b/base/setup/centos/meta_patches/0001-WRS-change-passwd-group-uidgid.patch index 23b140678..e9897e23a 100644 --- a/base/setup/centos/meta_patches/0001-WRS-change-passwd-group-uidgid.patch +++ b/base/setup/centos/meta_patches/0001-WRS-change-passwd-group-uidgid.patch @@ -11,20 +11,20 @@ diff --git a/SPECS/setup.spec b/SPECS/setup.spec index 0bd1e98..a173b95 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -21,6 +21,8 @@ Patch5: setup-2.8.71-fullpath.patch - Patch6: setup-2.8.71-tapeid.patch - Patch7: setup-2.8.71-shlocal.patch +@@ -23,6 +23,8 @@ Patch7: setup-2.8.71-shlocal.patch + Patch8: setup-2.8.71-protocolscrudp.patch + Patch9: setup-2.8.71-shellsnologin.patch -+Patch8: 0001-Change-group-passwd-and-uidgid.patch ++Patch1001: 0001-Change-group-passwd-and-uidgid.patch + %description The setup package contains a set of important system configuration and setup files, such as passwd, group, and profile. -@@ -36,6 +38,8 @@ setup files, such as passwd, group, and profile. - %patch6 -p1 - %patch7 -p1 +@@ -40,6 +42,8 @@ setup files, such as passwd, group, and profile. + %patch8 -p1 + %patch9 -p1 -+%patch8 -p1 ++%patch1001 -p1 + ./shadowconvert.sh diff --git a/base/setup/centos/srpm_path b/base/setup/centos/srpm_path index 82625af3f..5f011677b 100644 --- a/base/setup/centos/srpm_path +++ b/base/setup/centos/srpm_path @@ -1 +1 @@ -mirror:Source/setup-2.8.71-9.el7.src.rpm +mirror:Source/setup-2.8.71-10.el7.src.rpm