starlingx/integ
Code Issues Proposed changes

CentOS 8: Upgrade setup to version 2.12.2

Browse Source 
(1)Release Version Upgrade
(2)Matching code changes with el7 to el8

Story: 2006729
Task: 37668
Depends-On: https://review.opendev.org/#/c/696481/
Depends-On: https://review.opendev.org/#/c/696050/
Change-Id: Ieb226d712a59b4af4f527cfec64c5f605f14c2f9
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
This commit is contained in:
chendongqi 2019-11-18 16:02:36 +08:00
parent 9035cd1be8
commit f513d0e887
7 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/setup/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
COPY_LIST="files/*"
TIS_PATCH_VER=16
TIS_PATCH_VER=1

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

@ -3,6 +3,7 @@ From: Don Penney <don.penney@windriver.com>
Date: Mon, 26 Sep 2016 17:40:54 -0400
Subject: [PATCH 09/15] Update package versioning for TIS format
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
---
SPECS/setup.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@ -14,12 +15,12 @@ index 3ad2458..8f5fc46 100644
@@ -1,7 +1,7 @@
Summary: A set of system configuration and setup files
Name: setup
Version: 2.8.71
-Release: 10%{?dist}
+Release: 10.el7%{?_tis_dist}.%{tis_patch_ver}
Version: 2.12.2
-Release: 2%{?dist}
+Release: 2.el8%{?_tis_dist}.%{tis_patch_ver}
License: Public Domain
Group: System Environment/Base
URL: https://pagure.io/setup/
--
2.7.4
--
1.8.3.1

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

@ -1,34 +0,0 @@
From e3aba238a88f73392d832b5ae366466f783adce4 Mon Sep 17 00:00:00 2001
From: zhipengl <zhipengs.liu@intel.com>
Date: Sun, 18 Nov 2018 10:06:23 +0000
Subject: [PATCH] WRS: 0001-patch-passwd-group.patch
---
SPECS/setup.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 0bd1e98..a173b95 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -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
+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.
@@ -40,6 +42,8 @@ setup files, such as passwd, group, and profile.
%patch8 -p1
%patch9 -p1
+%patch1001 -p1
+
./shadowconvert.sh
%build
--
1.8.3.1

37
base/setup/centos/meta_patches/0001-change-passwd-group-uidgid.patch Normal file
View File

@ -0,0 +1,37 @@
From e3aba238a88f73392d832b5ae366466f783adce4 Mon Sep 17 00:00:00 2001
From: zhipengl <zhipengs.liu@intel.com>
Date: Sun, 18 Nov 2018 10:06:23 +0000
Subject: [PATCH] 0001-patch-passwd-group.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
---
SPECS/setup.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 0bd1e98..a173b95 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -6,6 +6,9 @@ License: Public Domain
Group: System Environment/Base
URL: https://pagure.io/setup/
Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
+
+Patch1001: 0001-Change-group-passwd-and-uidgid.patch
+
BuildArch: noarch
BuildRequires: bash tcsh perl-interpreter
#require system release for saner dependency order
@@ -19,6 +22,9 @@ setup files, such as passwd, group, and profile.
%prep
%setup -q
+
+%patch1001 -p1
+
./shadowconvert.sh
%build
--
2.7.4

2
base/setup/centos/meta_patches/PATCH_ORDER
View File

@ -1,2 +1,2 @@
0001-Update-package-versioning-for-TIS-format.patch
0001-WRS-change-passwd-group-uidgid.patch
0001-change-passwd-group-uidgid.patch

23
base/setup/centos/patches/0001-Change-group-passwd-and-uidgid.patch
View File

