1. photon
  2. Commit 7f9d2e1213eb8a0fdd18b64ded745ef93bf4526d
Browse code

Fix toybox conflicts

build system imprevements:
- use --noorder to install toolchain RPMS. We know the order better.
- improve logging, put more logs into stage/LOGS/build-<pkgname> folder.
- removed duplicated dist param
toybox:
- move /usr/bin/sed to /bin/sed to align with sed package
- remote kmod and systemd toys

Change-Id: Ia6b147e2fe0c7b356be209684d9c68e6302862c2
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3840
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Sharath George

Alexey Makhalov authored on 2017/09/22 09:30:39
Showing 47 changed files
SPECS/WALinuxAgent/WALinuxAgent.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Name:           WALinuxAgent
2 2 
 Summary:        The Windows Azure Linux Agent
3 3 
 Version:        2.2.14
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        Apache License Version 2.0
6 6 
 Group:          System/Daemons
7 7 
 Url:            https://github.com/Azure/WALinuxAgent
... ... 
@@ -23,9 +23,9 @@ Requires:       python-xml
23 23 
 Requires:       python-pyasn1
24 24 
 Requires:       openssh
25 25 
 Requires:       openssl
26 
-Requires:       util-linux
27 
-Requires:       sed
28 
-Requires:       grep
26 
+Requires:       (util-linux or toybox)
27 
+Requires:       /bin/sed
28 
+Requires:       /bin/grep
29 29 
 Requires:       sudo
30 30 
 Requires:       iptables
31 31 
 Requires:       systemd
