starlingx
/
integ
Code Issues Proposed changes

Merge "rebase setup patch to CentOS 7.6 version" into f/centos76

This commit is contained in:
Zuul 2019-01-02 16:51:12 +00:00 committed by Gerrit Code Review
parent b4795ce61e 56d13166e5
commit cd72631f83
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,11 @@ index 3ad2458..8f5fc46 100644
Summary: A set of system configuration and setup files Summary: A set of system configuration and setup files
Name: setup Name: setup
Version: 2.8.71 Version: 2.8.71
-Release: 9%{?dist} -Release: 10%{?dist}
+Release: 9.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 10.el7%{?_tis_dist}.%{tis_patch_ver}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: https://pagure.io/setup/ URL: https://pagure.io/setup/
-- --
2.7.4 2.7.4

16
base/setup/centos/meta_patches/0001-WRS-change-passwd-group-uidgid.patch
View File

@ -11,20 +11,20 @@ diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 0bd1e98..a173b95 100644 index 0bd1e98..a173b95 100644
--- a/SPECS/setup.spec --- a/SPECS/setup.spec
+++ b/SPECS/setup.spec +++ b/SPECS/setup.spec
@@ -21,6 +21,8 @@ Patch5: setup-2.8.71-fullpath.patch @@ -23,6 +23,8 @@ Patch7: setup-2.8.71-shlocal.patch
Patch6: setup-2.8.71-tapeid.patch Patch8: setup-2.8.71-protocolscrudp.patch
Patch7: setup-2.8.71-shlocal.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 %description
The setup package contains a set of important system configuration and The setup package contains a set of important system configuration and
setup files, such as passwd, group, and profile. setup files, such as passwd, group, and profile.
@@ -36,6 +38,8 @@ setup files, such as passwd, group, and profile. @@ -40,6 +42,8 @@ setup files, such as passwd, group, and profile.
%patch6 -p1 %patch8 -p1
%patch7 -p1 %patch9 -p1
+%patch8 -p1 +%patch1001 -p1
+ +
./shadowconvert.sh ./shadowconvert.sh

2
base/setup/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/setup-2.8.71-9.el7.src.rpm mirror:Source/setup-2.8.71-10.el7.src.rpm