starlingx
/
integ
Code Issues Proposed changes

rebase setup patch to CentOS7.5 

Story: 2003389
Task: 24485

Change-Id: I04645b69e0e86e70cf168fbfe6c118af2cb961a3
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-16 03:28:59 +08:00
parent d60afc72f7
commit cb67fa8330
20 changed files with 251 additions and 1263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 412fc338e588c92ee0be3bf1b1af0040fac9f500 Mon Sep 17 00:00:00 2001
From 667cc2ccdd4451ce9d943064d714bcf1a8d1e4ed Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Mon, 26 Sep 2016 17:40:54 -0400
Subject: [PATCH] Update package versioning for TIS format
Subject: [PATCH 09/15] Update package versioning for TIS format
---
SPECS/setup.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 223bfd5..89a4d2f 100644
index 3ad2458..8f5fc46 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -1,7 +1,7 @@
@ -16,10 +16,10 @@ index 223bfd5..89a4d2f 100644
Name: setup
Version: 2.8.71
-Release: 9%{?dist}
+Release: 7.el7%{?_tis_dist}.%{tis_patch_ver}
+Release: 9.el7%{?_tis_dist}.%{tis_patch_ver}
License: Public Domain
Group: System Environment/Base
URL: https://fedorahosted.org/setup/
URL: https://pagure.io/setup/
--
1.8.3.1
2.7.4

13
base/setup/centos/meta_patches/security-make-exports-and-fstab-only-root-accessible.patch
View File

@ -1,8 +1,7 @@
From 2f6906e33b91dc28c7b48ce5604501ce09cfaed6 Mon Sep 17 00:00:00 2001
Message-Id: <2f6906e33b91dc28c7b48ce5604501ce09cfaed6.1468352966.git.Jim.Somerville@windriver.com>
From 6d54fd5dff19e69d2d9c01e508fd4276e4eaef5b Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 12 Jul 2016 15:43:47 -0400
Subject: [PATCH 1/1] security make exports and fstab only root accessible
Subject: [PATCH 07/15] security make exports and fstab only root accessible
Apply a chmod of 600 to the two files.
@ -12,17 +11,17 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index d40113f..6c18614 100644
index db3ed17..a612d24 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -65,6 +65,7 @@ chmod 0644 %{buildroot}/var/log/lastlog
@@ -69,6 +69,7 @@ chmod 0644 %{buildroot}/var/log/lastlog
touch %{buildroot}/etc/fstab
touch %{buildroot}/etc/subuid
touch %{buildroot}/etc/subgid
+chmod 0600 %{buildroot}/etc/{exports,fstab}
install -m 644 %{SOURCE1} %{buildroot}/etc/
install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh
mkdir -p %{buildroot}/etc/profile.d
--
1.8.3.1
2.7.4

33
base/setup/centos/meta_patches/spec-add-TMOUT-variable.patch
View File

@ -1,40 +1,43 @@
From 13bee9ed7d91fae3d66f91d4e4aa139ca3d05f66 Mon Sep 17 00:00:00 2001
From d8ab20a896750f9fcd257d3e64cb0ef34e35140a Mon Sep 17 00:00:00 2001
From: David Balme <david.balme@windriver.com>
Date: Thu, 13 Oct 2016 08:40:27 -0400
Subject: [PATCH 1/1] add TMOUT variable
Subject: [PATCH 10/15] add TMOUT variable
---
SPECS/setup.spec | 3 +++
1 file changed, 3 insertions(+)
SPECS/setup.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 89a4d2f..1f5c96a 100644
index 8f5fc46..a6465dc 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -8,6 +8,7 @@ URL: https://fedorahosted.org/setup/
Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
@@ -8,6 +8,7 @@ URL: https://pagure.io/setup/
Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
Source1: motd
Source2: prompt.sh
+Source3: custom.sh
BuildArch: noarch
BuildRequires: bash tcsh perl
#require system release for saner dependency order
@@ -70,6 +71,7 @@ touch %{buildroot}/etc/subgid
@@ -73,8 +74,9 @@ touch %{buildroot}/etc/subuid
touch %{buildroot}/etc/subgid
chmod 0600 %{buildroot}/etc/{exports,fstab}
install -m 644 %{SOURCE1} %{buildroot}/etc/
install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh
-install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh
mkdir -p %{buildroot}/etc/profile.d
+install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh
+install -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/custom.sh
echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local
echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local
# remove unpackaged files from the buildroot
rm -f %{buildroot}/etc/Makefile
@@ -125,6 +127,7 @@ end
@@ -133,6 +135,7 @@ end
%config(noreplace) /etc/motd
%dir /etc/profile.d
/etc/profile.d/prompt.sh
+/etc/profile.d/custom.sh
%config(noreplace) /etc/profile.d/sh.local
%config(noreplace) /etc/profile.d/csh.local
%config(noreplace) %verify(not md5 size mtime) /etc/shells
%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
--
1.8.3.1
2.7.4