@ -5,6 +5,7 @@ Subject: [PATCH] Change group,passwd,and uidgid
Signed-off-by: Andy Ning <andy.ning@windriver.com>
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
---
group | 22 ++++++++++++----------
passwd | 19 +++++++++++--------
@ -38,7 +39,6 @@ index 2753bd8..74174c3 100644
-ftp::50:
lock::54:
-audio::63:
nobody::99:
users::100:
+postgres:x:120:
+nova:x:162:nova
@ -52,8 +52,9 @@ index 2753bd8..74174c3 100644
+libvirt:x:991:nova
+ironic:x:1874:ironic
+www:x:1877:www
nobody::65534:
diff --git a/passwd b/passwd
index 6c6a8eb..b478fc3 100644
index 8175e8b..e939817 100644
--- a/passwd
+++ b/passwd
@@ -1,13 +1,16 @@
@ -69,7 +70,6 @@ index 6c6a8eb..b478fc3 100644
-operator:*:11:0:operator:/root:/sbin/nologin
-games:*:12:100:games:/usr/games:/sbin/nologin
-ftp:*:14:50:FTP User:/var/ftp:/sbin/nologin
nobody:*:99:99:Nobody:/:/sbin/nologin
+postgres:x:120:120:PostgreSQL Server:/var/lib/pgsql:/bin/sh
+neutron:x:164:164:OpenStack Neutron Daemons:/var/lib/neutron:/sbin/nologin
+sysinv:x:168:168:sysinv Daemons:/var/lib/sysinv:/sbin/nologin
@ -81,11 +81,12 @@ index 6c6a8eb..b478fc3 100644
+nova:x:994:162:OpenStack Nova Daemons:/var/lib/nova:/sbin/nologin
+ironic:x:1874:1874:OpenStack Ironic Daemons:/var/lib/ironic:/sbin/nologin
+www:x:1877:1877:www:/home/www:/sbin/nologin
nobody:*:65534:65534:Kernel Overflow User:/:/sbin/nologin
diff --git a/uidgid b/uidgid
index c6bbd4b..714ba2a 100644
index e86d45e..a424152 100644
--- a/uidgid
+++ b/uidgid
@@ -127,13 +127,14 @@ stapusr - 156 / - systemtap-runtime
@@ -128,13 +128,14 @@ stapusr - 156 / - systemtap-runtime
stapsys - 157 / - systemtap-runtime
stapdev - 158 / - systemtap-runtime
swift 160 160 /var/lib/swift /sbin/nologin openstack-swift
@ -103,23 +104,21 @@ index c6bbd4b..714ba2a 100644
avahi-autoipd 170 170 /var/lib/avahi-autoipd /sbin/nologin avahi
pulse 171 171 /var/run/pulse /sbin/nologin pulseaudio
rtkit 172 172 /proc /sbin/nologin rtkit
@@ -152,7 +153,6 @@ mongodb 184 184 /var/lib/mongodb /sbin/nologin mongodb
jboss 185 185 /var/lib/jbossas /sbin/nologin jbossas-core #was jboss-as and wildfly
@@ -153,7 +154,6 @@ mongodb 184 184 /var/lib/mongodb /sbin/nologin mongodb
wildfly 185 185 /usr/share/wildfly /sbin/nologin wildfly #was jboss-as
jbosson-agent 186 - / /sbin/nologin jboss-on-agent
jbosson - 186 - - jboss-on-agent
-heat 187 187 /var/lib/heat /sbin/nologin heat
haproxy 188 188 /var/lib/haproxy /sbin/nologin haproxy
hacluster 189 - / /sbin/nologin pacemaker
haclient - 189 - - pacemaker
@@ -163,6 +163,8 @@ systemd-network 192 192 / /sbin/nologin systemd
@@ -163,4 +163,6 @@ systemd-network 192 192 / /sbin/nologin systemd
systemd-resolve 193 193 / /sbin/nologin systemd
gnats ? ? ? ? gnats, gnats-db
listar ? ? ? ? listar
+fm 195 195 /var/lib/fm /sbin/nologin fm-mgr
nfsnobody 65534 65534 /var/lib/nfs /sbin/nologin nfs-utils
nobody 65534 65534 / /sbin/nologin setup
+www 1877 1877 /home/www /sbin/nologin setup
# Note: nfsnobody is 4294967294 on 64-bit platforms (-2)
--
1.8.3.1
2.7.4

2
base/setup/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/setup-2.8.71-10.el7.src.rpm
mirror:Source/setup-2.12.2-2.el8.src.rpm