... ... 
@@ -78,6 +78,8 @@ python2 setup.py check && python2 setup.py test
78 78 
 /usr/lib/python2.7/site-packages/*
79 79
80 80 
 %changelog
81 
+* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.14-2
82 
+- Requires /bin/grep, /bin/sed and util-linux or toybox
81 83 
 * Thu Jul 13 2017 Anish Swaminathan <anishs@vmware.com> 2.2.14-1
82 84 
 - Update to 2.2.14
83 85 
 * Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.0.18-4
SPECS/apache-maven/apache-maven.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Maven
2 2 
 Name:		apache-maven
3 3 
 Version:	3.5.0
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://maven.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -15,7 +15,7 @@ BuildRequires: openjdk8
15 15 
 BuildRequires: apache-ant
16 16 
 BuildRequires: wget >= 1.15
17 17 
 Requires: openjre8
18 
-Requires: which
18 
+Requires: /usr/bin/which
19 19
20 20 
 %define _prefix /var/opt/%{name}
21 21 
 %define _bindir %{_prefix}/bin
... ... 
@@ -77,6 +77,8 @@ done
77 77 
 %exclude %{_libdir}/jansi-native
78 78
79 79 
 %changelog
80 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.5.0-4
81 
+-   Requires /usr/bin/which
80 82 
 *   Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 3.5.0-3
81 83 
 -   Removed dependency on ANT_HOME
82 84 
 -   Removed apache-maven profile file
SPECS/atftp/atftp.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Advanced Trivial File Transfer Protocol (ATFTP) - TFTP server
2 2 
 Name:           atftp
3 3 
 Version:        0.7.1
4 
-Release:        7%{?dist}
4 
+Release:        8%{?dist}
5 5 
 URL:            http://sourceforge.net/projects/atftp
6 6 
 License:        GPLv2+ and GPLv3+ and LGPLv2+
7 7 
 Group:          System Environment/Daemons
... ... 
@@ -13,7 +13,8 @@ Source0:        http://sourceforge.net/projects/atftp/files/latest/download/%{na
13 13
14 14 
 BuildRequires:  systemd
15 15 
 Requires:       systemd
16 
-Requires:	shadow
16 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
17 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
17 18 
 Provides: tftp-server
18 19 
 Obsoletes: tftp-server
19 20
... ... 
@@ -129,10 +130,12 @@ fi
129 129
130 130
131 131 
 %changelog
132 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.1-8
133 
+-   Remove shadow from requires and use explicit tools for post actions
132 134 
 *   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.1-7
133 135 
 -   Fixed logic to restart the active services after upgrade
134 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.1-6
135 
--	GA - Bump release of all rpms
136 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.1-6
137 
+-   GA - Bump release of all rpms
136 138 
 *   Fri May 6 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.1-5
137 139 
 -   Adding post-install run time dependencies
138 140 
 *   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.1-4
... ... 
@@ -140,8 +143,8 @@ fi
140 140 
 *   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  0.7.1-3
141 141 
 -   Add systemd to Requires and BuildRequires.
142 142 
 -   Use systemctl to enable/disable service.
143 
-*	Mon Nov 23 2015 Xiaolin Li <xiaolinl@vmware.com> 0.7.1-2
144 
--	Chang tftpd from xinetd service to systemd service.
145 
-*       Thu Nov 12 2015 Kumar Kaushik <kaushikk@vmware.com> 0.7.1-1
146 
--       Initial build.  First version
143 
+*   Mon Nov 23 2015 Xiaolin Li <xiaolinl@vmware.com> 0.7.1-2
144 
+-   Chang tftpd from xinetd service to systemd service.
145 
+*   Thu Nov 12 2015 Kumar Kaushik <kaushikk@vmware.com> 0.7.1-1
146 
+-   Initial build.  First version
147 147
SPECS/bindutils/bindutils.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Domain Name System software
2 2 
 Name:		bindutils
3 3 
 Version:	9.10.4
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	ISC
6 6 
 URL:		http://www.isc.org/downloads/bind/
7 7 
 Source0:	ftp://ftp.isc.org/isc/bind9/%{version}-P1/bind-%{version}-P8.tar.gz
... ... 
@@ -10,7 +10,8 @@ Group:		Development/Tools
10 10 
 Vendor:		VMware, Inc.
11 11 
 Distribution:	Photon
12 12 
 Requires:	openssl
13 
-Requires:	shadow
13 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
14 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
14 15 
 BuildRequires:	openssl-devel
15 16 
 %description
16 17 
 BIND is open source software that implements the Domain Name System (DNS) protocols
... ... 
@@ -68,19 +69,21 @@ fi
68 68
69 69
70 70 
 %changelog
71 
-*       Fri Apr 14 2017 Kumar Kaushik <kaushikk@vmware.com> 9.10.4-3
72 
--       Upgrading version to 9.10.4-P8
73 
-*	Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.10.4-2
74 
--	add shadow to requires
75 
-*	Mon Jun 06 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 9.10.4-1
76 
--	Upgraded the version to 9.10.4
77 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.10.3-3
78 
--	GA - Bump release of all rpms
79 
-*       Fri Apr 29 2016 Xiaolin Li <xiaolinl@vmware.com> 9.10.3-2
80 
--       Add group named and user named
81 
-*       Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 9.10.3-1
82 
--       Updated to version 9.10.3
83 
-*	Tue Aug 11 2015 Divya Thaluru <dthaluru@vmware.com> 9.10.1-1
84 
--	Fixing release
85 
-*	Tue Jan 20 2015 Divya Thaluru <dthaluru@vmware.com> 9.10.1-P1
86 
--	Initial build. First version
71 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 9.10.4-4
72 
+-   Remove shadow from requires and use explicit tools for post actions
73 
+*   Fri Apr 14 2017 Kumar Kaushik <kaushikk@vmware.com> 9.10.4-3
74 
+-   Upgrading version to 9.10.4-P8
75 
+*   Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.10.4-2
76 
+-   add shadow to requires
77 
+*   Mon Jun 06 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 9.10.4-1
78 
+-   Upgraded the version to 9.10.4
79 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.10.3-3
80 
+-   GA - Bump release of all rpms
81 
+*   Fri Apr 29 2016 Xiaolin Li <xiaolinl@vmware.com> 9.10.3-2
82 
+-   Add group named and user named
83 
+*   Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 9.10.3-1
84 
+-   Updated to version 9.10.3
85 
+*   Tue Aug 11 2015 Divya Thaluru <dthaluru@vmware.com> 9.10.1-1
86 
+-   Fixing release
87 
+*   Tue Jan 20 2015 Divya Thaluru <dthaluru@vmware.com> 9.10.1-P1
88 
+-   Initial build. First version
SPECS/c-rest-engine/c-rest-engine.spec
History View file @ 7f9d2e1
... ... 
@@ -1,13 +1,12 @@
1 1 
 Name:          c-rest-engine
2 2 
 Summary:       minimal http(s) server library
3 3 
 Version:       1.0.4
4 
-Release:       2%{?dist}
4 
+Release:       3%{?dist}
5 5 
 Group:         Applications/System
6 6 
 Vendor:        VMware, Inc.
7 7 
 License:       Apache 2.0
8 8 
 URL:           http://www.github.com/vmware/c-rest-engine
9 9 
 BuildArch:     x86_64
10 
-Requires:      coreutils >= 8.22
11 10 
 Requires:      openssl >= 1.0.1
12 11 
 BuildRequires: coreutils >= 8.22
13 12 
 BuildRequires: openssl-devel >= 1.0.1
... ... 
@@ -22,7 +21,6 @@ API support for C daemons.
22 22
23 23 
 %package devel
24 24 
 Summary: c-rest-engine dev files
25 
-Requires:  coreutils >= 8.22
26 25 
 Requires:  openssl-devel >= 1.0.1
27 26 
 Requires:  %{name} = %{version}-%{release}
28 27
... ... 
@@ -64,6 +62,8 @@ find %{buildroot} -name '*.la' -delete
64 64 
 # %doc ChangeLog README COPYING
65 65
66 66 
 %changelog
67 
+*  Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.4-3
68 
+-  Remove coreutils runtime dependency.
67 69 
 *  Tue Sep 12 2017 Kumar Kaushik <kaushikk@vmware.com> 1.0.4-2
68 70 
 -  Making default log level as ERROR.
69 71 
 *  Mon Sep 11 2017 Kumar Kaushik <kaushikk@vmware.com> 1.0.4-1
SPECS/ceph/ceph.spec
History View file @ 7f9d2e1
... ... 
@@ -13,7 +13,7 @@
13 13 
 #################################################################################
14 14 
 Name:       ceph
15 15 
 Version:    11.2.0
16 
-Release:    9%{?dist}
16 
+Release:    10%{?dist}
17 17 
 Epoch:      1
18 18 
 Summary:    User space components of the Ceph file system
19 19 
 License:    LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
... ... 
@@ -57,7 +57,7 @@ BuildRequires:  python3-xml
57 57 
 BuildRequires:  python-requests
58 58 
 BuildRequires:  python-sphinx
59 59 
 BuildRequires:  snappy-devel
60 
-BuildRequires:  util-linux
60 
+BuildRequires:  (util-linux or toybox)
61 61 
 BuildRequires:  valgrind
62 62 
 BuildRequires:  xfsprogs
63 63 
 BuildRequires:  xfsprogs-devel
... ... 
@@ -99,12 +99,12 @@ Requires:      librgw2 = %{epoch}:%{version}-%{release}
99 99 
 Requires:      python2
100 100 
 Requires:      python-requests
101 101 
 Requires:      python-setuptools
102 
-Requires:      grep
102 
+Requires:      /bin/grep
103 103 
 Requires:      xfsprogs
104 104 
 Requires:      logrotate
105 
-Requires:      util-linux
106 
-Requires:      findutils
107 
-Requires:      which
105 
+Requires:      (util-linux or toybox)
106 
+Requires:      (findutils or toybox)
107 
+Requires:      /usr/bin/which
108 108 
 %description base
109 109 
 Base is the package that includes all the files shared amongst ceph servers
110 110
... ... 
@@ -997,6 +997,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
997 997 
 # actually build this meta package.
998 998
999 999 
 %changelog
1000 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 11.2.0-10
1001 
+-   Requires /bin/grep, /usr/bin/which, or toybox
1000 1002 
 *   Tue Aug 22 2017 Dheeraj Shetty <dheerajs@vmware.com> 11.2.0-9
1001 1003 
 -   Add version and release number to python-ceph
1002 1004 
 *   Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 11.2.0-8
SPECS/cloud-init/cloud-init.spec
History View file @ 7f9d2e1
... ... 
@@ -2,7 +2,7 @@
2 2
3 3 
 Name:           cloud-init
4 4 
 Version:        0.7.9
5 
-Release:        11%{?dist}
5 
+Release:        12%{?dist}
6 6 
 Summary:        Cloud instance init scripts
7 7 
 Group:          System Environment/Base
8 8 
 License:        GPLv3
... ... 
@@ -32,7 +32,7 @@ BuildRequires:  python3-setuptools
32 32 
 BuildRequires:  python3-xml
33 33
34 34 
 Requires:       systemd
35 
-Requires:       net-tools
35 
+Requires:       (net-tools or toybox)
36 36 
 Requires:       python3
37 37 
 Requires:       python3-libs
38 38 
 Requires:       python3-configobj
... ... 
@@ -134,7 +134,9 @@ rm -rf $RPM_BUILD_ROOT
134 134
135 135
136 136 
 %changelog
137 
-*   Wed Sep 21 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-11
137 
+*   Wed Sep 20 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.9-12
138 
+-   Requires net-tools or toybox
139 
+*   Wed Sep 20 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-11
138 140 
 -   Fix the interface id returned from vmxguestinfo
139 141 
 *   Tue Aug 22 2017 Chang Lee <changlee@vmware.com> 0.7.9-10
140 142 
 -   Fixed %check
SPECS/cloud-utils/cloud-utils.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Shell script to auto detect free size on disk and grow partition.
2 2 
 Name:           cloud-utils
3 3 
 Version:        0.30
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        GPLv3
6 6 
 Group:          System Environment
7 7 
 Source0:        https://launchpad.net/cloud-utils/trunk/%{version}/+download/cloud-utils-%{version}.tar.gz
... ... 
@@ -10,7 +10,7 @@ Vendor:         VMware Inc
10 10 
 Distribution:   Photon
11 11 
 Requires:       gptfdisk
12 12 
 Requires:       gawk
13 
-Requires:       util-linux
13 
+Requires:       (util-linux or toybox)
14 14 
 BuildArch:      noarch
15 15
16 16 
 %define sha1 cloud-utils=c90ccaaac0d5e28b0a0564770af2af2d2c95f0de
... ... 
@@ -35,7 +35,9 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/
35 35 
 %doc %{_mandir}/man1/growpart.*
36 36
37 37 
 %changelog
38 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 0.30-3
39 
+-   Requires util-linux or toybox
38 40 
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.30-2
39 41 
 -   Fix arch
40 
-*       Wed Mar 29 2017 Kumar Kaushik <kaushikk@vmware.com> 0.30-1
41 
--       Initial build.  First version
42 
+*   Wed Mar 29 2017 Kumar Kaushik <kaushikk@vmware.com> 0.30-1
43 
+-   Initial build.  First version
SPECS/dracut/dracut.spec
History View file @ 7f9d2e1
... ... 
@@ -5,7 +5,7 @@
5 5
6 6 
 Name:           dracut
7 7 
 Version:        045
8 
-Release:        4%{?dist}
8 
+Release:        5%{?dist}
9 9 
 Group:          System Environment/Base
10 10 
 # The entire source code is GPLv2+
11 11 
 # except install/* which is LGPLv2+
... ... 
@@ -27,14 +27,14 @@ BuildRequires:  bash git
27 27 
 BuildRequires:  pkg-config
28 28 
 BuildRequires:  kmod-devel
29 29 
 Requires:       bash >= 4
30 
-Requires:       coreutils
31 
-Requires:       util-linux
32 
-Requires:       systemd
33 
-Requires:       sed
34 
-Requires:       grep
35 
-Requires:       findutils
36 
-Requires:       cpio
30 
+Requires:       (coreutils or toybox)
37 31 
 Requires:       kmod
32 
+Requires:       (util-linux or toybox)
33 
+Requires:       systemd
34 
+Requires:       /bin/sed
35 
+Requires:       /bin/grep
36 
+Requires:       (findutils or toybox)
37 
+Requires:       (cpio or toybox)
38 38
39 39 
 %description
40 40 
 dracut contains tools to create a bootable initramfs for 2.6 Linux kernels.
... ... 
@@ -165,6 +165,9 @@ rm -rf -- $RPM_BUILD_ROOT
165 165 
 %dir /var/lib/dracut/overlay
166 166
167 167 
 %changelog
168 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 045-5
169 
+-   Requires coreutils/util-linux/findutils or toybox,
170 
+    /bin/grep, /bin/sed
168 171 
 *   Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 045-4
169 172 
 -   Add kmod-devel to BuildRequires
170 173 
 *   Fri May 26 2017 Bo Gan <ganb@vmware.com> 045-3
... ... 
@@ -175,14 +178,14 @@ rm -rf -- $RPM_BUILD_ROOT
175 175 
 -   Updated to 045
176 176 
 *   Wed Jan 25 2017 Harish Udaiya Kumar <hudaiyakumr@vmware.com> 044-6
177 177 
 -   Added the patch for bash 4.4 support.
178 
-*       Wed Nov 23 2016 Anish Swaminathan <anishs@vmware.com>  044-5
179 
--       Add systemd initrd root device target to list of modules
180 
-*       Fri Oct 07 2016 ChangLee <changlee@vmware.com> 044-4
181 
--       Modified %check
178 
+*   Wed Nov 23 2016 Anish Swaminathan <anishs@vmware.com>  044-5
179 
+-   Add systemd initrd root device target to list of modules
180 
+*   Fri Oct 07 2016 ChangLee <changlee@vmware.com> 044-4
181 
+-   Modified %check
182 182 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 044-3
183 183 
 -   GA - Bump release of all rpms
184 
-*       Thu Apr 25 2016 Gengsheng Liu <gengshengl@vmware.com> 044-2
185 
--       Fix incorrect systemd directory.
184 
+*   Thu Apr 25 2016 Gengsheng Liu <gengshengl@vmware.com> 044-2
185 
+-   Fix incorrect systemd directory.
186 186 
 *   Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 044-1
187 
--       Updating Version.
187 
+-   Updating Version.
188 188
SPECS/elfutils/elfutils.spec
History View file @ 7f9d2e1
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:	A collection of utilities and DSOs to handle compiled objects
3 3 
 Name:		elfutils
4 4 
 Version:	0.169
5 
-Release:	1%{?dist}
5 
+Release:	2%{?dist}
6 6 
 License:	GPLv3+ and (GPLv2+ or LGPLv3+)
7 7 
 Group:		Development/Tools
8 8 
 URL:    	https://sourceware.org/elfutils
... ... 
@@ -14,7 +14,7 @@ Distribution:	Photon
14 14 
 Obsoletes:	libelf libelf-devel
15 15 
 Requires:	elfutils-libelf = %{version}-%{release}
16 16 
 Requires:	glibc >= 2.7
17 
-Requires:	bzip2
17 
+Requires:	bzip2-libs
18 18 
 # ExcludeArch: xxx
19 19
20 20 
 BuildRequires:	gcc >= 4.1.2-33
... ... 
@@ -195,6 +195,8 @@ rm -rf ${RPM_BUILD_ROOT}
195 195 
 %defattr(-,root,root)
196 196
197 197 
 %changelog
198 
+* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 0.169-2
199 
+- Requires bzip2-libs
198 200 
 * Tue Jul 11 2017 Divya Thaluru <dthaluru@vmware.com> 0.169-1
199 201 
 - Updated to 0.169
200 202 
 * Mon Apr 03 2017 Chang Lee <changlee@vmware.com> 0.168-1
SPECS/etcd/etcd.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Etcd-3.1.5
2 2 
 Name:           etcd
3 3 
 Version:        3.1.5
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 License:        Apache License
6 6 
 URL:            https://github.com/coreos/etcd
7 7 
 Group:          System Environment/Security
... ... 
@@ -11,7 +11,6 @@ Source0:        %{name}-%{version}.tar.gz
11 11 
 %define sha1 etcd=a020efbd8bc7777e77b960b461886d26b2cedecd
12 12 
 Source1:        etcd.service
13 13 
 BuildRequires:  go >= 1.7
14 
-Requires:       shadow
15 14
16 15 
 %description
17 16 
 A highly-available key value store for shared configuration and service discovery.
... ... 
@@ -60,6 +59,8 @@ rm -rf %{buildroot}/*
60 60 
 %config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml
61 61
62 62 
 %changelog
63 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1.5-4
64 
+-   Remove shadow requires
63 65 
 *   Sun Aug 27 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.1.5-3
64 66 
 -   File based configuration for etcd service.
65 67 
 *   Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.1.5-2
SPECS/gcc/gcc.spec
History View file @ 7f9d2e1
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Contains the GNU compiler collection
3 3 
 Name:           gcc
4 4 
 Version:        6.3.0
5 
-Release:        4%{?dist}
5 
+Release:        5%{?dist}
6 6 
 License:        GPLv2+
7 7 
 URL:            http://gcc.gnu.org
8 8 
 Group:          Development/Tools
... ... 
@@ -134,8 +134,10 @@ ln -sv gcc %{buildroot}%{_bindir}/cc
134 134 
 install -vdm 755 %{buildroot}%{_datarootdir}/gdb/auto-load%{_lib}
135 135 
 %ifarch x86_64
136 136 
     mv -v %{buildroot}%{_lib64dir}/*gdb.py %{buildroot}%{_datarootdir}/gdb/auto-load%{_lib}
137 
+    chmod 755 %{buildroot}/%{_lib64dir}/libgcc_s.so.1
137 138 
 %else
138 139 
     mv -v %{buildroot}%{_libdir}/*gdb.py %{buildroot}%{_datarootdir}/gdb/auto-load%{_lib}
140 
+    chmod 755 %{buildroot}/%{_lib}/libgcc_s.so.1
139 141 
 %endif
140 142 
 rm -rf %{buildroot}%{_infodir}
141 143 
 popd
... ... 
@@ -265,6 +267,8 @@ make %{?_smp_mflags} check-gcc
265 265 
 %endif
266 266
267 267 
 %changelog
268 
+*   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-5
269 
+-   Enable elfdeps for libgcc_s to generate libgcc_s.so.1(*)(64bit) provides
268 270 
 *   Mon Aug 28 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-4
269 271 
 -   Fix makecheck
270 272 
 *   Tue Aug 15 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-3
SPECS/httpd/httpd.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        The Apache HTTP Server
2 2 
 Name:           httpd
3 3 
 Version:        2.4.27
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        Apache License 2.0
6 6 
 URL:            http://httpd.apache.org/
7 7 
 Group:          Applications/System
... ... 
@@ -25,7 +25,8 @@ Requires:       apr-util
25 25 
 Requires:       openssl
26 26 
 Requires:       openldap
27 27 
 Requires:       lua
28 
-Requires:       shadow
28 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
29 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
29 30 
 Provides:       apache2
30 31 
 %description
31 32 
 The Apache HTTP Server.
... ... 
@@ -180,6 +181,8 @@ fi
180 180 
 %{_bindir}/dbmmanage
181 181
182 182 
 %changelog
183 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.4.27-3
184 
+-   Remove shadow from requires and use explicit tools for post actions
183 185 
 *   Mon Aug 07 2017 Anish Swaminathan <anishs@vmware.com>  2.4.27-2
184 186 
 -   Add shadow to requires for useradd/groupadd
185 187 
 *   Mon Jul 24 2017 Anish Swaminathan <anishs@vmware.com>  2.4.27-1
SPECS/kubernetes/kubernetes.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Kubernetes cluster management
2 2 
 Name:           kubernetes
3 3 
 Version:        1.7.5
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz
7 7 
 Source0:        kubernetes-v%{version}.tar.gz
... ... 
@@ -20,9 +20,10 @@ Requires:       etcd >= 3.0.4
20 20 
 Requires:       ethtool
21 21 
 Requires:       iptables
22 22 
 Requires:       iproute2
23 
-Requires:       shadow
23 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
24 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
24 25 
 Requires:       socat
25 
-Requires:       util-linux
26 
+Requires:       (util-linux or toybox)
26 27
27 28 
 %description
28 29 
 Kubernetes is an open source implementation of container cluster management.
... ... 
@@ -174,6 +175,9 @@ fi
174 174 
 %{_bindir}/pause-amd64
175 175
176 176 
 %changelog
177 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.5-2
178 
+-   Requires util-linux or toybox
179 
+-   Remove shadow from requires and use explicit tools for post actions
177 180 
 *   Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.5-1
178 181 
 -   k8s v1.7.5.
179 182 
 *   Thu Aug 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.0-3
SPECS/lightwave/lightwave.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Name:          lightwave
2 2 
 Summary:       VMware Lightwave
3 3 
 Version:       1.3.1
4 
-Release:       4%{?dist}
4 
+Release:       5%{?dist}
5 5 
 License:       Apache 2.0
6 6 
 Group:         Applications/System
7 7 
 Vendor:        VMware, Inc.
... ... 
@@ -14,7 +14,7 @@ Distribution:  Photon
14 14 
 Requires:  apache-tomcat >= 8.5.8
15 15 
 Requires:  boost = 1.63.0
16 16 
 Requires:  commons-daemon >= 1.0.15
17 
-Requires:  coreutils >= 8.22
17 
+Requires:  (coreutils >= 8.22 or toybox)
18 18 
 Requires:  cyrus-sasl >= 2.1
19 19 
 Requires:  e2fsprogs
20 20 
 Requires:  gawk >= 4.1.3
... ... 
@@ -1119,6 +1119,8 @@ fi
1119 1119 
 # %doc ChangeLog README COPYING
1120 1120
1121 1121 
 %changelog
1122 
+*   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.1-5
1123 
+-   Requires coreutils or toybox
1122 1124 
 *   Fri Sep 22 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.1-4
1123 1125 
 -   Patch for unix gsssapi creds separation
1124 1126 
 *   Tue Aug 22 2017 Rui Gu <ruig@vmware.com> 1.3.1-3
SPECS/likewise-open/likewise-open.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Name: 		likewise-open
2 2 
 Summary: 	Likewise Open
3 3 
 Version: 	6.2.11.4
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 Group: 		Development/Libraries
6 6 
 Vendor:         VMware, Inc.
7 7 
 License: 	GPL 2.0,LGPL 2.1
... ... 
@@ -10,15 +10,15 @@ Source0:        %{name}-%{version}.tar.gz
10 10 
 %define sha1 likewise-open=6aa4cf11de6747d5f8940666c21adc3e1f7b6a4b
11 11 
 Distribution:   Photon
12 12 
 Requires:       Linux-PAM
13 
-Requires:       coreutils >= 8.22
14 
-Requires:       grep
13 
+Requires:       (coreutils >= 8.22 or toybox)
14 
+Requires:       /bin/grep
15 15 
 Requires:       krb5 >= 1.12
16 16 
 Requires:       libxml2
17 17 
 Requires:       haveged >= 1.9
18 18 
 Requires:       openldap >= 2.4
19 19 
 Requires:       openssl >= 1.0.1
20 
-Requires:       procps-ng
21 
-Requires:       sed >= 4.2
20 
+Requires:       (procps-ng or toybox)
21 
+Requires:       /bin/sed
22 22 
 Requires:       sqlite-libs
23 23 
 BuildRequires:  Linux-PAM-devel
24 24 
 BuildRequires:  e2fsprogs-devel
... ... 
@@ -288,6 +288,8 @@ rm -rf %{buildroot}/*
288 288 
 /opt/likewise/lib64/pkgconfig/libedit.pc
289 289
290 290 
 %changelog
291 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 6.2.11.4-3
292 
+-   Requires coreutils/procps-ng or toybox, /bin/grep, /bin/sed
291 293 
 *   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 6.2.11.4-2
292 294 
 -   Fix compilation issue for glibc-2.26
293 295 
 *   Wed Aug 09 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.2.11.4-1
SPECS/linux/linux-esx.spec
History View file @ 7f9d2e1
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Kernel
3 3 
 Name:           linux-esx
4 4 
 Version:        4.9.47
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 License:        GPLv2
7 7 
 URL:            http://www.kernel.org/
8 8 
 Group:          System Environment/Kernel
... ... 
@@ -49,7 +49,8 @@ BuildRequires: libmspack-devel
49 49 
 BuildRequires: Linux-PAM-devel
50 50 
 BuildRequires: openssl-devel
51 51 
 BuildRequires: procps-ng-devel
52 
-Requires:      filesystem kmod coreutils
52 
+Requires:      filesystem kmod
53 
+Requires(post):(coreutils or toybox)
53 54 
 %define uname_r %{version}-%{release}-esx
54 55
55 56 
 %description
... ... 
@@ -192,6 +193,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
192 192 
 /usr/src/linux-headers-%{uname_r}
193 193
194 194 
 %changelog
195 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-2
196 
+-   Requires coreutils or toybox
195 197 
 *   Mon Sep 04 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-1
196 198 
 -   Fix CVE-2017-11600
197 199 
 *   Mon Aug 14 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.43-1
SPECS/linux/linux-secure.spec
History View file @ 7f9d2e1
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Kernel
3 3 
 Name:           linux-secure
4 4 
 Version:        4.9.47
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 License:        GPLv2
7 7 
 URL:            http://www.kernel.org/
8 8 
 Group:          System Environment/Kernel
... ... 
@@ -62,7 +62,8 @@ BuildRequires:  libmspack-devel
62 62 
 BuildRequires:  Linux-PAM-devel
63 63 
 BuildRequires:  openssl-devel
64 64 
 BuildRequires:  procps-ng-devel
65 
-Requires:       filesystem kmod coreutils
65 
+Requires:       filesystem kmod
66 
+Requires(post):(coreutils or toybox)
66 67 
 %define uname_r %{version}-%{release}-secure
67 68
68 69 
 %description
... ... 
@@ -260,6 +261,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
260 260 
 /usr/src/linux-headers-%{uname_r}
261 261
262 262 
 %changelog
263 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-2
264 
+-   Requires coreutils or toybox
263 265 
 *   Mon Sep 04 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-1
264 266 
 -   Fix CVE-2017-11600
265 267 
 *   Tue Aug 22 2017 Anish Swaminathan <anishs@vmware.com> 4.9.43-2
SPECS/linux/linux.spec
History View file @ 7f9d2e1
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Kernel
3 3 
 Name:           linux
4 4 
 Version:        4.9.47
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 License:    	GPLv2
7 7 
 URL:        	http://www.kernel.org/
8 8 
 Group:        	System Environment/Kernel
... ... 
@@ -59,7 +59,8 @@ BuildRequires:  Linux-PAM-devel
59 59 
 BuildRequires:  openssl-devel
60 60 
 BuildRequires:  procps-ng-devel
61 61 
 BuildRequires:	audit-devel
62 
-Requires:       filesystem kmod coreutils
62 
+Requires:       filesystem kmod
63 
+Requires(post):(coreutils or toybox)
63 64 
 %define uname_r %{version}-%{release}
64 65
65 66 
 %description
... ... 
@@ -300,6 +301,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
300 300 
 /usr/share/doc/*
301 301
302 302 
 %changelog
303 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-2
304 
+-   Requires coreutils or toybox
303 305 
 *   Mon Sep 04 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-1
304 306 
 -   Fix CVE-2017-11600
305 307 
 *   Tue Aug 22 2017 Anish Swaminathan <anishs@vmware.com> 4.9.43-2
SPECS/man-db/man-db.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Programs for finding and viewing man pages
2 2 
 Name:           man-db
3 3 
 Version:        2.7.6
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 License:        GPLv2+
6 6 
 URL:            http://www.nongnu.org/man-db
7 7 
 Group:          Applications/System
... ... 
@@ -13,7 +13,11 @@ Requires:       libpipeline
13 13 
 Requires:       gdbm
14 14 
 Requires:       xz
15 15 
 Requires:       groff
16 
-Requires:       shadow
16 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
17 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
18 
+%if %{with_check}
19 
+BuildRequires:  shadow
20 
+%endif
17 21 
 BuildRequires:  libpipeline
18 22 
 BuildRequires:  gdbm-devel
19 23 
 BuildRequires:  xz
... ... 
@@ -74,6 +78,8 @@ fi
74 74 
 %{_libdir}/tmpfiles.d/man-db.conf
75 75
76 76 
 %changelog
77 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.7.6-4
78 
+-   Remove shadow from requires and use explicit tools for post actions
77 79 
 *   Fri Aug 04 2017 Chang Lee <changlee@vmware.com> 2.7.6-3
78 80 
 -   Setup a testing environment before %check
79 81 
 *   Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.6-2
SPECS/nfs-utils/nfs-utils.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        NFS client utils
2 2 
 Name:           nfs-utils
3 3 
 Version:        2.1.1
4 
-Release:        5%{?dist}
4 
+Release:        6%{?dist}
5 5 
 License:        GPLv2+
6 6 
 URL:            http://sourceforge.net/projects/nfs
7 7 
 Group:          Applications/Nfs-utils-client
... ... 
@@ -21,7 +21,7 @@ BuildRequires:  libtirpc-devel
21 21 
 BuildRequires:  python3-devel
22 22 
 Requires:       libtirpc
23 23 
 Requires:       rpcbind
24 
-Requires:       shadow
24 
+Requires:       (shadow or toybox)
25 25 
 Requires:       python3-libs
26 26
27 27 
 %description
... ... 
@@ -80,6 +80,8 @@ make check
80 80 
 /lib/systemd/system/*
81 81
82 82 
 %changelog
83 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.1.1-6
84 
+-   Requires shadow or toybox
83 85 
 *   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 2.1.1-5
84 86 
 -   Fix compilation issue for glibc-2.26
85 87 
 *   Wed Aug 16 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.1-4
SPECS/nodejs/nodejs.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        A JavaScript runtime built on Chrome's V8 JavaScript engine.
2 2 
 Name:           nodejs
3 3 
 Version:        7.7.4
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        MIT
6 6 
 Group:          Applications/System
7 7 
 Vendor:         VMware, Inc.
... ... 
@@ -12,7 +12,8 @@ Source0:        node-%{version}.tar.gz
12 12 
 BuildArch:      x86_64
13 13
14 14 
 BuildRequires:  coreutils >= 8.22, openssl-devel >= 1.0.1
15 
-Requires:       coreutils >= 8.22, openssl >= 1.0.1
15 
+Requires:       (coreutils >= 8.22 or toybox)
16 
+Requires:       openssl >= 1.0.1
16 17
17 18 
 %description
18 19 
 Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient. The Node.js package ecosystem, npm, is the largest ecosystem of open source libraries in the world.
... ... 
@@ -52,8 +53,7 @@ done
52 52 
 %check
53 53 
 make cctest
54 54
55 
-%post
56 
-    /sbin/ldconfig
55 
+%post -p /sbin/ldconfig
57 56
58 57 
 %files
59 58 
 %defattr(-,root,root)
... ... 
@@ -70,6 +70,8 @@ make cctest
70 70 
 %{_datadir}/systemtap/tapset/node.stp
71 71
72 72 
 %changelog
73 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 7.7.4-3
74 
+-   Requires coreutils or toybox
73 75 
 *   Fri Jul 14 2017 Chang Lee <changlee@vmware.com> 7.7.4-2
74 76 
 -   Updated %check
75 77 
 *   Mon Mar 20 2017 Xiaolin Li <xiaolinl@vmware.com> 7.7.4-1
SPECS/ntp/ntp.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Network Time Protocol reference implementation
2 2 
 Name:           ntp
3 3 
 Version:        4.2.8p10
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 License:        NTP
6 6 
 URL:            http://www.ntp.org/
7 7 
 Group:          System Environment/NetworkingPrograms
... ... 
@@ -20,7 +20,7 @@ BuildRequires:  unzip
20 20 
 BuildRequires:  systemd
21 21 
 BuildRequires:  openssl-devel
22 22 
 Requires:       systemd
23 
-Requires:       shadow
23 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
24 24 
 Requires:       openssl
25 25 
 Requires:       libcap >= 2.24
26 26 
 %description
... ... 
@@ -144,6 +144,8 @@ rm -rf %{buildroot}/*
144 144 
 %{_mandir}/man8/ntpstat.8*
145 145
146 146 
 %changelog
147 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 4.2.8p10-4
148 
+-   Remove shadow from requires and use explicit tools for post actions
147 149 
 *   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  4.2.8p10-3
148 150 
 -   Disabled ntpd service by default
149 151 
 *   Mon Apr 10 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.8p10-2
SPECS/openssh/openssh.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Free version of the SSH connectivity tools
2 2 
 Name:           openssh
3 3 
 Version:        7.5p1
4 
-Release:        6%{?dist}
4 
+Release:        7%{?dist}
5 5 
 License:        BSD
6 6 
 URL:            https://www.openssh.com/
7 7 
 Group:          System Environment/Security
... ... 
@@ -38,7 +38,7 @@ This provides the ssh client utilities.
38 38 
 %package server
39 39 
 Summary: openssh server applications
40 40 
 Requires:   Linux-PAM
41 
-Requires:   shadow
41 
+Requires:   (shadow or toybox)
42 42 
 Requires:   ncurses-terminfo
43 43 
 Requires:   openssh-clients = %{version}-%{release}
44 44 
 Requires(post): /bin/chown
... ... 
@@ -178,6 +178,8 @@ rm -rf %{buildroot}/*
178 178 
 %{_mandir}/man8/ssh-pkcs11-helper.8.gz
179 179
180 180 
 %changelog
181 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 7.5p1-7
182 
+-   Requires shadow or toybox
181 183 
 *   Thu Sep 14 2017 Alexey Makhalov <amakhalov@vmware.com> 7.5p1-6
182 184 
 -   sshd config: revert MaxSessions to original value
183 185 
 *   Thu Aug 31 2017 Alexey Makhalov <amakhalov@vmware.com> 7.5p1-5
SPECS/pgbouncer/pgbouncer.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Connection pooler for PostgreSQL.
2 2 
 Name:		pgbouncer
3 3 
 Version:	1.7.2
4 
-Release:	6%{?dist}
4 
+Release:	7%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		https://wiki.postgresql.org/wiki/PgBouncer
7 7 
 Source0:        https://pgbouncer.github.io/downloads/files/1.7.2/%{name}-%{version}.tar.gz
... ... 
@@ -16,7 +16,8 @@ BuildRequires:  systemd
16 16 
 BuildRequires:  pkg-config
17 17 
 Requires:		libevent
18 18 
 Requires:		openssl
19 
-Requires:		shadow
19 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
20 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
20 21 
 %description
21 22 
 Pgbouncer is a light-weight, robust connection pooler for PostgreSQL.
22 23
... ... 
@@ -79,6 +80,8 @@ fi
79 79 
 /usr/share/doc/pgbouncer/*
80 80
81 81 
 %changelog
82 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.2-7
83 
+-   Remove shadow from requires and use explicit tools for post actions
82 84 
 *   Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.7.2-6
83 85 
 -   Seperate the service file from the spec file
84 86 
 *   Wed May 31 2017 Rongrong Qiu <rqiu@vmware.com> 1.7.2-5
SPECS/python2/python2.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        A high-level scripting language
2 2 
 Name:           python2
3 3 
 Version:        2.7.13
4 
-Release:        9%{?dist}
4 
+Release:        10%{?dist}
5 5 
 License:        PSF
6 6 
 URL:            http://www.python.org/
7 7 
 Group:          System Environment/Programming
... ... 
@@ -22,7 +22,6 @@ BuildRequires:  libffi-devel >= 3.0.13
22 22 
 BuildRequires:  sqlite-devel
23 23 
 BuildRequires:  ncurses-devel
24 24 
 BuildRequires:  readline-devel
25 
-Requires:       bzip2
26 25 
 Requires:       openssl
27 26 
 Requires:       python2-libs = %{version}-%{release}
28 27 
 Provides:       python-sqlite
... ... 
@@ -43,8 +42,9 @@ Requires:       sqlite-libs
43 43 
 Requires:       expat >= 2.1.0
44 44 
 Requires:       libffi >= 3.0.13
45 45 
 Requires:       ncurses
46 
-Requires:       coreutils
46 
+Requires:       (coreutils or toybox)
47 47 
 Requires:       gdbm
48 
+Requires:       bzip2-libs
48 49
49 50 
 # Needed for ctypes, to load libraries, worked around for Live CDs size
50 51 
 # Requires: binutils
... ... 
@@ -236,6 +236,9 @@ make test
236 236 
 %{_libdir}/python2.7/test/*
237 237
238 238 
 %changelog
239 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.7.13-10
240 
+-   Requires coreutils or toybox
241 
+-   Requires bzip2-libs
239 242 
 *   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 2.7.13-9
240 243 
 -   Remove devpts mount in check
241 244 
 *   Mon Aug 28 2017 Chang Lee <changlee@vmware.com> 2.7.13-8
SPECS/python3/python3.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        A high-level scripting language
2 2 
 Name:           python3
3 3 
 Version:        3.6.1
4 
-Release:        8%{?dist}
4 
+Release:        9%{?dist}
5 5 
 License:        PSF
6 6 
 URL:            http://www.python.org/
7 7 
 Group:          System Environment/Programming
... ... 
@@ -19,7 +19,6 @@ BuildRequires:  ncurses-devel
19 19 
 BuildRequires:  openssl-devel
20 20 
 BuildRequires:  readline-devel
21 21 
 BuildRequires:  xz-devel
22 
-Requires:       bzip2
23 22 
 Requires:       ncurses
24 23 
 Requires:       openssl
25 24 
 Requires:       python3-libs = %{version}-%{release}
... ... 
@@ -44,11 +43,12 @@ BuildRequires:  expat-devel >= 2.1.0
44 44 
 BuildRequires:  libffi-devel >= 3.0.13
45 45 
 BuildRequires:  ncurses-devel
46 46 
 BuildRequires:  sqlite-devel
47 
-Requires:       coreutils
47 
+Requires:       (coreutils or toybox)
48 48 
 Requires:       expat >= 2.1.0
49 49 
 Requires:       libffi >= 3.0.13
50 50 
 Requires:       ncurses
51 51 
 Requires:       sqlite-libs
52 
+Requires:       bzip2-libs
52 53
53 54
54 55 
 %description    libs
... ... 
@@ -263,6 +263,9 @@ rm -rf %{buildroot}/*
263 263 
 %{_libdir}/python3.6/test/*
264 264
265 265 
 %changelog
266 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.6.1-9
267 
+-   Requires coreutils or toybox
268 
+-   Requires bzip2-libs
266 269 
 *   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 3.6.1-8
267 270 
 -   Remove devpts mount in check
268 271 
 *   Mon Aug 28 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.6.1-7
SPECS/rabbitmq/rabbitmq.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Name:          rabbitmq-server
2 2 
 Summary:       RabbitMQ messaging server
3 3 
 Version:       3.6.10
4 
-Release:       1%{?dist}
4 
+Release:       2%{?dist}
5 5 
 Group:         Applications
6 6 
 Vendor:        VMware, Inc.
7 7 
 Distribution:  Photon
... ... 
@@ -11,9 +11,9 @@ Source0:       http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{na
11 11 
 %define sha1 rabbitmq=0d879f998683079a31c1e872ce4c5640ebd35406
12 12 
 Source1:       rabbitmq.config
13 13 
 Requires:      erlang
14 
-Requires:      shadow
15 
-Requires:      sed
14 
+Requires:      /bin/sed
16 15 
 Requires:      socat
16 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
17 17 
 BuildRequires: erlang
18 18 
 BuildRequires: rsync
19 19 
 BuildRequires: zip
... ... 
@@ -95,6 +95,8 @@ rm -rf $RPM_BUILD_ROOT
95 95 
 /var/lib/*
96 96
97 97 
 %changelog
98 
+* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.6.10-2
99 
+- Remove shadow from requires and use explicit tools for post actions
98 100 
 * Wed May 31 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.6.10-1
99 101 
 - Updated to latest and fixed service start issue
100 102 
 * Wed Apr 26 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.9-2
SPECS/redis/redis.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	advanced key-value store
2 2 
 Name:		redis
3 3 
 Version:	3.2.8
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		http://redis.io/
7 7 
 Group:		Applications/Databases
... ... 
@@ -14,7 +14,7 @@ BuildRequires:  gcc
14 14 
 BuildRequires:  systemd
15 15 
 BuildRequires:  make
16 16 
 Requires:	systemd
17 
-Requires:	shadow
17 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
18 18
19 19 
 %description
20 20 
 Redis is an in-memory data structure store, used as database, cache and message broker.
... ... 
@@ -78,11 +78,13 @@ exit 0
78 78 
 %config(noreplace) %attr(0640, %{name}, %{name}) %{_sysconfdir}/redis.conf
79 79
80 80 
 %changelog
81 
-*	Wed May 31 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-3
82 
--	Fix DB persistence,log file,grace-ful shutdown issues
83 
-*       Tue May 16 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-2
84 
--       Added systemd service unit
85 
-*       Wed Apr 5 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-1
86 
--       Updating to latest version
87 
-*	Mon Oct 3 2016 Dheeraj Shetty <dheerajs@vmware.com> 3.2.4-1
88 
--	initial version
81 
+* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.8-4
82 
+- Remove shadow from requires and use explicit tools for post actions
83 
+* Wed May 31 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-3
84 
+- Fix DB persistence,log file,grace-ful shutdown issues
85 
+* Tue May 16 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-2
86 
+- Added systemd service unit
87 
+* Wed Apr 5 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-1
88 
+- Updating to latest version
89 
+* Mon Oct 3 2016 Dheeraj Shetty <dheerajs@vmware.com> 3.2.4-1
90 
+- initial version
SPECS/rpcbind/rpcbind.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        RPC program number mapper
2 2 
 Name:           rpcbind
3 3 
 Version:        0.2.4
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 License:        BSD
6 6 
 URL:            http://nfsv4.bullopensource.org
7 7 
 Group:          Applications/Daemons
... ... 
@@ -17,8 +17,9 @@ BuildRequires:  libtirpc-devel
17 17 
 BuildRequires:  systemd-devel
18 18 
 Requires:       libtirpc
19 19 
 Requires:       systemd
20 
-Requires:       shadow
21 
-Requires:       coreutils
20 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/userdel /usr/sbin/groupadd /usr/sbin/groupdel /bin/false
21 
+Requires(preun):/usr/sbin/userdel /usr/sbin/groupdel
22 
+Requires(post): /bin/chown
22 23
23 24 
 %description
24 25 
 The rpcbind program is a replacement for portmap. It is required for import or export of Network File System (NFS) shared directories. The rpcbind utility is a server that converts RPC program numbers into universal addresses
... ... 
@@ -94,6 +95,8 @@ fi
94 94 
 rm -rf %{buildroot}/*
95 95
96 96 
 %changelog
97 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 0.2.4-4
98 
+-   Remove coreutils from requires and use explicit tools for post actions
97 99 
 *   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  0.2.4-3
98 100 
 -   Disabled rpcbind service by default
99 101 
 *   Thu May 18 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.2.4-2
SPECS/sendmail/sendmail.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Commonly used Mail transport agent (MTA)
2 2 
 Name:           sendmail
3 3 
 Version:        8.15.2
4 
-Release:        13%{?dist}
4 
+Release:        14%{?dist}
5 5 
 URL:            http://www.sendmail.org/
6 6 
 License:        BSD and CDDL1.1 and MIT
7 7 
 Group:          Email/Server/Library
... ... 
@@ -13,13 +13,14 @@ BuildRequires:  openldap
13 13 
 BuildRequires:  openssl-devel
14 14 
 BuildRequires:  libdb-devel
15 15 
 BuildRequires:  shadow
16 
-Requires:       coreutils
16 
+Requires:       (coreutils or toybox)
17 17 
 Requires:       systemd
18 18 
 Requires:       m4
19 19 
 Requires:       openldap
20 
-Requires:       shadow
21 
-Requires:       sed
22 
-Requires:       net-tools
20 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
21 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
22 
+Requires:       /bin/sed
23 
+Requires:       (net-tools or toybox)
23 24 
 Requires:       libdb
24 25
25 26 
 %define sha1 sendmail=5801d4b06f4e38ef228a5954a44d17636eaa5a16
... ... 
@@ -196,30 +197,33 @@ fi
196 196
197 197
198 198 
 %changelog
199 
-*	Mon Jun 12 2017 Darren Hart (VMware) <dvhart@infradead.org> 8.15.2-13
200 
--	Update the sendmail License meta-data
201 
-*	Tue Apr 4 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-12
202 
--       Update requires to use libdb and build to use libdb-devel
203 
-*       Fri Mar 24 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-11
204 
--       Fixing sendmail upgrade config no replace.
205 
-*       Mon Mar 06 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-10
206 
--       Adding dependency to start after network-online.
207 
-*	Wed Dec 14 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-9
208 
--       Replace obsoleted dependency inetutils with net-tools
209 
-*	Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-8
210 
--	fix pre script, add coreutils,inetutils,sed,shadow to requires
211 
-*       Mon Oct 10 2016 ChangLee <changlee@vmware.com> 8.15.2-7
212 
--       Modified %check
213 
-*       Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.2-6
214 
--       Fixed logic to restart the active services after upgrade
215 
-*       Wed May 25 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-5
216 
--       Adding dependencies and fixing post section installation bug.
217 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-4
218 
--	GA - Bump release of all rpms
219 
-*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-3
220 
--   	Fix for upgrade issues
221 
-*       Wed Feb 17 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-2
222 
--       Changing permission and owner of clientmqueue.
223 
-*       Tue Jan 05 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-1
224 
--       Initial build.  First version
199 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 8.15.2-14
200 
+-   Requires coreutils/net-tools or toybox, /bin/sed
201 
+-   Remove shadow from requires and use explicit tools for post actions
202 
+*   Mon Jun 12 2017 Darren Hart (VMware) <dvhart@infradead.org> 8.15.2-13
203 
+-   Update the sendmail License meta-data
204 
+*   Tue Apr 4 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-12
205 
+-   Update requires to use libdb and build to use libdb-devel
206 
+*   Fri Mar 24 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-11
207 
+-   Fixing sendmail upgrade config no replace.
208 
+*   Mon Mar 06 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-10
209 
+-   Adding dependency to start after network-online.
210 
+*   Wed Dec 14 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-9
211 
+-   Replace obsoleted dependency inetutils with net-tools
212 
+*   Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-8
213 
+-   fix pre script, add coreutils,inetutils,sed,shadow to requires
214 
+*   Mon Oct 10 2016 ChangLee <changlee@vmware.com> 8.15.2-7
215 
+-   Modified %check
216 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.2-6
217 
+-   Fixed logic to restart the active services after upgrade
218 
+*   Wed May 25 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-5
219 
+-   Adding dependencies and fixing post section installation bug.
220 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-4
221 
+-   GA - Bump release of all rpms
222 
+*   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-3
223 
+-   Fix for upgrade issues
224 
+*   Wed Feb 17 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-2
225 
+-   Changing permission and owner of clientmqueue.
226 
+*   Tue Jan 05 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-1
227 
+-   Initial build.  First version
225 228
SPECS/sudo/sudo.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Sudo
2 2 
 Name:           sudo
3 3 
 Version:        1.8.20p2
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        ISC
6 6 
 URL:            https://www.sudo.ws/
7 7 
 Group:          System Environment/Security
... ... 
@@ -12,7 +12,7 @@ Source0:        http://www.sudo.ws/sudo/dist/%{name}-%{version}.tar.gz
12 12 
 BuildRequires:  man-db
13 13 
 BuildRequires:  Linux-PAM-devel
14 14 
 Requires:       Linux-PAM
15 
-Requires:       shadow
15 
+Requires:       (shadow or toybox)
16 16
17 17 
 %description
18 18 
 The Sudo package allows a system administrator to give certain users (or groups of users)
... ... 
@@ -90,6 +90,8 @@ rm -rf %{buildroot}/*
90 90 
 %exclude  /etc/sudoers.dist
91 91
92 92 
 %changelog
93 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-3
94 
+-   Requires shadow or toybox
93 95 
 *   Fri Jul 07 2017 Chang Lee <changlee@vmware.com> 1.8.20p2-2
94 96 
 -   Including /usr/lib/tmpfiles.d/sudo.conf from %files
95 97 
 *   Thu Jun 15 2017 Kumar Kaushik <kaushikk@vmware.com> 1.8.20p2-1
SPECS/systemtap/systemtap.spec
History View file @ 7f9d2e1
... ... 
@@ -8,7 +8,7 @@
8 8
9 9 
 Name:          systemtap
10 10 
 Version:       3.1
11 
-Release:       2%{?dist}
11 
+Release:       4%{?dist}
12 12 
 Summary:       Programmable system-wide instrumentation system
13 13 
 Group:         Development/System
14 14 
 Vendor:	       VMware, Inc.
... ... 
@@ -48,7 +48,8 @@ Requires:      linux-devel
48 48 
 Requires:      make
49 49 
 Requires:      elfutils
50 50 
 Requires:      %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
51 
-Requires:      shadow
51 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
52 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
52 53
53 54 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
54 55
... ... 
@@ -96,7 +97,7 @@ Group:         System/Tools
96 96 
 Summary:       Instrumentation System Server
97 97 
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
98 98 
 Requires:      %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
99 
-Requires:      coreutils
99 
+Requires:      (coreutils or toybox)
100 100 
 Requires:      nss
101 101 
 Requires:      unzip
102 102 
 Requires:      gzip
... ... 
@@ -347,6 +348,10 @@ fi
347 347 
 %{_mandir}/man8/stap-server.8*
348 348
349 349 
 %changelog
350 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1-4
351 
+-   Remove shadow from requires and use explicit tools for post actions
352 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1-3
353 
+-   Requires coreutils or toybox
350 354 
 *   Thu Aug 10 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1-2
351 355 
 -   systemtap-sdt-devel requires systemtap
352 356 
 *   Tue Apr 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.1-1
SPECS/tcsh/tcsh.spec
History View file @ 7f9d2e1
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        An enhanced version of csh, the C shell
3 3 
 Name:           tcsh
4 4 
 Version:        6.20.00
5 
-Release:        3%{?dist}
5 
+Release:        4%{?dist}
6 6 
 License:        BSD
7 7 
 Group:          System Environment/Shells
8 8 
 Source:         http://www.sfr-fresh.com/unix/misc/%{name}-%{version}.tar.xz
... ... 
@@ -16,8 +16,8 @@ Provides:       csh = %{version}
16 16 
 Provides:       /bin/tcsh, /bin/csh
17 17 
 BuildRequires:  ncurses-devel
18 18 
 Requires:       ncurses
19 
-Requires(post): grep
20 
-Requires(postun): coreutils, grep
19 
+Requires(post): /bin/grep
20 
+Requires(postun): (coreutils or toybox) /bin/grep
21 21
22 22 
 %description
23 23 
 Tcsh is an enhanced but completely compatible version of csh, the C
... ... 
@@ -115,6 +115,8 @@ fi
115 115 
 %{_mandir}/man1/*.1*
116 116
117 117 
 %changelog
118 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 6.20.00-4
119 
+-   Requires coreutils or toybox and /bin/grep
118 120 
 *   Tue Jun 6 2017 Alexey Makhalov <amakhalov@vmware.com> 6.20.00-3
119 121 
 -   Fix make check issues.
120 122 
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.20.00-2
SPECS/telegraf/telegraf.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        agent for collecting, processing, aggregating, and writing metrics.
2 2 
 Name:           telegraf
3 3 
 Version:        1.3.4
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        MIT
6 6 
 URL:            https://github.com/influxdata/telegraf
7 7 
 Source0:        https://github.com/influxdata/telegraf/archive/%{name}-%{version}.tar.gz
... ... 
@@ -18,7 +18,8 @@ BuildRequires:  systemd-devel
18 18 
 BuildRequires:  unzip
19 19 
 Requires:       systemd
20 20 
 Requires:       logrotate
21 
-Requires:       shadow
21 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
22 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
22 23
23 24 
 %description
24 25 
 Telegraf is an agent written in Go for collecting, processing, aggregating, and writing metrics.
... ... 
@@ -92,5 +93,7 @@ fi
92 92 
 %config(noreplace) %{_sysconfdir}/%{name}/telegraf.conf
93 93
94 94 
 %changelog
95 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.4-2
96 
+-   Remove shadow from requires and use explicit tools for post actions
95 97 
 *   Tue Jul 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.3.4-1
96 98 
 -   first version
SPECS/toybox/config-0.7.3
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 #
2 2 
 # Automatically generated make config: don't edit
3 3 
 # ToyBox version: KCONFIG_VERSION
4 
-# Sat Apr 22 01:21:21 2017
4 
+# Tue Sep 26 18:03:06 2017
5 5 
 #
6 6 
 # CONFIG_TOYBOX_CONTAINER is not set
7 7 
 CONFIG_TOYBOX_FIFREEZE=y
... ... 
@@ -215,14 +215,14 @@ CONFIG_HELP_EXTRAS=y
215 215 
 CONFIG_HEXEDIT=y
216 216 
 CONFIG_HWCLOCK=y
217 217 
 CONFIG_INOTIFYD=y
218 
-CONFIG_INSMOD=y
218 
+# CONFIG_INSMOD is not set
219 219 
 CONFIG_IONICE=y
220 220 
 CONFIG_IORENICE=y
221 221 
 CONFIG_LOGIN=y
222 222 
 CONFIG_LOSETUP=y
223 223 
 CONFIG_LSATTR=y
224 224 
 CONFIG_CHATTR=y
225 
-CONFIG_LSMOD=y
225 
+# CONFIG_LSMOD is not set
226 226 
 CONFIG_LSPCI=y
227 227 
 CONFIG_LSPCI_TEXT=y
228 228 
 CONFIG_LSUSB=y
... ... 
@@ -230,7 +230,7 @@ CONFIG_MAKEDEVS=y
230 230 
 CONFIG_MIX=y
231 231 
 CONFIG_MKPASSWD=y
232 232 
 CONFIG_MKSWAP=y
233 
-CONFIG_MODINFO=y
233 
+# CONFIG_MODINFO is not set
234 234 
 CONFIG_MOUNTPOINT=y
235 235 
 CONFIG_NBD_CLIENT=y
236 236 
 # CONFIG_UNSHARE is not set
... ... 
@@ -244,10 +244,10 @@ CONFIG_PWDX=y
244 244 
 CONFIG_READAHEAD=y
245 245 
 CONFIG_READLINK=y
246 246 
 CONFIG_REALPATH=y
247 
-CONFIG_REBOOT=y
247 
+# CONFIG_REBOOT is not set
248 248 
 # CONFIG_RESET is not set
249 249 
 CONFIG_REV=y
250 
-CONFIG_RMMOD=y
250 
+# CONFIG_RMMOD is not set
251 251 
 CONFIG_SETSID=y
252 252 
 CONFIG_SHRED=y
253 253 
 CONFIG_STAT=y
SPECS/toybox/toybox.spec
History View file @ 7f9d2e1
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           toybox
2 2 
 Version:        0.7.3
3 
-Release:        4%{?dist}
3 
+Release:        5%{?dist}
4 4 
 License:        BSD
5 5 
 Summary:        Common Linux command line utilities in a single executable
6 6 
 Url:            http://landley.net/toybox/
... ... 
@@ -22,6 +22,8 @@ environment.
22 22 
 %patch0 -p1
23 23
24 24 
 %build
25 
+# Move sed to /bin
26 
+sed -i 's#TOYFLAG_USR|TOYFLAG_BIN#TOYFLAG_BIN#' toys/posix/sed.c
25 27 
 cp %{SOURCE1} .config
26 28 
 NOSTRIP=1 make CFLAGS="-Wall -Wundef -Wno-char-subscripts -Werror=implicit-function-declaration -g"
27 29
... ... 
@@ -48,6 +50,9 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
48 48 
 %{_sbindir}/*
49 49
50 50 
 %changelog
51 
+*   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-5
52 
+-   Move sed to /bin
53 
+-   Remove kmod and systemd toys due to incomplete
51 54 
 *   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-4
52 55 
 -   Fix compilation issue for glibc-2.26
53 56 
 *   Thu Jun 01 2017 Chang Lee <changlee@vmware.com> 0.7.3-3
SPECS/unbound/unbound.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        unbound dns server
2 2 
 Name:           unbound
3 3 
 Version:        1.6.1
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 Group:          System/Servers
6 6 
 Vendor:         VMware, Inc.
7 7 
 License:        BSD
... ... 
@@ -10,10 +10,10 @@ URL:            http://www.unbound.net
10 10 
 Source0:        https://www.unbound.net/downloads/%{name}-%{version}.tar.gz
11 11 
 %define sha1    unbound=41369fcfd37844b02b7293b37ec78e69f0db34c7
12 12 
 Source1:        %{name}.service
13 
-Requires:       shadow
14 13 
 Requires:       systemd
15 14 
 BuildRequires:  systemd
16 15 
 BuildRequires:  expat-devel
16 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
17 17
18 18 
 %description
19 19 
 Unbound is a validating, recursive, and caching DNS resolver.
... ... 
@@ -83,6 +83,8 @@ rm -rf %{buildroot}/*
83 83 
 %{_mandir}/*
84 84
85 85 
 %changelog
86 
+*  Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.6.1-3
87 
+-  Remove shadow from requires and use explicit tools for post actions
86 88 
 *  Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.6.1-2
87 89 
 -  Requires expat-devel
88 90 
 *  Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 1.6.1-1
SPECS/wavefront-proxy/wavefront-proxy.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        lightweight java application to send metrics to.
2 2 
 Name:           wavefront-proxy
3 3 
 Version:        4.16
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        Apache 2.0
6 6 
 URL:            https://github.com/wavefrontHQ/java
7 7 
 Source0:        https://github.com/wavefrontHQ/java/archive/wavefront-%{version}.tar.gz
... ... 
@@ -16,7 +16,8 @@ BuildRequires:  systemd-devel
16 16 
 Requires:       systemd
17 17 
 Requires:       openjre8
18 18 
 Requires:       commons-daemon
19 
-Requires:       shadow
19 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
20 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
20 21 
 BuildArch:      noarch
21 22
22 23 
 %description
... ... 
@@ -102,5 +103,7 @@ rm -rf %{buildroot}/*
102 102 
 %{_unitdir}/wavefront-proxy.service
103 103
104 104 
 %changelog
105 
-*   Tue Jul 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.16-1
106 
--   first version
105 
+* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 4.16-2
106 
+- Remove shadow from requires and use explicit tools for post actions
107 
+* Tue Jul 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.16-1
108 
+- first version
SPECS/zookeeper/zookeeper.spec
History View file @ 7f9d2e1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Highly reliable distributed coordination
2 2 
 Name:           zookeeper
3 3 
 Version:        3.4.10
4 
-Release:        5%{?dist}
4 
+Release:        6%{?dist}
5 5 
 URL:            http://zookeeper.apache.org/
6 6 
 License:        Apache License, Version 2.0
7 7 
 Group:          Applications/System
... ... 
@@ -14,8 +14,9 @@ Source2:        zkEnv.sh
14 14 
 Patch0:	        zookeeper-3.4.8-server.patch
15 15 
 BuildRequires:  systemd
16 16 
 Requires:       systemd
17 
-Requires:       shadow
18 17 
 Requires:       openjre8
18 
+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
19 
+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
19 20 
 %description
20 21 
 ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.
21 22
... ... 
@@ -104,6 +105,8 @@ fi
104 104 
 %{_prefix}
105 105
106 106 
 %changelog
107 
+*   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 3.4.10-6
108 
+-   Remove shadow from requires and use explicit tools for post actions
107 109 
 *   Mon Sep 25 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.4.10-5
108 110 
 -   Removed the java-export.sh script reference.
109 111 
 *   Thu Jun 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.4.10-4
SPECS/zsh/zsh.spec
History View file @ 7f9d2e1
... ... 
@@ -3,7 +3,7 @@
3 3 
 Summary:      Z shell
4 4 
 Name:         zsh
5 5 
 Version:      5.3.1
6 
-Release:      3%{?dist}
6 
+Release:      4%{?dist}
7 7 
 License:      MIT
8 8 
 URL:          http://zsh.sourceforge.net/
9 9 
 Group:        System Environment/Shells
... ... 
@@ -28,8 +28,8 @@ BuildRequires: libcap-devel
28 28 
 BuildRequires: texinfo
29 29 
 BuildRequires: gawk
30 30 
 BuildRequires: elfutils
31 
-Requires(post): grep
32 
-Requires(postun): coreutils grep
31 
+Requires(post): /bin/grep
32 
+Requires(postun): (coreutils or toybox) /bin/grep
33 33
34 34 
 Provides: /bin/zsh
35 35
... ... 
@@ -144,6 +144,8 @@ fi
144 144 
 %doc Doc/*.html
145 145
146 146 
 %changelog
147 
+*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 5.3.1-4
148 
+-   Requires coreutils or toybox and /bin/grep
147 149 
 *   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 5.3.1-3
148 150 
 -   Clean up check
149 151 
 *   Wed Aug 02 2017 Chang Lee <changlee@vmware.com> 5.3.1-2
support/package-builder/PackageBuilder.py
History View file @ 7f9d2e1
... ... 
@@ -10,22 +10,21 @@ from SpecData import SPECS
10 10
11 11 
 class PackageBuilder(object):
12 12
13 
-    def __init__(self,mapPackageToCycles,listAvailableCyclicPackages,listBuildOptionPackages,pkgBuildOptionFile,logName=None,logPath=None):
14 
-        if logName is None:
15 
-            logName = "PackageBuilder"
16 
-        if logPath is None:
17 
-            logPath = constants.logPath
18 
-        self.logName=logName
19 
-        self.logPath=logPath
20 
-        self.logger=Logger.getLogger(logName,logPath)
13 
+    def __init__(self,mapPackageToCycles,listAvailableCyclicPackages,listBuildOptionPackages,pkgBuildOptionFile):
14 
+        # will be initialized in buildPackageThreadAPI()
15 
+        self.logName=None
16 
+        self.logPath=None
17 
+        self.logger=None
18 
+        self.package=None
21 19 
         self.mapPackageToCycles = mapPackageToCycles
22 20 
         self.listAvailableCyclicPackages = listAvailableCyclicPackages
23 21 
         self.listNodepsPackages = ["glibc","gmp","zlib","file","binutils","mpfr","mpc","gcc","ncurses","util-linux","groff","perl","texinfo","rpm","openssl","go"]
24 22 
         self.listBuildOptionPackages=listBuildOptionPackages
25 23 
         self.pkgBuildOptionFile=pkgBuildOptionFile
26 24
27 
-    def prepareBuildRoot(self,chrootName, packageName):
25 
+    def prepareBuildRoot(self):
28 26 
         chrootID=None
27 
+        chrootName="build-"+self.package
29 28 
         try:
30 29 
             chrUtils = ChrootUtils(self.logName,self.logPath)
31 30 
             returnVal,chrootID = chrUtils.createChroot(chrootName)
... ... 
@@ -33,7 +32,7 @@ class PackageBuilder(object):
33 33 
             if not returnVal:
34 34 
                 raise Exception("Unable to prepare build root")
35 35 
             tUtils=ToolChainUtils(self.logName,self.logPath)
36 
-            tUtils.installToolChainRPMS(chrootID, packageName)
36 
+            tUtils.installToolChainRPMS(chrootID, self.package, self.logPath)
37 37 
         except Exception as e:
38 38 
             if chrootID is not None:
39 39 
                 self.logger.debug("Deleting chroot: " + chrootID)
... ... 
@@ -65,15 +64,24 @@ class PackageBuilder(object):
65 65 
         return listInstalledPackages
66 66
67 67 
     def buildPackageThreadAPI(self,package,outputMap, threadName,):
68 
+        self.package=package
69 
+        self.logName="build-"+package
70 
+        self.logPath=constants.logPath+"/build-"+package
71 
+        if not os.path.isdir(self.logPath):
72 
+            cmdUtils = CommandUtils()
73 
+            cmdUtils.runCommandInShell("mkdir -p "+self.logPath)
74 
+        self.logger=Logger.getLogger(self.logName,self.logPath)
75 
+
68 76 
         try:
69 
-            self.buildPackage(package)
77 
+            self.buildPackage()
70 78 
             outputMap[threadName]=True
71 79 
         except Exception as e:
80 
+            # TODO: self.logger might be None
72 81 
             self.logger.error(e)
73 82 
             outputMap[threadName]=False
74 83
75 
-    def checkIfPackageIsAlreadyBuilt(self, package):
76 
-        basePkg=SPECS.getData().getSpecName(package)
84 
+    def checkIfPackageIsAlreadyBuilt(self):
85 
+        basePkg=SPECS.getData().getSpecName(self.package)
77 86 
         listRPMPackages=SPECS.getData().getRPMPackages(basePkg)
78 87 
         packageIsAlreadyBuilt=True
79 88 
         pkgUtils = PackageUtils(self.logName,self.logPath)
... ... 
@@ -83,34 +91,27 @@ class PackageBuilder(object):
83 83 
                 break
84 84 
         return packageIsAlreadyBuilt
85 85
86 
-    def buildPackage(self, package):
86 
+    def buildPackage(self):
87 87 
         #do not build if RPM is already built
88 88 
         #test only if the package is in the testForceRPMS with rpmCheck
89 89 
         #build only if the package is not in the testForceRPMS with rpmCheck
90 
-        if self.checkIfPackageIsAlreadyBuilt(package):
90 
+        if self.checkIfPackageIsAlreadyBuilt():
91 91 
             if not constants.rpmCheck:
92 
-                self.logger.info("Skipping building the package:"+package)
92 
+                self.logger.info("Skipping building the package:"+self.package)
93 93 
                 return
94 
-            elif constants.rpmCheck and package not in constants.testForceRPMS:
95 
-                self.logger.info("Skipping testing the package:"+package)
94 
+            elif constants.rpmCheck and self.package not in constants.testForceRPMS:
95 
+                self.logger.info("Skipping testing the package:"+self.package)
96 96 
                 return
97 97
98 
-        #should initialize a logger based on package name
99 98 
         chrUtils = ChrootUtils(self.logName,self.logPath)
100 
-        chrootName="build-"+package
101 99 
         chrootID=None
102 100 
         try:
103 
-            chrootID = self.prepareBuildRoot(chrootName, package)
104 
-            destLogPath=constants.logPath+"/build-"+package
105 
-            if not os.path.isdir(destLogPath):
106 
-                cmdUtils = CommandUtils()
107 
-                cmdUtils.runCommandInShell("mkdir -p "+destLogPath)
108 
-
101 
+            chrootID = self.prepareBuildRoot()
109 102 
             listInstalledPackages=self.findInstalledPackages(chrootID)
110 
-            listDependentPackages=self.findBuildTimeRequiredPackages(package)
111 
-            if constants.rpmCheck and package in constants.testForceRPMS:
112 
-                listDependentPackages.extend(self.findBuildTimeCheckRequiredPackages(package))
113 
-                testPackages=set(constants.listMakeCheckRPMPkgtoInstall)-set(listInstalledPackages)-set([package])
103 
+            listDependentPackages=self.findBuildTimeRequiredPackages()
104 
+            if constants.rpmCheck and self.package in constants.testForceRPMS:
105 
+                listDependentPackages.extend(self.findBuildTimeCheckRequiredPackages())
106 
+                testPackages=set(constants.listMakeCheckRPMPkgtoInstall)-set(listInstalledPackages)-set([self.package])
114 107 
                 listDependentPackages.extend(testPackages)
115 108 
                 listDependentPackages=list(set(listDependentPackages))
116 109
... ... 
@@ -118,17 +119,17 @@ class PackageBuilder(object):
118 118 
             if len(listDependentPackages) != 0:
119 119 
                 self.logger.info("Installing the build time dependent packages......")
120 120 
                 for pkg in listDependentPackages:
121 
-                    self.installPackage(pkgUtils, pkg,chrootID,destLogPath,listInstalledPackages)
122 
-                pkgUtils.installRPMSInAOneShot(chrootID,destLogPath)
121 
+                    self.installPackage(pkgUtils, pkg,chrootID,self.logPath,listInstalledPackages)
122 
+                pkgUtils.installRPMSInAOneShot(chrootID,self.logPath)
123 123 
                 self.logger.info("Finished installing the build time dependent packages......")
124 124
125 
-            pkgUtils.adjustGCCSpecs(package, chrootID, destLogPath)
126 
-            pkgUtils.buildRPMSForGivenPackage(package,chrootID,self.listBuildOptionPackages,self.pkgBuildOptionFile,destLogPath)
127 
-            self.logger.info("Successfully built the package:"+package)
125 
+            pkgUtils.adjustGCCSpecs(self.package, chrootID, self.logPath)
126 
+            pkgUtils.buildRPMSForGivenPackage(self.package,chrootID,self.listBuildOptionPackages,self.pkgBuildOptionFile,self.logPath)
127 
+            self.logger.info("Successfully built the package:"+self.package)
128 128 
         except Exception as e:
129 
-            self.logger.error("Failed while building package:" + package)
129 
+            self.logger.error("Failed while building package:" + self.package)
130 130 
             self.logger.debug("Chroot with ID: " + chrootID + " not deleted for debugging.")
131 
-            logFileName = os.path.join(destLogPath, package + ".log")
131 
+            logFileName = os.path.join(self.logPath, self.package + ".log")
132 132 
             fileLog = os.popen('tail -n 100 ' + logFileName).read()
133 133 
             self.logger.debug(fileLog)
134 134 
             raise e
... ... 
@@ -140,12 +141,12 @@ class PackageBuilder(object):
140 140 
         listRequiredPackages=SPECS.getData().getRequiresForPackage(rpmPackage)
141 141 
         return listRequiredPackages
142 142
143 
-    def findBuildTimeRequiredPackages(self,package):
144 
-        listRequiredPackages=SPECS.getData().getBuildRequiresForPackage(package)
143 
+    def findBuildTimeRequiredPackages(self):
144 
+        listRequiredPackages=SPECS.getData().getBuildRequiresForPackage(self.package)
145 145 
         return listRequiredPackages
146 146
147 
-    def findBuildTimeCheckRequiredPackages(self,package):
148 
-        listRequiredPackages=SPECS.getData().getCheckBuildRequiresForPackage(package)
147 
+    def findBuildTimeCheckRequiredPackages(self):
148 
+        listRequiredPackages=SPECS.getData().getCheckBuildRequiresForPackage(self.package)
149 149 
         return listRequiredPackages
150 150
151 151 
     def installPackage(self,pkgUtils,package,chrootID,destLogPath,listInstalledPackages):
support/package-builder/PackageUtils.py
History View file @ 7f9d2e1
... ... 
@@ -85,26 +85,23 @@ class PackageUtils(object):
85 85 
     def installRPMSInAOneShot(self,chrootID,destLogPath):
86 86 
         chrootCmd=self.runInChrootCommand+" "+chrootID
87 87 
         rpmInstallcmd=self.rpmBinary+" "+ self.installRPMPackageOptions
88 
+        cmdUtils = CommandUtils()
88 89 
         if self.noDepsRPMFilesToInstallInAOneShot != "":
89 90 
             self.logger.info("Installing nodeps rpms: " + self.noDepsPackagesToInstallInAOneShot)
90 
-            logFile=chrootID+constants.topDirPath+"/LOGS/install_rpms_nodeps.log"
91 
-            cmdUtils = CommandUtils()
91 
+            logFile=destLogPath+"/install_rpms_nodeps.log"
92 92 
             cmd = rpmInstallcmd+" "+self.nodepsRPMPackageOptions + " " + self.noDepsRPMFilesToInstallInAOneShot
93 93 
             returnVal = cmdUtils.runCommandInShell(cmd, logFile, chrootCmd)
94 
-            if destLogPath is not None:
95 
-                shutil.copy2(logFile, destLogPath)
96 94 
             if not returnVal:
95 
+                self.logger.debug("Command Executed:" + cmd)
97 96 
                 self.logger.error("Unable to install rpms")
98 97 
                 raise Exception("RPM installation failed")
99 98 
         if self.rpmFilesToInstallInAOneShot != "":
100 99 
             self.logger.info("Installing rpms: " + self.packagesToInstallInAOneShot)
101 
-            logFile=chrootID+constants.topDirPath+"/LOGS/install_rpms.log"
102 
-            cmdUtils = CommandUtils()
100 
+            logFile=destLogPath+"/install_rpms.log"
103 101 
             cmd=rpmInstallcmd+" "+self.rpmFilesToInstallInAOneShot
104 102 
             returnVal = cmdUtils.runCommandInShell(cmd, logFile, chrootCmd)
105 
-            if destLogPath is not None:
106 
-                shutil.copy2(logFile, destLogPath)
107 103 
             if not returnVal:
104 
+                self.logger.debug("Command Executed:" + cmd)
108 105 
                 self.logger.error("Unable to install rpms")
109 106 
                 raise Exception("RPM installation failed")
110 107
... ... 
@@ -226,8 +223,7 @@ class PackageUtils(object):
226 226
227 227 
     def buildRPM(self,specFile,logFile,chrootCmd,package,macros):
228 228
229 
-        rpmbuildDistOption = '--define \\\"dist %s\\\"' % constants.dist
230 
-        rpmBuildcmd=self.rpmbuildBinary+" "+self.rpmbuildBuildallOption+" "+rpmbuildDistOption
229 
+        rpmBuildcmd=self.rpmbuildBinary+" "+self.rpmbuildBuildallOption
231 230
232 231 
         if constants.rpmCheck and package in constants.testForceRPMS:
233 232 
             self.logger.info("#"*(68+2*len(package)))
... ... 
@@ -595,9 +591,7 @@ class PackageUtils(object):
595 595
596 596 
     def buildRPMinContainer(self, specFile, rpmLogFile, destLogFile, containerID, package, macros):
597 597
598 
-        rpmbuildDistOption = '--define \"dist %s\"' % constants.dist
599 
-        rpmBuildCmd = self.rpmbuildBinary + " " + self.rpmbuildBuildallOption \
600 
-                          + " " + rpmbuildDistOption
598 
+        rpmBuildCmd = self.rpmbuildBinary + " " + self.rpmbuildBuildallOption
601 599
602 600 
         if constants.rpmCheck and package in constants.testForceRPMS:
603 601 
             self.logger.info("#"*(68+2*len(package)))
support/package-builder/ToolChainUtils.py
History View file @ 7f9d2e1
... ... 
@@ -47,7 +47,7 @@ class ToolChainUtils(object):
47 47 
         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/BUILDROOT")
48 48
49 49 
         prepareChrootCmd=self.prepareBuildRootCmd+" "+chrootID
50 
-        logFile=constants.logPath+"/prepareBuildRoot.log"
50 
+        logFile=self.logPath+"/prepareBuildRoot.log"
51 51 
         returnVal=cmdUtils.runCommandInShell(prepareChrootCmd,logFile)
52 52 
         if not returnVal:
53 53 
             self.logger.error("Prepare build root script failed.Unable to prepare chroot.")
... ... 
@@ -74,7 +74,7 @@ class ToolChainUtils(object):
74 74 
             return None
75 75
76 76 
     def buildCoreToolChainPackages(self, listBuildOptionPackages, pkgBuildOptionFile):
77 
-        self.logger.info("Building core tool chain packages.....")
77 
+        self.logger.info("Building core toolchain packages.....")
78 78 
         chrootID=None
79 79 
         pkgCount = 0
80 80 
         try:
... ... 
@@ -83,8 +83,9 @@ class ToolChainUtils(object):
83 83 
                 rpmPkg=pkgUtils.findRPMFileForGivenPackage(package)
84 84 
                 if rpmPkg is not None:
85 85 
                     continue
86 
+                self.logger.info("Building core toolchain package: " + package)
86 87 
                 chrUtils = ChrootUtils(self.logName,self.logPath)
87 
-                chrootName="build-core-toolchain"
88 
+                chrootName="build-"+package
88 89 
                 destLogPath=constants.logPath+"/build-"+package
89 90 
                 if not os.path.isdir(destLogPath):
90 91 
                     cmdUtils = CommandUtils()
... ... 
@@ -93,7 +94,7 @@ class ToolChainUtils(object):
93 93 
                 if not returnVal:
94 94 
                     self.logger.error("Creating chroot failed")
95 95 
                     raise Exception("creating chroot failed")
96 
-                self.installToolChainRPMS(chrootID, package)
96 
+                self.installToolChainRPMS(chrootID, package, destLogPath)
97 97 
                 pkgUtils.adjustGCCSpecs(package, chrootID, destLogPath)
98 98 
                 pkgUtils.buildRPMSForGivenPackage(package, chrootID, listBuildOptionPackages, pkgBuildOptionFile, destLogPath)
99 99 
                 pkgCount += 1
... ... 
@@ -109,7 +110,9 @@ class ToolChainUtils(object):
109 109 
             raise e
110 110 
         return pkgCount
111 111
112 
-    def installToolChainRPMS(self,chrootID, packageName):
112 
+    def installToolChainRPMS(self,chrootID, packageName, logPath=None):
113 
+        if logPath is None:
114 
+            logPath=self.logPath
113 115 
         cmdUtils = CommandUtils()
114 116 
         self.prepareBuildRoot(chrootID)
115 117 
         self.logger.info("Installing Tool Chain RPMS.......")
... ... 
@@ -138,11 +141,11 @@ class ToolChainUtils(object):
138 138 
             rpmFiles += " " + rpmFile
139 139 
             packages += " " + package
140 140
141 
-        self.logger.debug("Installing rpms:"+packages)
142 
-        cmd=self.rpmCommand + " -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles
143 
-        process = subprocess.Popen("%s" %cmd,shell=True,stdout=subprocess.PIPE)
144 
-        retval = process.wait()
145 
-        if retval != 0:
141 
+        self.logger.debug("Installing toolchain rpms:"+packages)
142 
+        cmd=self.rpmCommand + " -i -v --nodeps --noorder --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles
143 
+        retVal = cmdUtils.runCommandInShell(cmd, logPath+"/install_toolchain_rpms.log")
144 
+        if not retVal:
145 
+            self.logger.debug("Command Executed:" + cmd)
146 146 
             self.logger.error("Installing tool chain  failed")
147 147 
             raise Exception("RPM installation failed")
148 148 
         self.logger.info("Successfully installed default Tool Chain RPMS in Chroot:"+chrootID)
... ... 
@@ -156,6 +159,7 @@ class ToolChainUtils(object):
156 156 
         self.logger.info("Installing package specific tool chain RPMs for " + packageName + ".......")
157 157 
         rpmFiles = ""
158 158 
         packages = ""
159 
+        cmdUtils = CommandUtils()
159 160 
         for package in listOfToolChainPkgs:
160 161 
             pkgUtils=PackageUtils(self.logName,self.logPath)
161 162 
             print "DEBUG:" + package
... ... 
@@ -169,12 +173,11 @@ class ToolChainUtils(object):
169 169 
             rpmFiles += " " + rpmFile
170 170 
             packages += " " + package
171 171
172 
-        self.logger.debug("Installing rpms:"+packages)
173 
-        cmd=self.rpmCommand + " -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles
174 
-        print "Command Executed:" + cmd
175 
-        process = subprocess.Popen("%s" %cmd,shell=True,stdout=subprocess.PIPE)
176 
-        retval = process.wait()
177 
-        if retval != 0:
172 
+        self.logger.debug("Installing custom rpms:"+packages)
173 
+        cmd=self.rpmCommand + " -i -v --nodeps --noorder --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles
174 
+        retVal = cmdUtils.runCommandInShell(cmd, self.logPath+"/install_custom_toolchain_rpms.log")
175 
+        if not retVal:
176 
+            self.logger.debug("Command Executed:" + cmd)
178 177 
             self.logger.error("Installing tool chain  failed")
179 178 
             raise Exception("RPM installation failed")
180 179 
         self.logger.info("Successfully installed all Tool Chain X RPMS")
support/package-builder/WorkerThread.py
History View file @ 7f9d2e1
... ... 
@@ -28,7 +28,7 @@ class WorkerThread(threading.Thread):
28 28 
                 break
29 29 
             self.logger.info("Thread "+self.name+" is building package:"+ pkg)
30 30 
             if self.pkgBuildType == "chroot":
31 
-                pkgBuilder = PackageBuilder(self.mapPackageToCycle,self.listAvailableCyclicPackages,self.listBuildOptionPackages,self.pkgBuildOptionFile,"build-"+pkg)
31 
+                pkgBuilder = PackageBuilder(self.mapPackageToCycle,self.listAvailableCyclicPackages,self.listBuildOptionPackages,self.pkgBuildOptionFile)
32 32 
             elif self.pkgBuildType == "container":
33 33 
                 pkgBuilder = BuildContainer(self.mapPackageToCycle,self.listAvailableCyclicPackages,self.listBuildOptionPackages,self.pkgBuildOptionFile,"build-"+pkg)
34 34 
             t = threading.Thread(target=pkgBuilder.buildPackageThreadAPI,args=(pkg,outputMap,pkg))
support/package-builder/constants.py
History View file @ 7f9d2e1
... ... 
@@ -113,8 +113,9 @@ class constants(object):
113 113 
         "cpio"]
114 114
115 115 
     # List or RPMS that will be installed in a chroot prior to build each
116 
-    # package. On a stage1 and stage2 published rpms will/might be used
117 
-    # after stage2 only local RPMS will be used
116 
+    # package. This list should be ordered by install order. On a stage1
117 
+    # and stage2 published rpms will/might be used after stage2 only local
118 
+    # RPMS will be used
118 119 
     listToolChainRPMsToInstall=[
119 120 
         "filesystem",
120 121 
         "linux-api-headers",
... ... 
@@ -338,8 +339,10 @@ class constants(object):
338 338 
     # Build system should interpret it as
339 339 
     # Requires: shadow
340 340 
     providedBy={
341 
-        "/sbin/useradd":"shadow",
342 
-        "/sbin/groupadd":"shadow"
341 
+        "/usr/sbin/useradd":"shadow",
342 
+        "/usr/sbin/groupadd":"shadow",
343 
+        "/usr/bin/which":"which",
344 
+        "/bin/sed":"sed"
343 345 
     }
344 346
345 347 
     @staticmethod
support/pullpublishrpms/rpmfilelist
History View file @ 7f9d2e1
... ... 
@@ -3,7 +3,8 @@ noarch/man-pages-3.59-1.ph1.noarch.rpm
3 3 
 noarch/apache-maven-3.3.9-4.ph1.noarch.rpm
4 4 
 x86_64/python2-devel-2.7.11-1.ph1.x86_64.rpm
5 5 
 x86_64/nspr-4.11-1.ph1.x86_64.rpm
6 
-x86_64/rpm-4.11.2-14.ph1.x86_64.rpm
6 
+x86_64/rpm-4.13.0.1-5.ph2.x86_64.rpm
7 
+x86_64/rpm-libs-4.13.0.1-5.ph2.x86_64.rpm
7 8 
 x86_64/binutils-devel-2.25.1-1.ph1.x86_64.rpm
8 9 
 x86_64/nss-3.21-1.ph1.x86_64.rpm
9 10 
 x86_64/mpfr-devel-3.1.3-1.ph1.x86_64.rpm
... ... 
@@ -23,7 +24,7 @@ x86_64/man-db-2.7.5-1.ph1.x86_64.rpm
23 23 
 x86_64/elfutils-libelf-0.165-1.ph1.x86_64.rpm
24 24 
 x86_64/gdbm-1.11-1.ph1.x86_64.rpm
25 25 
 x86_64/autoconf-2.69-3.ph1.x86_64.rpm
26 
-x86_64/rpm-devel-4.11.2-14.ph1.x86_64.rpm
26 
+x86_64/rpm-devel-4.13.0.1-5.ph2.x86_64.rpm
27 27 
 x86_64/file-5.24-1.ph1.x86_64.rpm
28 28 
 x86_64/mpfr-3.1.3-1.ph1.x86_64.rpm
29 29 
 x86_64/zlib-devel-1.2.8-2.ph1.x86_64.rpm
... ... 
@@ -31,7 +32,7 @@ x86_64/libgcc-devel-5.3.0-1.ph1.x86_64.rpm
31 31 
 x86_64/bison-3.0.4-1.ph1.x86_64.rpm
32 32 
 x86_64/lua-5.3.2-1.ph1.x86_64.rpm
33 33 
 x86_64/util-linux-2.27.1-1.ph1.x86_64.rpm
34 
-x86_64/rpm-build-4.11.2-14.ph1.x86_64.rpm
34 
+x86_64/rpm-build-4.13.0.1-5.ph2.x86_64.rpm
35 35 
 x86_64/procps-ng-3.3.11-1.ph1.x86_64.rpm
36 36 
 x86_64/coreutils-8.24-1.ph1.x86_64.rpm
37 37 
 x86_64/util-linux-devel-2.27.1-1.ph1.x86_64.rpm