33
base/setup/centos/meta_patches/spec-add-ironic-uid-gid.patch
View File

@ -1,26 +1,33 @@
commit f944ef677dc090e91b790ac54064d61d071edb5c
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Mon Sep 25 12:20:43 2017 -0400
From 1c1e025ff9cdf5a5041959434a79014e24015271 Mon Sep 17 00:00:00 2001
From: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Mon, 27 Aug 2018 17:55:18 +0800
Add ironic-uid-gid.patch to SPECS
---
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 2ec3541..55dd30b 100644
index 367a13b..974113e 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -28,6 +28,7 @@ Patch9: snmpd-fm-user-group.patch
Patch10: remove-unused-default-groups.patch
Patch11: add-fm-user-to-snmpd-group.patch
Patch12: add-magnum-uid-gid.patch
+Patch13: add-ironic-uid-gid.patch
@@ -30,6 +30,7 @@ Patch11: snmpd-fm-user-group.patch
Patch12: remove-unused-default-groups.patch
Patch13: add-fm-user-to-snmpd-group.patch
Patch14: add-magnum-uid-gid.patch
+Patch15: add-ironic-uid-gid.patch
%description
The setup package contains a set of important system configuration and
@@ -48,6 +49,7 @@ setup files, such as passwd, group, and profile.
%patch10 -p1
%patch11 -p1
@@ -52,6 +53,7 @@ setup files, such as passwd, group, and profile.
%patch12 -p1
+%patch13 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
./shadowconvert.sh
--
2.7.4

26
base/setup/centos/meta_patches/spec-add-magnum-uid-gid.patch
View File

@ -1,32 +1,32 @@
From 11086bd4422e8f24a0b070eb16e53b08f4561c61 Mon Sep 17 00:00:00 2001
From 23dda8869b96f7df3db3fc885ca960b4889c82c0 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Thu, 3 Aug 2017 16:18:34 -0400
Subject: [PATCH 1/1] meta add magnum uid and gid
Subject: [PATCH 12/15] meta add magnum uid and gid
---
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 9ee24ca..2ec3541 100644
index 6a871f3..367a13b 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -27,6 +27,7 @@ Patch8: passwd-remove-unused-default-users-and-groups.patch
Patch9: snmpd-fm-user-group.patch
Patch10: remove-unused-default-groups.patch
Patch11: add-fm-user-to-snmpd-group.patch
+Patch12: add-magnum-uid-gid.patch
@@ -29,6 +29,7 @@ Patch10: passwd-remove-unused-default-users-and-groups.patch
Patch11: snmpd-fm-user-group.patch
Patch12: remove-unused-default-groups.patch
Patch13: add-fm-user-to-snmpd-group.patch
+Patch14: add-magnum-uid-gid.patch
%description
The setup package contains a set of important system configuration and
@@ -46,6 +47,7 @@ setup files, such as passwd, group, and profile.
%patch9 -p1
%patch10 -p1
@@ -50,6 +51,7 @@ setup files, such as passwd, group, and profile.
%patch11 -p1
+%patch12 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
./shadowconvert.sh
--
1.8.3.1
2.7.4

26
base/setup/centos/meta_patches/spec-add-murano-uid-gid.patch
View File

@ -1,32 +1,32 @@
From bb774f39b779de4e31007fc70bead641820ae74f Mon Sep 17 00:00:00 2001
From 07aca8a7f571059552dceb9a83d7b231e6ba01ff Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Mon, 8 Jan 2018 12:28:08 -0500
Subject: [PATCH 1/1] meta add murano uid and gid
Subject: [PATCH 14/15] meta add murano uid and gid
---
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 55dd30b..b652b3c 100644
index 974113e..7f636ea 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -29,6 +29,7 @@ Patch10: remove-unused-default-groups.patch
Patch11: add-fm-user-to-snmpd-group.patch
Patch12: add-magnum-uid-gid.patch
Patch13: add-ironic-uid-gid.patch
+Patch14: add-murano-uid-gid.patch
@@ -31,6 +31,7 @@ Patch12: remove-unused-default-groups.patch
Patch13: add-fm-user-to-snmpd-group.patch
Patch14: add-magnum-uid-gid.patch
Patch15: add-ironic-uid-gid.patch
+Patch16: add-murano-uid-gid.patch
%description
The setup package contains a set of important system configuration and
@@ -50,6 +51,7 @@ setup files, such as passwd, group, and profile.
%patch11 -p1
%patch12 -p1
@@ -54,6 +55,7 @@ setup files, such as passwd, group, and profile.
%patch13 -p1
+%patch14 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
./shadowconvert.sh
--
1.8.3.1
2.7.4

26
base/setup/centos/meta_patches/spec-add-uid-gid-for-telemetry-services.patch
View File

@ -1,32 +1,32 @@
From 8c24c1c8bc9b703714c52b9b45cd3ea90f4a6604 Mon Sep 17 00:00:00 2001
From 34c8b5f204877ae54d07248b9729353c8f8dfecf Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.Wang@windriver.com>
Date: Thu, 7 Jun 2018 16:39:08 -0400
Subject: [PATCH] spec add uid gid for telemetry services
Subject: [PATCH 15/15] spec add uid gid for telemetry services
---
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index b652b3c..76d4feb 100644
index 7f636ea..4f11a37 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -30,6 +30,7 @@ Patch11: add-fm-user-to-snmpd-group.patch
Patch12: add-magnum-uid-gid.patch
Patch13: add-ironic-uid-gid.patch
Patch14: add-murano-uid-gid.patch
+Patch15: add-uid-gid-for-telemetry-services.patch
@@ -32,6 +32,7 @@ Patch13: add-fm-user-to-snmpd-group.patch
Patch14: add-magnum-uid-gid.patch
Patch15: add-ironic-uid-gid.patch
Patch16: add-murano-uid-gid.patch
+Patch17: add-uid-gid-for-telemetry-services.patch
%description
The setup package contains a set of important system configuration and
@@ -52,6 +53,7 @@ setup files, such as passwd, group, and profile.
%patch12 -p1
%patch13 -p1
@@ -56,6 +57,7 @@ setup files, such as passwd, group, and profile.
%patch14 -p1
+%patch15 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
./shadowconvert.sh
--
1.8.3.1
2.7.4

32
base/setup/centos/meta_patches/spec-include-TiS-changes.patch
View File

@ -1,35 +1,43 @@
setup.spec: to include Titanium Cloud specific changes
From 236314295289b829e6216022a247017f7c0851c7 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Tue, 7 Aug 2018 22:41:01 +0800
Subject: [PATCH 01/15] setup.spec: to include Titanium Cloud specific changes
To include files under cgcs/recipes-base/setup/files/*
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/setup.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 9174b5a..efc52ca 100644
index 317132b..4ac1019 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -6,6 +6,7 @@ License: Public Domain
Group: System Environment/Base
URL: https://fedorahosted.org/setup/
Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
URL: https://pagure.io/setup/
Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
+Source1: motd
BuildArch: noarch
BuildRequires: bash tcsh perl
#require system release for saner dependency order
@@ -55,6 +56,7 @@ chmod 0644 %{buildroot}/var/log/lastlog
@@ -59,6 +60,7 @@ chmod 0644 %{buildroot}/var/log/lastlog
touch %{buildroot}/etc/fstab
touch %{buildroot}/etc/subuid
touch %{buildroot}/etc/subgid
+install -m 644 %{SOURCE1} %{buildroot}/etc/
# remove unpackaged files from the buildroot
rm -f %{buildroot}/etc/Makefile
@@ -107,6 +109,7 @@ end
mkdir -p %{buildroot}/etc/profile.d
echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local
echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local
@@ -115,6 +117,7 @@ end
%attr(0600,root,root) %config(noreplace,missingok) /etc/securetty
%config(noreplace) /etc/csh.login
%config(noreplace) /etc/csh.cshrc
+%config(noreplace) /etc/motd
%dir /etc/profile.d
%config(noreplace) %verify(not md5 size mtime) /etc/shells
%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
%config(noreplace) /etc/profile.d/sh.local
%config(noreplace) /etc/profile.d/csh.local
--
1.8.3.1
2.7.4

31
base/setup/centos/meta_patches/spec-include-add-fm-user-to-snmpd-group.patch
View File

@ -1,22 +1,33 @@
From 3eb03183dc24b865dd3e84495a82899f39665690 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Tue, 7 Aug 2018 23:17:05 +0800
Subject: [PATCH 11/15] spec-include-add-fm-user-to-snmpd-group
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/setup.spec | 2 ++
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index a6465dc..6a871f3 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -26,6 +26,7 @@ Patch6: updating-gids-and-uids-to-suppor
Patch8: passwd-remove-unused-default-users-and-groups.patch
Patch9: snmpd-fm-user-group.patch
Patch10: remove-unused-default-groups.patch
+Patch11: add-fm-user-to-snmpd-group.patch
@@ -28,6 +28,7 @@ Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
Patch10: passwd-remove-unused-default-users-and-groups.patch
Patch11: snmpd-fm-user-group.patch
Patch12: remove-unused-default-groups.patch
+Patch13: add-fm-user-to-snmpd-group.patch
%description
The setup package contains a set of important system configuration and
@@ -44,6 +45,7 @@ setup files, such as passwd, group, and
%patch8 -p1
%patch9 -p1
@@ -48,6 +49,7 @@ setup files, such as passwd, group, and profile.
%patch10 -p1
+%patch11 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
./shadowconvert.sh
--
2.7.4

39
base/setup/centos/meta_patches/spec-include-snmpd-fm-user-group.patch
View File

@ -1,41 +1,32 @@
From 35ebbf2ca7e5e412f55cdaa875845728d203b34d Mon Sep 17 00:00:00 2001
From f0882fad769c71cb70b44251c79f39e7e13dbc48 Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 12 Aug 2016 17:35:28 -0400
Subject: [PATCH] meta patch for snmpd-user-group.patch
Subject: [PATCH 06/15] meta patch for snmpd-user-group.patch
---
SPECS/setup.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 89ff683..d40113f 100644
index 10d151b..db3ed17 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -1,7 +1,7 @@
Summary: A set of system configuration and setup files
Name: setup
Version: 2.8.71
-Release: 7%{?dist}
+Release: 8%{?dist}
License: Public Domain
Group: System Environment/Base
URL: https://fedorahosted.org/setup/
@@ -23,6 +23,7 @@ Patch5: setup-2.8.71-fullpath.patch
Patch6: tis-uid-gid.patch
Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
Patch8: passwd-remove-unused-default-users-and-groups.patch
+Patch9: snmpd-fm-user-group.patch
@@ -25,6 +25,7 @@ Patch7: setup-2.8.71-shlocal.patch
Patch8: tis-uid-gid.patch
Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
Patch10: passwd-remove-unused-default-users-and-groups.patch
+Patch11: snmpd-fm-user-group.patch
%description
The setup package contains a set of important system configuration and
@@ -39,6 +40,7 @@ setup files, such as passwd, group, and profile.
%patch6 -p1
%patch7 -p1
@@ -43,6 +44,7 @@ setup files, such as passwd, group, and profile.
%patch8 -p1
+%patch9 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
./shadowconvert.sh
--
1.8.3.1
2.7.4

1074
base/setup/centos/meta_patches/spec-include-tis-uid-gid.patch
View File

File diff suppressed because it is too large Load Diff

26
base/setup/centos/meta_patches/spec-passwd-remove-unused-default-users-and-groups.patch
View File

@ -1,7 +1,7 @@
From f882ce44d7e8574e9affc5e6471265029f9724ca Mon Sep 17 00:00:00 2001
From 1285d1381237a94df55df913aa268cd5bb9c6b89 Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Thu, 21 Jul 2016 11:47:55 -0400
Subject: [PATCH] spec: add patch to remove unused users and groups
Subject: [PATCH 05/15] spec: add patch to remove unused users and groups
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
---
@ -9,25 +9,25 @@ Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 3debacf..89ff683 100644
index 18283cd..10d151b 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -22,6 +22,7 @@ Patch4: setup-2.8.71-filesystems.patch
Patch5: setup-2.8.71-fullpath.patch
Patch6: tis-uid-gid.patch
Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
+Patch8: passwd-remove-unused-default-users-and-groups.patch
@@ -24,6 +24,7 @@ Patch6: setup-2.8.71-tapeid.patch
Patch7: setup-2.8.71-shlocal.patch
Patch8: tis-uid-gid.patch
Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
+Patch10: passwd-remove-unused-default-users-and-groups.patch
%description
The setup package contains a set of important system configuration and
@@ -37,6 +38,7 @@ setup files, such as passwd, group, and profile.
%patch5 -p1
%patch6 -p1
@@ -41,6 +42,7 @@ setup files, such as passwd, group, and profile.
%patch7 -p1
+%patch8 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
./shadowconvert.sh
--
1.8.3.1
2.7.4

39
base/setup/centos/meta_patches/spec-remove-unused-default-groups.patch
View File

@ -1,42 +1,33 @@
From e882a5dfad4ad41a256ea3867e1a4c4a08df9a98 Mon Sep 17 00:00:00 2001
From 22d06a6c5c7b44db10060bf95b623dc3c1943a9a Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Fri, 19 Aug 2016 09:28:43 -0400
Subject: [PATCH] spec: add patch to remove unused groups
Subject: [PATCH 08/15] spec: add patch to remove unused groups
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
---
SPECS/setup.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 6c18614..223bfd5 100644
index a612d24..3ad2458 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -1,7 +1,7 @@
Summary: A set of system configuration and setup files
Name: setup
Version: 2.8.71
-Release: 8%{?dist}
+Release: 9%{?dist}
License: Public Domain
Group: System Environment/Base
URL: https://fedorahosted.org/setup/
@@ -24,6 +24,7 @@ Patch6: tis-uid-gid.patch
Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
Patch8: passwd-remove-unused-default-users-and-groups.patch
Patch9: snmpd-fm-user-group.patch
+Patch10: remove-unused-default-groups.patch
@@ -26,6 +26,7 @@ Patch8: tis-uid-gid.patch
Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
Patch10: passwd-remove-unused-default-users-and-groups.patch
Patch11: snmpd-fm-user-group.patch
+Patch12: remove-unused-default-groups.patch
%description
The setup package contains a set of important system configuration and
@@ -41,6 +42,7 @@ setup files, such as passwd, group, and profile.
%patch7 -p1
%patch8 -p1
@@ -45,6 +46,7 @@ setup files, such as passwd, group, and profile.
%patch9 -p1
+%patch10 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
./shadowconvert.sh
--
1.8.3.1
2.7.4

28
base/setup/centos/meta_patches/spec-set-custom-prompt.patch
View File

@ -1,42 +1,46 @@
setup.spec: add custom shell login prompt
From d298b3b8a8a27e23d1589b99a2f9419505563a92 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Tue, 7 Aug 2018 22:53:18 +0800
Subject: [PATCH 03/15] setup.spec: add custom shell login prompt
A user can be set to use "sh" (which points to bash) as login prompt.
This makes the login shell to enter "POSIX" mode which will only
read/executes file /etc/profle and files in /etc/profiled.d. So create
custom login prompt in /etc/profiles.d
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/setup.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 3f74b90..184670f 100644
index 72cbcba..aa6b36e 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -7,6 +7,7 @@ Group: System Environment/Base
URL: https://fedorahosted.org/setup/
Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
URL: https://pagure.io/setup/
Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
Source1: motd
+Source2: prompt.sh
BuildArch: noarch
BuildRequires: bash tcsh perl
#require system release for saner dependency order
@@ -59,6 +60,7 @@ touch %{buildroot}/etc/fstab
@@ -63,6 +64,7 @@ touch %{buildroot}/etc/fstab
touch %{buildroot}/etc/subuid
touch %{buildroot}/etc/subgid
install -m 644 %{SOURCE1} %{buildroot}/etc/
+install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh
# remove unpackaged files from the buildroot
rm -f %{buildroot}/etc/Makefile
@@ -113,6 +115,7 @@ end
mkdir -p %{buildroot}/etc/profile.d
echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local
echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local
@@ -121,6 +123,7 @@ end
%config(noreplace) /etc/csh.cshrc
%config(noreplace) /etc/motd
%dir /etc/profile.d
+/etc/profile.d/prompt.sh
%config(noreplace) /etc/profile.d/sh.local
%config(noreplace) /etc/profile.d/csh.local
%config(noreplace) %verify(not md5 size mtime) /etc/shells
%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
--
1.8.3.1
2.7.4

27
base/setup/centos/meta_patches/updating-gids-and-uids-to-support-upgrade-from-wrl.patch
View File

@ -1,32 +1,33 @@
From b4a83aefe522dc1674c4979436398661f3ae4572 Mon Sep 17 00:00:00 2001
From 935277306d01c917b81fa33ebc7f27b0edd61f7f Mon Sep 17 00:00:00 2001
From: Bart Wensley <barton.wensley@windriver.com>
Date: Mon, 27 Jun 2016 12:28:36 -0400
Subject: [PATCH 1/1] updating-gids-and-uids-to-support-upgrade-from-wrl.patch
Subject: [PATCH 04/15]
updating-gids-and-uids-to-support-upgrade-from-wrl.patch
---
SPECS/setup.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 184670f..3debacf 100644
index aa6b36e..18283cd 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -21,6 +21,7 @@ Patch3: setup-2.8.71-uidgidchanges.patch
Patch4: setup-2.8.71-filesystems.patch
Patch5: setup-2.8.71-fullpath.patch
Patch6: tis-uid-gid.patch
+Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
@@ -23,6 +23,7 @@ Patch5: setup-2.8.71-fullpath.patch
Patch6: setup-2.8.71-tapeid.patch
Patch7: setup-2.8.71-shlocal.patch
Patch8: tis-uid-gid.patch
+Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch
%description
The setup package contains a set of important system configuration and
@@ -35,6 +36,7 @@ setup files, such as passwd, group, and profile.
%patch4 -p1
%patch5 -p1
@@ -39,6 +40,7 @@ setup files, such as passwd, group, and profile.
%patch6 -p1
+%patch7 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
./shadowconvert.sh
--
1.8.3.1
2.7.4

13
base/setup/centos/patches/add-fm-user-to-snmpd-group.patch
View File

@ -1,7 +1,15 @@
From 02610c6c7bf89593a9b1e98eb5ee0cfba5c48707 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Thu, 16 Aug 2018 00:13:14 +0800
Subject: [PATCH] add-fm-user-to-snmpd-group
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
group | 2 +-
group | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/group b/group
index a3bb69e..9b77aae 100644
--- a/group
+++ b/group
@@ -21,7 +21,7 @@ neutron:x:164:neutron
@ -13,3 +21,6 @@
heat:x:187:heat
nfv:x:172:nfv
fm:x:195:fm
--
2.7.4

18
base/setup/centos/patches/add-ironic-uid-gid.patch
View File

@ -1,11 +1,16 @@
commit 51c505c59a1512c011fcda01d0583a2ddc6f3337
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Mon Sep 25 11:39:29 2017 -0400
From 15d0ef24f88290887f1e154352b53f373a04e783 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Thu, 16 Aug 2018 00:15:04 +0800
Subject: [PATCH] add-ironic-uid-gid
add ironic group and passwd
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
group | 1 +
passwd | 1 +
2 files changed, 2 insertions(+)
diff --git a/group b/group
index 7d0244f..9979b99 100644
index f6a75e5..d9050fa 100644
--- a/group
+++ b/group
@@ -27,3 +27,4 @@ nfv:x:172:nfv
@ -22,3 +27,6 @@ index fce82e7..fb49ea3 100644
fm:x:195:195:fm-mgr:/var/lib/fm:/sbin/nologin
magnum:x:1870:1870:OpenStack Magnum Daemons:/var/lib/magnum:/sbin/nologin
+ironic:x:1874:1874:OpenStack Ironic Daemons:/var/lib/ironic:/sbin/nologin
--
2.7.4

8
base/setup/centos/patches/passwd-remove-unused-default-users-and-groups.patch
View File

@ -1,4 +1,4 @@
From 737295c6ad990e8e248fef6b378198c3326b90ba Mon Sep 17 00:00:00 2001
From fed037afbe78b47d46dbbd5838468e57bfe19884 Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Thu, 11 Aug 2016 18:24:25 -0400
Subject: [PATCH] passwd: remove unused default users and groups
@ -13,7 +13,7 @@ Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
2 files changed, 16 deletions(-)
diff --git a/group b/group
index c21e2de..87a03c1 100644
index 825edbb..0a0a1b0 100644
--- a/group
+++ b/group
@@ -1,11 +1,7 @@
@ -33,7 +33,7 @@ index c21e2de..87a03c1 100644
dialout::18:
floppy::19:
-games::20:
tape::30:
tape::33:
-video::39:
-ftp::50:
lock::54:
@ -62,5 +62,5 @@ index 548435f..46a3d52 100644
rabbitmq:x:121:121::/var/lib/rabbitmq:/bin/sh
nova:x:994:162::/var/lib/nova:/bin/false
--
1.8.3.1
2.7.4

8
base/setup/centos/patches/remove-unused-default-groups.patch
View File

@ -1,4 +1,4 @@
From d79451c9a047313fb8da27007ea9d99435e05ff2 Mon Sep 17 00:00:00 2001
From dbc791c8f24ffac0d98e86213e4d592660f6087c Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Fri, 19 Aug 2016 09:21:44 -0400
Subject: [PATCH] CGTS-4685: setup: remove unused default groups
@ -14,7 +14,7 @@ Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
1 file changed, 2 deletions(-)
diff --git a/group b/group
index 8794dde..0b93beb 100644
index 42a8ed1..a3bb69e 100644
--- a/group
+++ b/group
@@ -2,12 +2,10 @@ root::0:
@ -29,7 +29,7 @@ index 8794dde..0b93beb 100644
-man::15:
dialout::18:
floppy::19:
tape::30:
tape::33:
--
1.8.3.1
2.7.4

2
base/setup/centos/srpm_path
View File

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