Browse code
package-builder cleanup and packages splitting
package-builder: remove unused code and reorganize toolchain building
New RPMS: rpm-libs, sqlite-libs, sqlite-devel
Remove noarch for python-sqlalchemy
cracklib: use uncompressed pw_dict again - installer needs it.
Change-Id: I85435281b4483a2af454f52b1bf62d933e9a05b9
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1719
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
Alexey Makhalov authored on 2016/11/18 12:00:08Showing 24 changed files
- SPECS/apr-util/apr-util.spec
- SPECS/cracklib/cracklib.spec
- SPECS/cve-check-tool/cve-check-tool.spec
- SPECS/libhif/libhif.spec
- SPECS/libsolv/libsolv.spec
- SPECS/libsoup/libsoup.spec
- SPECS/mesos/mesos.spec
- SPECS/nss/nss.spec
- SPECS/perl-DBD-SQLite/perl-DBD-SQLite.spec
- SPECS/python-sqlalchemy/python-sqlalchemy.spec
- SPECS/python2/python2.spec
- SPECS/python3/python3.spec
- SPECS/rpm/rpm.spec
- SPECS/sqlite-autoconf/sqlite-autoconf.spec
- SPECS/subversion/subversion.spec
- SPECS/systemtap/systemtap.spec
- SPECS/tdnf/tdnf.spec
- SPECS/yum-metadata-parser/yum-metadata-parser.spec
- common/data/packages_iso.json
- common/data/packages_ostree_server.json
- support/package-builder/PackageBuilder.py
- support/package-builder/ToolChainUtils.py
- support/package-builder/builder.py
- support/package-builder/constants.py
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache Portable Runtime Utility Library |
| 2 | 2 |
Name: apr-util |
| 3 | 3 |
Version: 1.5.4 |
| 4 |
-Release: 7%{?dist}
|
|
| 4 |
+Release: 8%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: https://apr.apache.org/ |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -12,7 +12,7 @@ Source0: http://archive.apache.org/dist/apr/%{name}-%{version}.tar.gz
|
| 12 | 12 |
%define apuver 1 |
| 13 | 13 |
|
| 14 | 14 |
BuildRequires: apr-devel |
| 15 |
-BuildRequires: openssl |
|
| 15 |
+BuildRequires: sqlite-devel |
|
| 16 | 16 |
BuildRequires: openssl-devel |
| 17 | 17 |
BuildRequires: nss-devel |
| 18 | 18 |
Requires: apr |
| ... | ... |
@@ -115,12 +115,14 @@ rm -rf $RPM_BUILD_ROOT |
| 115 | 115 |
%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
|
| 116 | 116 |
|
| 117 | 117 |
%changelog |
| 118 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.4-7 |
|
| 119 |
-- GA - Bump release of all rpms |
|
| 118 |
+* Fri Nov 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.5.4-8 |
|
| 119 |
+- Add sqlite-devel build deps |
|
| 120 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.4-7 |
|
| 121 |
+- GA - Bump release of all rpms |
|
| 120 | 122 |
* Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.4-6 |
| 121 | 123 |
- remove libexpat files |
| 122 |
-* Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-5 |
|
| 123 |
-- Updated build-requires after creating devel package for apr. |
|
| 124 |
+* Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-5 |
|
| 125 |
+- Updated build-requires after creating devel package for apr. |
|
| 124 | 126 |
* Wed Sep 16 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.4-4 |
| 125 | 127 |
- Seperate Separate apr-util to apr-util, apr-util-devel, aprutil-ldap, apr-util-pgsql, and apr-utilsqlite. |
| 126 | 128 |
* Wed Jul 15 2015 Sarah Choi <sarahc@vmware.com> 1.5.4-4 |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: A password strength-checking library. |
| 4 | 4 |
Name: cracklib |
| 5 | 5 |
Version: 2.9.6 |
| 6 |
-Release: 3%{?dist}
|
|
| 6 |
+Release: 4%{?dist}
|
|
| 7 | 7 |
Group: System Environment/Libraries |
| 8 | 8 |
Source: cracklib-%{version}.tar.gz
|
| 9 | 9 |
%define sha1 cracklib-2.9.6=9199e7b8830717565a844430653f5a90a04fcd65 |
| ... | ... |
@@ -109,7 +109,6 @@ util/cracklib-format dicts/cracklib* | util/cracklib-packer $RPM_BUILD_ROOT/%{_d
|
| 109 | 109 |
rm -f $RPM_BUILD_ROOT/%{_datadir}/cracklib/cracklib-small
|
| 110 | 110 |
ln -s cracklib-format $RPM_BUILD_ROOT/%{_sbindir}/mkdict
|
| 111 | 111 |
ln -s cracklib-packer $RPM_BUILD_ROOT/%{_sbindir}/packer
|
| 112 |
-gzip -9 $RPM_BUILD_ROOT/%{_datadir}/cracklib/pw_dict.pwd
|
|
| 113 | 112 |
|
| 114 | 113 |
%check |
| 115 | 114 |
mkdir -p /usr/share/cracklib |
| ... | ... |
@@ -149,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT |
| 149 | 149 |
%{_datadir}/locale/*
|
| 150 | 150 |
|
| 151 | 151 |
%changelog |
| 152 |
+* Sun Nov 20 2016 Alexey Makhalov <amakhalov@vmware.com> 2.9.6-4 |
|
| 153 |
+- Revert compressing pw_dict.pwd back. Python code |
|
| 154 |
+ cracklib.VeryFascistCheck does not handle it. |
|
| 152 | 155 |
* Tue Nov 15 2016 Alexey Makhalov <amakhalov@vmware.com> 2.9.6-3 |
| 153 | 156 |
- Remove any dicts from cracklib main package |
| 154 | 157 |
- Compress pw_dict.pwd file |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: cve-check-tool, as its name suggests, is a tool for checking known (public) CVEs. |
| 2 | 2 |
Name: cve-check-tool |
| 3 | 3 |
Version: 5.6.4.1 |
| 4 |
-Release: 4%{?dist}
|
|
| 4 |
+Release: 5%{?dist}
|
|
| 5 | 5 |
Source0: cve-check-tool-%{version}.tar.gz
|
| 6 | 6 |
%define sha1 cve-check-tool=880719673907f5e69ece5180e762611fa66f4ae2 |
| 7 | 7 |
Source1: packages-mapping.cfg |
| ... | ... |
@@ -20,10 +20,10 @@ BuildRequires: libtool |
| 20 | 20 |
BuildRequires: json-glib-devel |
| 21 | 21 |
BuildRequires: check |
| 22 | 22 |
BuildRequires: libxml2-devel |
| 23 |
-BuildRequires: sqlite-autoconf |
|
| 23 |
+BuildRequires: sqlite-devel |
|
| 24 | 24 |
BuildRequires: curl |
| 25 | 25 |
BuildRequires: openssl-devel |
| 26 |
-Requires: curl |
|
| 26 |
+Requires: curl |
|
| 27 | 27 |
|
| 28 | 28 |
%global security_hardening nonow |
| 29 | 29 |
|
| ... | ... |
@@ -60,24 +60,26 @@ rm -rf %{buildroot}/*
|
| 60 | 60 |
%doc %{_mandir}/man1/*
|
| 61 | 61 |
|
| 62 | 62 |
%changelog |
| 63 |
-* Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 5.6.4.1-4 |
|
| 64 |
-- 0004-Mapping-supports-vendor-product-combination.patch |
|
| 65 |
- to support package=vendor:product mapping |
|
| 66 |
-* Fri Oct 28 2016 Alexey Makhalov <amakhalov@vmware.com> 5.6.4.1-3 |
|
| 67 |
-- N-to-M-mapping-support.patch |
|
| 68 |
- reverse key-values in the mapping file. Photon package name as a key |
|
| 69 |
- and NVD product name(s) as a value. |
|
| 70 |
-- mapping: added python[23]->python and curl->curl libcurl |
|
| 71 |
-* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 5.6.4.1-2 |
|
| 72 |
-- Modified %check |
|
| 73 |
-* Wed Aug 31 2016 Alexey Makhalov <amakhalov@vmware.com> 5.6.4.1-1 |
|
| 74 |
-- Update to version 5.6.4.1 (commit 72e272d) |
|
| 75 |
-- Add packages mapping file for Photon OS |
|
| 76 |
-- new option '-r' to select report plugin to use |
|
| 77 |
-- csv2-output-plugin.patch for alternative csv output |
|
| 78 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.6.2-2 |
|
| 79 |
-- GA - Bump release of all rpms |
|
| 80 |
-* Wed Feb 24 2016 Kumar Kaushik <kaushikk@vmware.com> |
|
| 81 |
-- Updating version to 5.6.2. |
|
| 82 |
-* Wed Jul 29 2015 Luis Zuniga <lzuniga@vmware.com> |
|
| 83 |
-- Added new version of cve-check-tool |
|
| 63 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 5.6.4.1-5 |
|
| 64 |
+- Use sqlite-devel |
|
| 65 |
+* Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 5.6.4.1-4 |
|
| 66 |
+- 0004-Mapping-supports-vendor-product-combination.patch |
|
| 67 |
+ to support package=vendor:product mapping |
|
| 68 |
+* Fri Oct 28 2016 Alexey Makhalov <amakhalov@vmware.com> 5.6.4.1-3 |
|
| 69 |
+- N-to-M-mapping-support.patch |
|
| 70 |
+ reverse key-values in the mapping file. Photon package name as a key |
|
| 71 |
+ and NVD product name(s) as a value. |
|
| 72 |
+- mapping: added python[23]->python and curl->curl libcurl |
|
| 73 |
+* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 5.6.4.1-2 |
|
| 74 |
+- Modified %check |
|
| 75 |
+* Wed Aug 31 2016 Alexey Makhalov <amakhalov@vmware.com> 5.6.4.1-1 |
|
| 76 |
+- Update to version 5.6.4.1 (commit 72e272d) |
|
| 77 |
+- Add packages mapping file for Photon OS |
|
| 78 |
+- new option '-r' to select report plugin to use |
|
| 79 |
+- csv2-output-plugin.patch for alternative csv output |
|
| 80 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.6.2-2 |
|
| 81 |
+- GA - Bump release of all rpms |
|
| 82 |
+* Wed Feb 24 2016 Kumar Kaushik <kaushikk@vmware.com> |
|
| 83 |
+- Updating version to 5.6.2. |
|
| 84 |
+* Wed Jul 29 2015 Luis Zuniga <lzuniga@vmware.com> |
|
| 85 |
+- Added new version of cve-check-tool |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Simple package manager built on top of hawkey and librepo |
| 5 | 5 |
Name: libhif |
| 6 | 6 |
Version: 0.2.2 |
| 7 |
-Release: 3%{?dist}
|
|
| 7 |
+Release: 4%{?dist}
|
|
| 8 | 8 |
License: LGPLv2+ |
| 9 | 9 |
URL: https://github.com/hughsie/libhif |
| 10 | 10 |
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
|
| ... | ... |
@@ -31,7 +31,7 @@ Requires: librepo |
| 31 | 31 |
Requires: libsolv |
| 32 | 32 |
Requires: gobject-introspection |
| 33 | 33 |
Requires: hawkey |
| 34 |
-Requires: rpm |
|
| 34 |
+Requires: rpm-libs |
|
| 35 | 35 |
Requires: glib >= 2.16.1 |
| 36 | 36 |
|
| 37 | 37 |
%description |
| ... | ... |
@@ -85,11 +85,13 @@ make %{?_smp_mflags} check
|
| 85 | 85 |
%{_datadir}/gir-1.0/*.gir
|
| 86 | 86 |
|
| 87 | 87 |
%changelog |
| 88 |
-* Thu Oct 06 2016 ChangLee <changlee@vmware.com> 0.2.2-3 |
|
| 89 |
-- Modified %check |
|
| 90 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.2.2-2 |
|
| 91 |
-- GA - Bump release of all rpms |
|
| 92 |
-* Tue Feb 23 2016 Kumar Kaushik <kaushikk@vmware.com> 0.2.2-1 |
|
| 93 |
-- Updated to new version. |
|
| 94 |
-* Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 0.2.0-1 |
|
| 95 |
-- Updated version |
|
| 88 |
+* Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 0.2.2-4 |
|
| 89 |
+- Use rpm-libs at runtime |
|
| 90 |
+* Thu Oct 06 2016 ChangLee <changlee@vmware.com> 0.2.2-3 |
|
| 91 |
+- Modified %check |
|
| 92 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.2.2-2 |
|
| 93 |
+- GA - Bump release of all rpms |
|
| 94 |
+* Tue Feb 23 2016 Kumar Kaushik <kaushikk@vmware.com> 0.2.2-1 |
|
| 95 |
+- Updated to new version. |
|
| 96 |
+* Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 0.2.0-1 |
|
| 97 |
+- Updated version |
| ... | ... |
@@ -41,8 +41,8 @@ make %{?_smp_mflags} test
|
| 41 | 41 |
%changelog |
| 42 | 42 |
* Thu Oct 27 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-3 |
| 43 | 43 |
- use libdb |
| 44 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-2 |
|
| 45 |
-- GA - Bump release of all rpms |
|
| 44 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-2 |
|
| 45 |
+- GA - Bump release of all rpms |
|
| 46 | 46 |
* Tue Feb 23 2016 Anish Swaminathan <anishs@vmware.com> 0.6.19-1 |
| 47 | 47 |
- Upgrade to 0.6.19 |
| 48 | 48 |
* Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 0.6.17-1 |
| ... | ... |
@@ -51,5 +51,5 @@ make %{?_smp_mflags} test
|
| 51 | 51 |
- Updated build-requires after creating devel package for db. |
| 52 | 52 |
* Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 0.6.6-2 |
| 53 | 53 |
- Updated group. |
| 54 |
-* Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 0.6.6-1 |
|
| 55 |
-- Initial build. First version |
|
| 54 |
+* Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 0.6.6-1 |
|
| 55 |
+- Initial build. First version |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: libsoup HTTP client/server library |
| 2 | 2 |
Name: libsoup |
| 3 | 3 |
Version: 2.53.90 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: GPLv2 |
| 6 | 6 |
URL: http://wiki.gnome.org/LibSoup |
| 7 | 7 |
Group: System Environment/Development |
| ... | ... |
@@ -20,6 +20,7 @@ BuildRequires: python2-devel |
| 20 | 20 |
BuildRequires: python2-tools |
| 21 | 21 |
BuildRequires: glib-networking |
| 22 | 22 |
BuildRequires: autogen |
| 23 |
+BuildRequires: sqlite-devel |
|
| 23 | 24 |
Requires: libxml2 |
| 24 | 25 |
Requires: glib-networking |
| 25 | 26 |
|
| ... | ... |
@@ -87,8 +88,10 @@ make %{?_smp_mflags} check
|
| 87 | 87 |
%defattr(-,root,root) |
| 88 | 88 |
|
| 89 | 89 |
%changelog |
| 90 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.53.90-2 |
|
| 91 |
-- GA - Bump release of all rpms |
|
| 90 |
+* Fri Nov 18 2016 Alexey Makhalov <amakhalov@vmware.com> 2.53.90-3 |
|
| 91 |
+- Add sqlite-devel build deps |
|
| 92 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.53.90-2 |
|
| 93 |
+- GA - Bump release of all rpms |
|
| 92 | 94 |
* Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 2.53.90-1 |
| 93 | 95 |
- Updated version. |
| 94 | 96 |
* Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 2.50.0-5 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Mesos |
| 2 | 2 |
Name: mesos |
| 3 | 3 |
Version: 0.28.2 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: Apache |
| 6 | 6 |
URL: http://mesos.apache.org |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -25,6 +25,7 @@ BuildRequires: python2-libs |
| 25 | 25 |
BuildRequires: python-xml |
| 26 | 26 |
BuildRequires: python2-devel |
| 27 | 27 |
BuildRequires: python-setuptools |
| 28 |
+BuildRequires: sqlite-devel |
|
| 28 | 29 |
Requires: apr >= 1.5.2 |
| 29 | 30 |
Requires: apr-util >= 1.5.4 |
| 30 | 31 |
Requires: cyrus-sasl >= 2.1.26 |
| ... | ... |
@@ -95,25 +96,27 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
|
| 95 | 95 |
%exclude %{_libdir}/debug/
|
| 96 | 96 |
|
| 97 | 97 |
%changelog |
| 98 |
-* Mon Oct 03 2016 ChangLee <changlee@vmware.com> 0.28.2-2 |
|
| 99 |
-- Modified check |
|
| 100 |
-* Fri Jun 24 2016 Xiaolin Li <xiaolinl@vmware.com> 0.28.2-1 |
|
| 101 |
-- Upgraded to version 0.28.2 |
|
| 102 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.24.0-3 |
|
| 103 |
-- GA - Bump release of all rpms |
|
| 104 |
-* Tue May 3 2016 Xiaolin Li <xiaolinl@vmware.com> 0.24.0-2 |
|
| 105 |
-- Add python-setuptools to build requires. |
|
| 106 |
-* Fri Sep 18 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.24.0-1 |
|
| 107 |
-- Upgrade to mesos 0.24.0 |
|
| 108 |
-* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar.com> 0.23.0-3 |
|
| 109 |
-- Updated the dependencies after repackaging the openjdk. |
|
| 110 |
-* Tue Sep 08 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.23.0-2 |
|
| 111 |
-- Move headers, pc, dev libs into devel pkg. |
|
| 112 |
-* Tue Sep 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.23.0-1 |
|
| 113 |
-- Update to mesos 0.23.0. |
|
| 114 |
-* Fri Aug 28 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.22.1-3 |
|
| 115 |
-- Disable parallel build. Fix Requires. |
|
| 116 |
-* Thu Jul 16 2015 Alexey Makhalov <amakhalov@vmware.com> 0.22.1-2 |
|
| 117 |
-- Untar with --no-same-owner to get it compilable in container. |
|
| 118 |
-* Fri Jun 26 2015 Sarah Choi <sarahc@vmware.com> 0.22.1-1 |
|
| 119 |
-- Initial build. First version |
|
| 98 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 0.28.2-3 |
|
| 99 |
+- Use sqlite-{devel,libs}
|
|
| 100 |
+* Mon Oct 03 2016 ChangLee <changlee@vmware.com> 0.28.2-2 |
|
| 101 |
+- Modified check |
|
| 102 |
+* Fri Jun 24 2016 Xiaolin Li <xiaolinl@vmware.com> 0.28.2-1 |
|
| 103 |
+- Upgraded to version 0.28.2 |
|
| 104 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.24.0-3 |
|
| 105 |
+- GA - Bump release of all rpms |
|
| 106 |
+* Tue May 3 2016 Xiaolin Li <xiaolinl@vmware.com> 0.24.0-2 |
|
| 107 |
+- Add python-setuptools to build requires. |
|
| 108 |
+* Fri Sep 18 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.24.0-1 |
|
| 109 |
+- Upgrade to mesos 0.24.0 |
|
| 110 |
+* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar.com> 0.23.0-3 |
|
| 111 |
+- Updated the dependencies after repackaging the openjdk. |
|
| 112 |
+* Tue Sep 08 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.23.0-2 |
|
| 113 |
+- Move headers, pc, dev libs into devel pkg. |
|
| 114 |
+* Tue Sep 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.23.0-1 |
|
| 115 |
+- Update to mesos 0.23.0. |
|
| 116 |
+* Fri Aug 28 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.22.1-3 |
|
| 117 |
+- Disable parallel build. Fix Requires. |
|
| 118 |
+* Thu Jul 16 2015 Alexey Makhalov <amakhalov@vmware.com> 0.22.1-2 |
|
| 119 |
+- Untar with --no-same-owner to get it compilable in container. |
|
| 120 |
+* Fri Jun 26 2015 Sarah Choi <sarahc@vmware.com> 0.22.1-1 |
|
| 121 |
+- Initial build. First version |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Security client |
| 2 | 2 |
Name: nss |
| 3 | 3 |
Version: 3.25 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: MPLv2.0 |
| 6 | 6 |
URL: http://ftp.mozilla.org/pub/mozilla.org/security/nss |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -11,9 +11,9 @@ Source0: %{name}-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 nss=ffa55041a7904bb43afbc6821f479819d9802abf |
| 12 | 12 |
Patch: nss-3.25-standalone-1.patch |
| 13 | 13 |
Requires: nspr |
| 14 |
-Requires: sqlite-autoconf |
|
| 15 | 14 |
BuildRequires: nspr |
| 16 |
-BuildRequires: sqlite-autoconf |
|
| 15 |
+BuildRequires: sqlite-devel |
|
| 16 |
+Requires: sqlite-libs |
|
| 17 | 17 |
|
| 18 | 18 |
%description |
| 19 | 19 |
The Network Security Services (NSS) package is a set of libraries |
| ... | ... |
@@ -77,6 +77,8 @@ HOST=localhost DOMSUF=localdomain |
| 77 | 77 |
|
| 78 | 78 |
|
| 79 | 79 |
%changelog |
| 80 |
+* Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.25-3 |
|
| 81 |
+- Use sqlite-libs as runtime dependency |
|
| 80 | 82 |
* Mon Oct 04 2016 ChangLee <changLee@vmware.com> 3.25-2 |
| 81 | 83 |
- Modified %check |
| 82 | 84 |
* Tue Jul 05 2016 Anish Swaminathan <anishs@vmware.com> 3.25-1 |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: SQLite DBI Driver |
| 3 | 3 |
Name: perl-DBD-SQLite |
| 4 | 4 |
Version: 1.50 |
| 5 |
-Release: 2%{?dist}
|
|
| 5 |
+Release: 3%{?dist}
|
|
| 6 | 6 |
Group: Development/Libraries |
| 7 | 7 |
License: (GPL+ or Artistic) and Public Domain |
| 8 | 8 |
URL: http://search.cpan.org/dist/DBD-SQLite/ |
| ... | ... |
@@ -10,7 +10,7 @@ Source0: http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/DBD-SQLite- |
| 10 | 10 |
%define sha1 DBD-SQLite=49463e8cf40deb91db8ce36cd8a5d8ccb9cb28c7 |
| 11 | 11 |
Vendor: VMware, Inc. |
| 12 | 12 |
Distribution: Photon |
| 13 |
-BuildRequires: sqlite-autoconf |
|
| 13 |
+BuildRequires: sqlite-devel |
|
| 14 | 14 |
BuildRequires: perl |
| 15 | 15 |
BuildRequires: perl-DBI |
| 16 | 16 |
Requires: perl-DBI |
| ... | ... |
@@ -45,11 +45,13 @@ make test |
| 45 | 45 |
%{_mandir}/man3/*
|
| 46 | 46 |
|
| 47 | 47 |
%changelog |
| 48 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.50-2 |
|
| 49 |
-- GA - Bump release of all rpms |
|
| 48 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 1.50-3 |
|
| 49 |
+- Use sqlite-devel as a BuildRequires |
|
| 50 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.50-2 |
|
| 51 |
+- GA - Bump release of all rpms |
|
| 50 | 52 |
* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.50-1 |
| 51 | 53 |
- Upgraded to version 1.50 |
| 52 |
-* Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 1.48-1 |
|
| 53 |
-- Upgrade version |
|
| 54 |
-* Fri Apr 3 2015 Divya Thaluru <dthaluru@vmware.com> 1.46-1 |
|
| 55 |
-- Initial version. |
|
| 54 |
+* Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 1.48-1 |
|
| 55 |
+- Upgrade version |
|
| 56 |
+* Fri Apr 3 2015 Divya Thaluru <dthaluru@vmware.com> 1.46-1 |
|
| 57 |
+- Initial version. |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Python SQL Toolkit and Object Relational Mapper |
| 2 | 2 |
Name: python-sqlalchemy |
| 3 | 3 |
Version: 1.0.15 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
Url: http://www.sqlalchemy.org |
| 6 | 6 |
License: MIT |
| 7 | 7 |
Group: Development/Languages/Python |
| ... | ... |
@@ -12,12 +12,9 @@ Source0: https://pypi.python.org/packages/18/7d/f230ac50198cfe3cdc957c357 |
| 12 | 12 |
BuildRequires: python2 |
| 13 | 13 |
BuildRequires: python2-libs |
| 14 | 14 |
BuildRequires: python-setuptools |
| 15 |
- |
|
| 16 | 15 |
Requires: python2 |
| 17 | 16 |
Requires: python2-libs |
| 18 | 17 |
|
| 19 |
-BuildArch: noarch |
|
| 20 |
- |
|
| 21 | 18 |
%description |
| 22 | 19 |
SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL. SQLAlchemy provides a full suite of well known enterprise-level persistence patterns, designed for efficient and high-performing database access, adapted into a simple and Pythonic domain language. |
| 23 | 20 |
|
| ... | ... |
@@ -43,5 +40,7 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
| 43 | 43 |
%{python_sitelib}/*
|
| 44 | 44 |
|
| 45 | 45 |
%changelog |
| 46 |
+* Fri Nov 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.0.15-2 |
|
| 47 |
+- Remove noarch |
|
| 46 | 48 |
* Tue Sep 6 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0.15-1 |
| 47 | 49 |
- Initial packaging for Photon |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python2 |
| 3 | 3 |
Version: 2.7.11 |
| 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 |
| ... | ... |
@@ -18,7 +18,7 @@ BuildRequires: bzip2-devel |
| 18 | 18 |
BuildRequires: openssl-devel |
| 19 | 19 |
BuildRequires: expat >= 2.1.0 |
| 20 | 20 |
BuildRequires: libffi >= 3.0.13 |
| 21 |
-BuildRequires: sqlite-autoconf |
|
| 21 |
+BuildRequires: sqlite-devel |
|
| 22 | 22 |
BuildRequires: ncurses-devel |
| 23 | 23 |
BuildRequires: readline-devel |
| 24 | 24 |
Requires: bzip2 |
| ... | ... |
@@ -37,7 +37,7 @@ version is for backward compatibility with other dependent packages. |
| 37 | 37 |
%package libs |
| 38 | 38 |
Summary: The libraries for python runtime |
| 39 | 39 |
Group: Applications/System |
| 40 |
-Requires: sqlite-autoconf |
|
| 40 |
+Requires: sqlite-libs |
|
| 41 | 41 |
Requires: expat >= 2.1.0 |
| 42 | 42 |
Requires: libffi >= 3.0.13 |
| 43 | 43 |
Requires: ncurses |
| ... | ... |
@@ -220,6 +220,8 @@ rm -rf %{buildroot}/*
|
| 220 | 220 |
%{_bindir}/idle*
|
| 221 | 221 |
|
| 222 | 222 |
%changelog |
| 223 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 2.7.11-10 |
|
| 224 |
+- Use sqlite-{devel,libs}
|
|
| 223 | 225 |
* Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 2.7.11-9 |
| 224 | 226 |
- Patch for CVE-2016-5636 |
| 225 | 227 |
* Mon Oct 10 2016 ChangLee <changlee@vmware.com> 2.7.11-8 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python3 |
| 3 | 3 |
Version: 3.5.1 |
| 4 |
-Release: 7%{?dist}
|
|
| 4 |
+Release: 8%{?dist}
|
|
| 5 | 5 |
License: PSF |
| 6 | 6 |
URL: http://www.python.org/ |
| 7 | 7 |
Group: System Environment/Programming |
| ... | ... |
@@ -40,12 +40,12 @@ Group: Applications/System |
| 40 | 40 |
BuildRequires: expat >= 2.1.0 |
| 41 | 41 |
BuildRequires: libffi >= 3.0.13 |
| 42 | 42 |
BuildRequires: ncurses-devel |
| 43 |
-BuildRequires: sqlite-autoconf |
|
| 43 |
+BuildRequires: sqlite-devel |
|
| 44 | 44 |
Requires: coreutils |
| 45 | 45 |
Requires: expat >= 2.1.0 |
| 46 | 46 |
Requires: libffi >= 3.0.13 |
| 47 | 47 |
Requires: ncurses |
| 48 |
-Requires: sqlite-autoconf |
|
| 48 |
+Requires: sqlite-libs |
|
| 49 | 49 |
|
| 50 | 50 |
|
| 51 | 51 |
%description libs |
| ... | ... |
@@ -188,23 +188,25 @@ rm -rf %{buildroot}/*
|
| 188 | 188 |
%{_bindir}/idle*
|
| 189 | 189 |
|
| 190 | 190 |
%changelog |
| 191 |
-* Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-7 |
|
| 192 |
-- Patch for CVE-2016-5636 |
|
| 193 |
-* Mon Oct 10 2016 ChangLee <changlee@vmware.com> 3.5.1-6 |
|
| 194 |
-- Modified %check |
|
| 195 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-5 |
|
| 196 |
-- GA - Bump release of all rpms |
|
| 197 |
-* Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-4 |
|
| 198 |
-- Edit scriptlets. |
|
| 199 |
-* Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-3 |
|
| 200 |
-- update python to require python-libs |
|
| 201 |
-* Thu Apr 07 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.5.1-2 |
|
| 202 |
-- Providing python3 binaries instead of the minor versions. |
|
| 203 |
-* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.1-1 |
|
| 204 |
-- Updated to version 3.5.1 |
|
| 205 |
-* Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.4.3-3 |
|
| 206 |
-- Edit post script. |
|
| 207 |
-* Mon Aug 17 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3-2 |
|
| 208 |
-- Remove python.o file, and minor cleanups. |
|
| 209 |
-* Wed Jul 1 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3 |
|
| 210 |
-- Add Python3 package to Photon. |
|
| 191 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 3.5.1-8 |
|
| 192 |
+- Use sqlite-{devel,libs}
|
|
| 193 |
+* Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-7 |
|
| 194 |
+- Patch for CVE-2016-5636 |
|
| 195 |
+* Mon Oct 10 2016 ChangLee <changlee@vmware.com> 3.5.1-6 |
|
| 196 |
+- Modified %check |
|
| 197 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-5 |
|
| 198 |
+- GA - Bump release of all rpms |
|
| 199 |
+* Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-4 |
|
| 200 |
+- Edit scriptlets. |
|
| 201 |
+* Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-3 |
|
| 202 |
+- update python to require python-libs |
|
| 203 |
+* Thu Apr 07 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.5.1-2 |
|
| 204 |
+- Providing python3 binaries instead of the minor versions. |
|
| 205 |
+* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.1-1 |
|
| 206 |
+- Updated to version 3.5.1 |
|
| 207 |
+* Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.4.3-3 |
|
| 208 |
+- Edit post script. |
|
| 209 |
+* Mon Aug 17 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3-2 |
|
| 210 |
+- Remove python.o file, and minor cleanups. |
|
| 211 |
+* Wed Jul 1 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3 |
|
| 212 |
+- Add Python3 package to Photon. |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Package manager |
| 2 | 2 |
Name: rpm |
| 3 | 3 |
Version: 4.11.2 |
| 4 |
-Release: 14%{?dist}
|
|
| 4 |
+Release: 15%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
URL: http://rpm.org |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -16,14 +16,10 @@ Source3: brp-strip-debug-symbols |
| 16 | 16 |
Source4: brp-strip-unneeded |
| 17 | 17 |
Patch0: find-debuginfo-do-not-generate-non-existing-build-id.patch |
| 18 | 18 |
Patch1: rpm-4.11.2-cve-2014-8118.patch |
| 19 |
-#Requires: nspr |
|
| 20 |
-Requires: nss |
|
| 21 |
-Requires: popt |
|
| 22 |
-Requires: libgcc |
|
| 23 | 19 |
Requires: zlib |
| 24 | 20 |
Requires: bash |
| 25 | 21 |
Requires: elfutils-libelf |
| 26 |
-Requires: libcap |
|
| 22 |
+Requires: rpm-libs = %{version}-%{release}
|
|
| 27 | 23 |
BuildRequires: python2 |
| 28 | 24 |
BuildRequires: python2-libs |
| 29 | 25 |
BuildRequires: python2-devel |
| ... | ... |
@@ -38,13 +34,22 @@ RPM package manager |
| 38 | 38 |
Requires: python2 |
| 39 | 39 |
Summary: Libraries and header files for rpm |
| 40 | 40 |
Provides: pkgconfig(rpm) |
| 41 |
+Requires: %{name} = %{version}-%{release}
|
|
| 41 | 42 |
%description devel |
| 42 | 43 |
Static libraries and header files for the support library for rpm |
| 43 | 44 |
|
| 45 |
+%package libs |
|
| 46 |
+Summary: Libraries for rpm |
|
| 47 |
+Requires: nss |
|
| 48 |
+Requires: popt |
|
| 49 |
+Requires: libgcc |
|
| 50 |
+Requires: libcap |
|
| 51 |
+%description libs |
|
| 52 |
+Shared libraries librpm and librpmio |
|
| 53 |
+ |
|
| 44 | 54 |
%package build |
| 45 | 55 |
Requires: perl |
| 46 |
-Requires: rpm-devel |
|
| 47 |
-Requires: rpm |
|
| 56 |
+Requires: %{name}-devel = %{version}-%{release}
|
|
| 48 | 57 |
Requires: elfutils-libelf |
| 49 | 58 |
Summary: Binaries, scripts and libraries needed to build rpms. |
| 50 | 59 |
%description build |
| ... | ... |
@@ -94,8 +99,8 @@ install -vm755 %{SOURCE4} %{buildroot}%{_libdir}/rpm/
|
| 94 | 94 |
%check |
| 95 | 95 |
make %{?_smp_mflags} check
|
| 96 | 96 |
|
| 97 |
-%post -p /sbin/ldconfig |
|
| 98 |
-%postun -p /sbin/ldconfig |
|
| 97 |
+%post libs -p /sbin/ldconfig |
|
| 98 |
+%postun libs -p /sbin/ldconfig |
|
| 99 | 99 |
%clean |
| 100 | 100 |
rm -rf %{buildroot}
|
| 101 | 101 |
%files -f %{name}.lang
|
| ... | ... |
@@ -136,13 +141,8 @@ rm -rf %{buildroot}
|
| 136 | 136 |
%{_libdir}/rpm/rpmpopt-4.11.2
|
| 137 | 137 |
%{_libdir}/rpm/rpmrc
|
| 138 | 138 |
%{_libdir}/rpm/tgpg
|
| 139 |
-%{_libdir}/librpmbuild.so
|
|
| 140 |
-%{_libdir}/librpmbuild.so.*
|
|
| 141 |
- |
|
| 142 | 139 |
%{_libdir}/rpm/platform/*
|
| 143 | 140 |
%{_libdir}/rpm-plugins/*
|
| 144 |
-%{_libdir}/librpmio.so.*
|
|
| 145 |
-%{_libdir}/librpm.so.*
|
|
| 146 | 141 |
%{_mandir}/man8/rpm.8.gz
|
| 147 | 142 |
%{_mandir}/man8/rpm2cpio.8.gz
|
| 148 | 143 |
%{_mandir}/man8/rpmdb.8.gz
|
| ... | ... |
@@ -156,10 +156,17 @@ rm -rf %{buildroot}
|
| 156 | 156 |
%exclude %{_mandir}/ru/man8/*.gz
|
| 157 | 157 |
%exclude %{_mandir}/sk/man8/*.gz
|
| 158 | 158 |
|
| 159 |
+%files libs |
|
| 160 |
+%defattr(-,root,root) |
|
| 161 |
+%{_libdir}/librpmio.so.*
|
|
| 162 |
+%{_libdir}/librpm.so.*
|
|
| 163 |
+ |
|
| 159 | 164 |
%files build |
| 160 | 165 |
%{_bindir}/rpmbuild
|
| 161 | 166 |
%{_bindir}/rpmsign
|
| 162 | 167 |
%{_bindir}/rpmspec
|
| 168 |
+%{_libdir}/librpmbuild.so
|
|
| 169 |
+%{_libdir}/librpmbuild.so.*
|
|
| 163 | 170 |
%{_libdir}/rpm/osgideps.pl
|
| 164 | 171 |
%{_libdir}/rpm/perldeps.pl
|
| 165 | 172 |
%{_libdir}/rpm/macros.perl
|
| ... | ... |
@@ -199,6 +206,8 @@ rm -rf %{buildroot}
|
| 199 | 199 |
%{_libdir}/librpmsign.so.*
|
| 200 | 200 |
|
| 201 | 201 |
%changelog |
| 202 |
+* Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 4.11.2-15 |
|
| 203 |
+- Added -libs subpackage |
|
| 202 | 204 |
* Tue Nov 15 2016 Alexey Makhalov <amakhalov@vmware.com> 4.11.2-14 |
| 203 | 205 |
- Disable lua support |
| 204 | 206 |
* Tue Oct 18 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.11.2-13 |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: A portable, high level programming interface to various calling conventions |
| 3 | 3 |
Name: sqlite-autoconf |
| 4 | 4 |
Version: 3.11.0 |
| 5 |
-Release: 3%{?dist}
|
|
| 5 |
+Release: 4%{?dist}
|
|
| 6 | 6 |
License: Public Domain |
| 7 | 7 |
URL: http://www.sqlite.org |
| 8 | 8 |
Group: System Environment/GeneralLibraries |
| ... | ... |
@@ -11,11 +11,28 @@ Distribution: Photon |
| 11 | 11 |
Source0: http://sqlite.org/2016/%{name}-3110000.tar.gz
|
| 12 | 12 |
%define sha1 sqlite-autoconf=e2d300e4b24af5ecd67a1396488893fa44864e36 |
| 13 | 13 |
Obsoletes: libsqlite |
| 14 |
+Requires: sqlite-libs = %{version}-%{release}
|
|
| 14 | 15 |
Provides: sqlite3 |
| 15 | 16 |
%description |
| 16 | 17 |
This package contains most of the static files that comprise the |
| 17 | 18 |
www.sqlite.org website including all of the SQL Syntax and the |
| 18 | 19 |
C/C++ interface specs and other miscellaneous documentation. |
| 20 |
+ |
|
| 21 |
+%package -n sqlite-devel |
|
| 22 |
+Summary: sqlite3 link library & header files |
|
| 23 |
+Group: Development/Libraries |
|
| 24 |
+Requires: %{name} = %{version}-%{release}
|
|
| 25 |
+%description -n sqlite-devel |
|
| 26 |
+The sqlite devel package include the needed library link and |
|
| 27 |
+header files for development. |
|
| 28 |
+ |
|
| 29 |
+%package -n sqlite-libs |
|
| 30 |
+Summary: sqlite3 library |
|
| 31 |
+Group: Libraries |
|
| 32 |
+Provides: pkgconfig(sqlite3) |
|
| 33 |
+%description -n sqlite-libs |
|
| 34 |
+The sqlite3 library. |
|
| 35 |
+ |
|
| 19 | 36 |
%prep |
| 20 | 37 |
%setup -q -n %{name}-%{sourcever}
|
| 21 | 38 |
%build |
| ... | ... |
@@ -29,7 +46,7 @@ C/C++ interface specs and other miscellaneous documentation. |
| 29 | 29 |
--bindir=%{_bindir} \
|
| 30 | 30 |
--libdir=%{_libdir} \
|
| 31 | 31 |
--disable-static |
| 32 |
-make -j1 |
|
| 32 |
+make |
|
| 33 | 33 |
%install |
| 34 | 34 |
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
|
| 35 | 35 |
make DESTDIR=%{buildroot} install
|
| ... | ... |
@@ -41,25 +58,41 @@ rm -rf %{buildroot}/%{_infodir}
|
| 41 | 41 |
%check |
| 42 | 42 |
make %{?_smp_mflags} check
|
| 43 | 43 |
|
| 44 |
-%post -p /sbin/ldconfig |
|
| 45 |
-%postun -p /sbin/ldconfig |
|
| 44 |
+%post -n sqlite-libs |
|
| 45 |
+/sbin/ldconfig |
|
| 46 |
+ |
|
| 47 |
+%postun -n sqlite-libs |
|
| 48 |
+/sbin/ldconfig |
|
| 49 |
+ |
|
| 46 | 50 |
%clean |
| 47 | 51 |
rm -rf %{buildroot}/*
|
| 52 |
+ |
|
| 48 | 53 |
%files |
| 49 | 54 |
%defattr(-,root,root) |
| 50 |
-%{_libdir}/*.so*
|
|
| 51 | 55 |
%{_bindir}/*
|
| 52 |
-%{_includedir}/*
|
|
| 53 |
-%{_libdir}/pkgconfig/*
|
|
| 54 | 56 |
%{_mandir}/man1/*
|
| 57 |
+ |
|
| 58 |
+%files -n sqlite-devel |
|
| 59 |
+%defattr(-,root,root) |
|
| 60 |
+%{_libdir}/libsqlite3.so
|
|
| 61 |
+%{_libdir}/libsqlite3.so.0
|
|
| 62 |
+%{_libdir}/pkgconfig/*
|
|
| 63 |
+%{_includedir}/*
|
|
| 64 |
+ |
|
| 65 |
+%files -n sqlite-libs |
|
| 66 |
+%defattr(-,root,root) |
|
| 67 |
+%{_libdir}/libsqlite3.so.0.8.6
|
|
| 68 |
+ |
|
| 55 | 69 |
%changelog |
| 56 |
-* Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.11.0-3 |
|
| 57 |
-- Modified %check |
|
| 58 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11.0-2 |
|
| 59 |
-- GA - Bump release of all rpms |
|
| 70 |
+* Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.11.0-4 |
|
| 71 |
+- Added -devel and -libs subpackages |
|
| 72 |
+* Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.11.0-3 |
|
| 73 |
+- Modified %check |
|
| 74 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11.0-2 |
|
| 75 |
+- GA - Bump release of all rpms |
|
| 60 | 76 |
* Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 3.11.0-1 |
| 61 | 77 |
- Updated to version 3.11.0 |
| 62 |
-* Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> - 3.8.3.1-2 |
|
| 63 |
-- Fix versioning |
|
| 64 |
-* Mon Oct 7 2014 Divya Thaluru <dthaluru@vmware.com> 3080301-1 |
|
| 65 |
-- Initial build. First version |
|
| 78 |
+* Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> - 3.8.3.1-2 |
|
| 79 |
+- Fix versioning |
|
| 80 |
+* Mon Oct 7 2014 Divya Thaluru <dthaluru@vmware.com> 3080301-1 |
|
| 81 |
+- Initial build. First version |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache Subversion control system |
| 2 | 2 |
Name: subversion |
| 3 | 3 |
Version: 1.9.3 |
| 4 |
-Release: 7%{?dist}
|
|
| 4 |
+Release: 8%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: http://subversion.apache.org/ |
| 7 | 7 |
Group: Utilities/System |
| ... | ... |
@@ -14,7 +14,7 @@ Requires: apr-util |
| 14 | 14 |
BuildRequires: apr-devel |
| 15 | 15 |
BuildRequires: apr-util |
| 16 | 16 |
BuildRequires: apr-util-devel |
| 17 |
-BuildRequires: sqlite-autoconf |
|
| 17 |
+BuildRequires: sqlite-devel |
|
| 18 | 18 |
BuildRequires: libtool |
| 19 | 19 |
BuildRequires: expat |
| 20 | 20 |
|
| ... | ... |
@@ -56,19 +56,21 @@ make %{?_smp_mflags} check
|
| 56 | 56 |
%exclude %{_libdir}/debug/
|
| 57 | 57 |
|
| 58 | 58 |
%changelog |
| 59 |
-* Mon Oct 10 2016 ChangLee <changlee@vmware.com> 1.9.3-7 |
|
| 60 |
-- Modified %check |
|
| 61 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.3-6 |
|
| 62 |
-- GA - Bump release of all rpms |
|
| 59 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 1.9.3-8 |
|
| 60 |
+- Use sqlite-{devel,libs}
|
|
| 61 |
+* Mon Oct 10 2016 ChangLee <changlee@vmware.com> 1.9.3-7 |
|
| 62 |
+- Modified %check |
|
| 63 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.3-6 |
|
| 64 |
+- GA - Bump release of all rpms |
|
| 63 | 65 |
* Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 1.9.3-1 |
| 64 | 66 |
- Updated to version 1.9.3 |
| 65 |
-* Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 1.8.13-5 |
|
| 66 |
-- Handled locale files with macro find_lang |
|
| 67 |
-* Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.13-4 |
|
| 68 |
-- Updated build-requires after creating devel package for apr. |
|
| 67 |
+* Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 1.8.13-5 |
|
| 68 |
+- Handled locale files with macro find_lang |
|
| 69 |
+* Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.13-4 |
|
| 70 |
+- Updated build-requires after creating devel package for apr. |
|
| 69 | 71 |
* Mon Sep 21 2015 Xiaolin Li <xiaolinl@vmware.com> 1.8.13-3 |
| 70 | 72 |
- Move .a, and .so files to devel pkg. |
| 71 |
-* Tue Sep 08 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.13-2 |
|
| 72 |
-- Move headers into devel pkg. |
|
| 73 |
-* Fri Jun 26 2015 Sarah Choi <sarahc@vmware.com> 1.8.13-1 |
|
| 74 |
-- Initial build. First version |
|
| 73 |
+* Tue Sep 08 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.13-2 |
|
| 74 |
+- Move headers into devel pkg. |
|
| 75 |
+* Fri Jun 26 2015 Sarah Choi <sarahc@vmware.com> 1.8.13-1 |
|
| 76 |
+- Initial build. First version |
| ... | ... |
@@ -8,7 +8,7 @@ |
| 8 | 8 |
|
| 9 | 9 |
Name: systemtap |
| 10 | 10 |
Version: 3.0 |
| 11 |
-Release: 2%{?dist}
|
|
| 11 |
+Release: 3%{?dist}
|
|
| 12 | 12 |
Summary: Programmable system-wide instrumentation system |
| 13 | 13 |
Group: Development/System |
| 14 | 14 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -24,7 +24,7 @@ BuildRequires: elfutils-libelf-devel |
| 24 | 24 |
BuildRequires: libgcc |
| 25 | 25 |
BuildRequires: nspr |
| 26 | 26 |
BuildRequires: nss-devel |
| 27 |
-BuildRequires: sqlite-autoconf |
|
| 27 |
+BuildRequires: sqlite-devel |
|
| 28 | 28 |
BuildRequires: libstdc++-devel |
| 29 | 29 |
BuildRequires: libtirpc-devel |
| 30 | 30 |
BuildRequires: libxml2-devel |
| ... | ... |
@@ -332,22 +332,24 @@ fi |
| 332 | 332 |
%{_mandir}/man8/stap-server.8*
|
| 333 | 333 |
|
| 334 | 334 |
%changelog |
| 335 |
-* Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.0-2 |
|
| 336 |
-- Modified %check |
|
| 337 |
-* Fri Jul 22 2016 Divya Thaluru <dthaluru@vmware.com> 3.0-1 |
|
| 338 |
-- Updated version to 3.0 |
|
| 339 |
-- Removing patch to enable kernel (fix is present in upstream) |
|
| 340 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-5 |
|
| 341 |
-- GA - Bump release of all rpms |
|
| 342 |
-* Mon May 23 2016 Harish Udaiya KUmar <hudaiyakumar@vmware.com> 2.9-4 |
|
| 343 |
-- Added the patch to enable kernel building with Kernel 4.4 |
|
| 344 |
-* Fri May 20 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-3 |
|
| 345 |
-- Fixed the stap-prep script to be compatible with Photon |
|
| 346 |
-* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-2 |
|
| 347 |
-- Fix for upgrade issues |
|
| 348 |
-* Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-1 |
|
| 349 |
-- Updated version to 2.9 |
|
| 350 |
-* Fri Dec 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7-2 |
|
| 351 |
-- Move dtrace to the main package. |
|
| 352 |
-* Wed Nov 18 2015 Anish Swaminathan <anishs@vmware.com> 2.7-1 |
|
| 353 |
-- Initial build. First version |
|
| 335 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 3.0-3 |
|
| 336 |
+- Use sqlite-{devel,libs}
|
|
| 337 |
+* Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.0-2 |
|
| 338 |
+- Modified %check |
|
| 339 |
+* Fri Jul 22 2016 Divya Thaluru <dthaluru@vmware.com> 3.0-1 |
|
| 340 |
+- Updated version to 3.0 |
|
| 341 |
+- Removing patch to enable kernel (fix is present in upstream) |
|
| 342 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-5 |
|
| 343 |
+- GA - Bump release of all rpms |
|
| 344 |
+* Mon May 23 2016 Harish Udaiya KUmar <hudaiyakumar@vmware.com> 2.9-4 |
|
| 345 |
+- Added the patch to enable kernel building with Kernel 4.4 |
|
| 346 |
+* Fri May 20 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-3 |
|
| 347 |
+- Fixed the stap-prep script to be compatible with Photon |
|
| 348 |
+* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-2 |
|
| 349 |
+- Fix for upgrade issues |
|
| 350 |
+* Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-1 |
|
| 351 |
+- Updated version to 2.9 |
|
| 352 |
+* Fri Dec 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7-2 |
|
| 353 |
+- Move dtrace to the main package. |
|
| 354 |
+* Wed Nov 18 2015 Anish Swaminathan <anishs@vmware.com> 2.7-1 |
|
| 355 |
+- Initial build. First version |
| ... | ... |
@@ -4,13 +4,13 @@ |
| 4 | 4 |
Summary: dnf/yum equivalent using C libs |
| 5 | 5 |
Name: tdnf |
| 6 | 6 |
Version: 1.0.9 |
| 7 |
-Release: 2%{?dist}
|
|
| 7 |
+Release: 3%{?dist}
|
|
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
License: VMware |
| 11 | 11 |
Url: http://www.vmware.com |
| 12 | 12 |
Group: Applications/RPM |
| 13 |
-Requires: hawkey, librepo, rpm |
|
| 13 |
+Requires: hawkey, librepo, rpm-libs |
|
| 14 | 14 |
BuildRequires: popt-devel |
| 15 | 15 |
BuildRequires: rpm-devel |
| 16 | 16 |
BuildRequires: glib-devel |
| ... | ... |
@@ -92,6 +92,8 @@ mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/tdnf
|
| 92 | 92 |
%exclude %{_libdir}/debug
|
| 93 | 93 |
|
| 94 | 94 |
%changelog |
| 95 |
+* Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 1.0.9-3 |
|
| 96 |
+- Use rpm-libs at runtime |
|
| 95 | 97 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.9-2 |
| 96 | 98 |
- GA - Bump release of all rpms |
| 97 | 99 |
* Fri May 20 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.9-1 |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: A fast metadata parser for yum |
| 4 | 4 |
Name: yum-metadata-parser |
| 5 | 5 |
Version: 1.1.4 |
| 6 |
-Release: 2%{?dist}
|
|
| 6 |
+Release: 3%{?dist}
|
|
| 7 | 7 |
Source0: %{name}-%{version}.tar.gz
|
| 8 | 8 |
%define sha1 yum-metadata-parser=044e69a04ea5ac39d79020d9e1f1a35c9dc64d9b |
| 9 | 9 |
License: GPLv2+ |
| ... | ... |
@@ -16,7 +16,7 @@ BuildRequires: python2-devel |
| 16 | 16 |
BuildRequires: glib-devel |
| 17 | 17 |
BuildRequires: libxml2 |
| 18 | 18 |
BuildRequires: libxml2-devel |
| 19 |
-BuildRequires: sqlite-autoconf |
|
| 19 |
+BuildRequires: sqlite-devel |
|
| 20 | 20 |
BuildRequires: python2-libs |
| 21 | 21 |
Requires: libxml2 |
| 22 | 22 |
Requires: glib |
| ... | ... |
@@ -46,5 +46,7 @@ Fast metadata parser for yum implemented in C. |
| 46 | 46 |
%{python_sitelib_platform}/*egg-info
|
| 47 | 47 |
|
| 48 | 48 |
%changelog |
| 49 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.4-2 |
|
| 50 |
-- GA - Bump release of all rpms |
|
| 49 |
+* Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 1.1.4-3 |
|
| 50 |
+- Use sqlite-{devel,libs}
|
|
| 51 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.4-2 |
|
| 52 |
+- GA - Bump release of all rpms |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
"bzip2","pkg-config","ncurses","ncurses-compat","cracklib","cracklib-dicts","cracklib-python", |
| 4 | 4 |
"shadow","coreutils","grep","readline","findutils","xz","util-linux","e2fsprogs", |
| 5 | 5 |
"libffi","expat","linux","cpio","Linux-PAM","attr","libcap", "systemd","dbus", |
| 6 |
- "gzip", "sqlite-autoconf","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo", |
|
| 6 |
+ "gzip", "sqlite-libs","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo", |
|
| 7 | 7 |
"hawkey", "python2","python2-libs","pcre","glib", "tdnf", "python-requests", |
| 8 | 8 |
"grub2","dracut", "curl", "ostree"] |
| 9 | 9 |
} |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
{
|
| 2 | 2 |
"packages": ["gc", "libunistring", "libffi", "libltdl", "gmp", "guile", "openssl", |
| 3 | 3 |
"autogen", "ncurses", "ncurses-compat", "ca-certificates", "libtasn1", "e2fsprogs", "nettle", |
| 4 |
- "bzip2", "e2fsprogs-devel", "xz", "readline", "glibc", "sqlite-autoconf", |
|
| 4 |
+ "bzip2", "e2fsprogs-devel", "xz", "readline", "glibc", "sqlite-libs", |
|
| 5 | 5 |
"bash", "python2", "python2-libs", "python-xml", "nspr", "gnutls", "filesystem", "libgcc", "krb5", |
| 6 | 6 |
"libassuan", "libxml2", "expat", "gdbm", "openssl-devel", "popt", "curl", |
| 7 | 7 |
"nss", "gpgme", "systemd", "libsolv", "coreutils", "lua", "libgpg-error", |
| ... | ... |
@@ -23,7 +23,7 @@ class PackageBuilder(object): |
| 23 | 23 |
self.listBuildOptionPackages=listBuildOptionPackages |
| 24 | 24 |
self.pkgBuildOptionFile=pkgBuildOptionFile |
| 25 | 25 |
|
| 26 |
- def prepareBuildRoot(self,chrootName,isToolChainPackage=False): |
|
| 26 |
+ def prepareBuildRoot(self,chrootName): |
|
| 27 | 27 |
chrootID=None |
| 28 | 28 |
try: |
| 29 | 29 |
chrUtils = ChrootUtils(self.logName,self.logPath) |
| ... | ... |
@@ -32,7 +32,7 @@ class PackageBuilder(object): |
| 32 | 32 |
if not returnVal: |
| 33 | 33 |
raise Exception("Unable to prepare build root")
|
| 34 | 34 |
tUtils=ToolChainUtils(self.logName,self.logPath) |
| 35 |
- tUtils.installToolChain(chrootID) |
|
| 35 |
+ tUtils.installToolChainRPMS(chrootID) |
|
| 36 | 36 |
except Exception as e: |
| 37 | 37 |
if chrootID is not None: |
| 38 | 38 |
self.logger.debug("Deleting chroot: " + chrootID)
|
| ... | ... |
@@ -98,11 +98,8 @@ class PackageBuilder(object): |
| 98 | 98 |
chrUtils = ChrootUtils(self.logName,self.logPath) |
| 99 | 99 |
chrootName="build-"+package |
| 100 | 100 |
chrootID=None |
| 101 |
- isToolChainPackage=False |
|
| 102 |
- if package in constants.listToolChainPackages: |
|
| 103 |
- isToolChainPackage=True |
|
| 104 | 101 |
try: |
| 105 |
- chrootID = self.prepareBuildRoot(chrootName,isToolChainPackage) |
|
| 102 |
+ chrootID = self.prepareBuildRoot(chrootName) |
|
| 106 | 103 |
destLogPath=constants.logPath+"/build-"+package |
| 107 | 104 |
if not os.path.isdir(destLogPath): |
| 108 | 105 |
cmdUtils = CommandUtils() |
| ... | ... |
@@ -80,71 +80,6 @@ class ToolChainUtils(object): |
| 80 | 80 |
|
| 81 | 81 |
self.logger.info("Successfully prepared chroot:"+chrootID)
|
| 82 | 82 |
|
| 83 |
- def installToolChain(self,chrootID): |
|
| 84 |
- self.logger.info("Installing toolchain.....")
|
|
| 85 |
- self.prepareBuildRoot(chrootID) |
|
| 86 |
- cmdUtils = CommandUtils() |
|
| 87 |
- |
|
| 88 |
- rpmFiles = "" |
|
| 89 |
- packages = "" |
|
| 90 |
- for package in constants.listToolChainRPMPkgsToInstall: |
|
| 91 |
- pkgUtils=PackageUtils(self.logName,self.logPath) |
|
| 92 |
- rpmFile=pkgUtils.findRPMFileForGivenPackage(package) |
|
| 93 |
- if rpmFile is None: |
|
| 94 |
- rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo) |
|
| 95 |
- if rpmFile is None: |
|
| 96 |
- if package == "util-linux-devel": |
|
| 97 |
- self.logger.info("No old version of util-linux-devel exists, skip until the new version is built")
|
|
| 98 |
- continue |
|
| 99 |
- if package == "flex-devel": |
|
| 100 |
- self.logger.info("No old version of flex-devel exists, skip until the new version is built")
|
|
| 101 |
- continue |
|
| 102 |
- |
|
| 103 |
- self.logger.error("Unable to find rpm "+ package +" in current and previous versions")
|
|
| 104 |
- raise Exception("Input Error")
|
|
| 105 |
- rpmFiles += " " + rpmFile |
|
| 106 |
- packages += " " + package |
|
| 107 |
- |
|
| 108 |
- self.logger.debug("Installing toolchain rpms:" + packages)
|
|
| 109 |
- cmd=self.rpmCommand + " -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles |
|
| 110 |
- process = subprocess.Popen("%s" %cmd,shell=True,stdout=subprocess.PIPE)
|
|
| 111 |
- retval = process.wait() |
|
| 112 |
- if retval != 0: |
|
| 113 |
- self.logger.error("Installing toolchain rpms failed")
|
|
| 114 |
- raise Exception("RPM installation failed")
|
|
| 115 |
- |
|
| 116 |
- self.logger.info("Installed toolchain successfully on chroot:"+chrootID)
|
|
| 117 |
- |
|
| 118 |
- def installCoreToolChainPackages(self,chrootID): |
|
| 119 |
- self.logger.info("Installing toolchain.....")
|
|
| 120 |
- cmdUtils = CommandUtils() |
|
| 121 |
- self.prepareBuildRoot(chrootID) |
|
| 122 |
- |
|
| 123 |
- rpmFiles = "" |
|
| 124 |
- packages = "" |
|
| 125 |
- for package in constants.listToolChainRPMPkgsToBuild: |
|
| 126 |
- pkgUtils=PackageUtils(self.logName,self.logPath) |
|
| 127 |
- rpmFile = None |
|
| 128 |
- if package in constants.listCoreToolChainRPMPackages: |
|
| 129 |
- rpmFile=pkgUtils.findRPMFileForGivenPackage(package) |
|
| 130 |
- else: |
|
| 131 |
- rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo) |
|
| 132 |
- if rpmFile is None: |
|
| 133 |
- self.logger.error("Unable to find rpm "+ package)
|
|
| 134 |
- raise Exception("Input Error")
|
|
| 135 |
- rpmFiles += " " + rpmFile |
|
| 136 |
- packages += " " + package |
|
| 137 |
- |
|
| 138 |
- self.logger.debug("Installing core toolchain rpms:" + packages)
|
|
| 139 |
- cmd=self.rpmCommand + " -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles |
|
| 140 |
- process = subprocess.Popen("%s" %cmd,shell=True,stdout=subprocess.PIPE)
|
|
| 141 |
- retval = process.wait() |
|
| 142 |
- if retval != 0: |
|
| 143 |
- self.logger.error("Installing toolchain rpms failed")
|
|
| 144 |
- raise Exception("RPM installation failed")
|
|
| 145 |
- |
|
| 146 |
- self.logger.info("Installed core tool chain packages successfully on chroot:"+chrootID)
|
|
| 147 |
- |
|
| 148 | 83 |
def findRPMFileInGivenLocation(self,package,rpmdirPath): |
| 149 | 84 |
cmdUtils = CommandUtils() |
| 150 | 85 |
listFoundRPMFiles = cmdUtils.findFile(package+"-*.rpm",rpmdirPath) |
| ... | ... |
@@ -168,7 +103,7 @@ class ToolChainUtils(object): |
| 168 | 168 |
chrootID=None |
| 169 | 169 |
try: |
| 170 | 170 |
pkgUtils=PackageUtils(self.logName,self.logPath) |
| 171 |
- for package in constants.listCoreToolChainRPMPackages: |
|
| 171 |
+ for package in constants.listCoreToolChainPackages: |
|
| 172 | 172 |
rpmPkg=pkgUtils.findRPMFileForGivenPackage(package) |
| 173 | 173 |
if rpmPkg is not None: |
| 174 | 174 |
continue |
| ... | ... |
@@ -202,17 +137,14 @@ class ToolChainUtils(object): |
| 202 | 202 |
self.logger.info("Installing Tool Chain RPMS.......")
|
| 203 | 203 |
rpmFiles = "" |
| 204 | 204 |
packages = "" |
| 205 |
- for package in constants.listToolChainRPMPkgsToBuild: |
|
| 205 |
+ for package in constants.listToolChainRPMsToInstall: |
|
| 206 | 206 |
pkgUtils=PackageUtils(self.logName,self.logPath) |
| 207 | 207 |
rpmFile=pkgUtils.findRPMFileForGivenPackage(package) |
| 208 | 208 |
if rpmFile is None: |
| 209 | 209 |
rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo) |
| 210 | 210 |
if rpmFile is None: |
| 211 |
- if package == "util-linux-devel": |
|
| 212 |
- self.logger.info("No old version of util-linux-devel exists, skip until the new version is built")
|
|
| 213 |
- continue |
|
| 214 |
- if package == "flex-devel": |
|
| 215 |
- self.logger.info("No old version of flex-devel exists, skip until the new version is built")
|
|
| 211 |
+ if package in constants.listOfRPMsProvidedAfterBuild: |
|
| 212 |
+ self.logger.info("No old version of "+package+" exists, skip until the new version is built")
|
|
| 216 | 213 |
continue |
| 217 | 214 |
self.logger.error("Unable to find rpm "+ package +" in current and previous versions")
|
| 218 | 215 |
raise Exception("Input Error")
|
| ... | ... |
@@ -147,10 +147,6 @@ def main(): |
| 147 | 147 |
SourcePackageInfo.writePkgListToFile(pkgInfoJsonFile) |
| 148 | 148 |
sys.exit(0) |
| 149 | 149 |
|
| 150 |
-def buildToolChain(buildThreads): |
|
| 151 |
- pkgManager = PackageManager() |
|
| 152 |
- pkgManager.buildToolChainPackages(buildThreads) |
|
| 153 |
- |
|
| 154 | 150 |
def buildPackagesList(specPath, csvFilename): |
| 155 | 151 |
csvFile = open(csvFilename, "w") |
| 156 | 152 |
csvFile.write("Package,Version,License,URL,Sources,Patches\n")
|
| ... | ... |
@@ -19,114 +19,41 @@ class constants(object): |
| 19 | 19 |
rpmCheck=False |
| 20 | 20 |
sourceRpmPath="" |
| 21 | 21 |
noDepsPackageList=["texinfo","bzip2","gettext","nspr","xz","bison","openjdk","go"] |
| 22 |
- listToolChainPackages=[ |
|
| 23 |
- "linux-api-headers", |
|
| 24 |
- "glibc", |
|
| 25 |
- "zlib", |
|
| 26 |
- "file", |
|
| 27 |
- "binutils", |
|
| 28 |
- "gmp", |
|
| 29 |
- "mpfr", |
|
| 30 |
- "mpc", |
|
| 31 |
- "gcc", |
|
| 32 |
- "pkg-config", |
|
| 33 |
- "ncurses", |
|
| 34 |
- "bash", |
|
| 35 |
- "bzip2", |
|
| 36 |
- "sed", |
|
| 37 |
- "procps-ng", |
|
| 38 |
- "coreutils", |
|
| 39 |
- "m4", |
|
| 40 |
- "grep", |
|
| 41 |
- "readline", |
|
| 42 |
- "diffutils", |
|
| 43 |
- "gawk", |
|
| 44 |
- "findutils", |
|
| 45 |
- "gettext", |
|
| 46 |
- "gzip", |
|
| 47 |
- "make", |
|
| 48 |
- "patch", |
|
| 49 |
- "util-linux", |
|
| 50 |
- "util-linux-devel", |
|
| 51 |
- "tar", |
|
| 52 |
- "xz", |
|
| 53 |
- "libtool", |
|
| 54 |
- "flex", |
|
| 55 |
- "flex-devel", |
|
| 56 |
- "bison", |
|
| 57 |
- "lua", |
|
| 58 |
- "popt", |
|
| 59 |
- "nspr", |
|
| 60 |
- "sqlite-autoconf", |
|
| 61 |
- "nss", |
|
| 62 |
- "elfutils", |
|
| 63 |
- "expat", |
|
| 64 |
- "libffi", |
|
| 65 |
- "libpipeline", |
|
| 66 |
- "gdbm", |
|
| 67 |
- "perl", |
|
| 68 |
- "texinfo", |
|
| 69 |
- "autoconf", |
|
| 70 |
- "automake", |
|
| 71 |
- "openssl", |
|
| 72 |
- "python2", |
|
| 73 |
- "rpm", |
|
| 74 |
- "groff", |
|
| 75 |
- "man-pages", |
|
| 76 |
- "cpio"] |
|
| 77 | 22 |
|
| 78 |
- listCoreToolChainRPMPackages=[ |
|
| 23 |
+ # These packages will be built in first order as build-core-toolchain stage |
|
| 24 |
+ listCoreToolChainPackages=[ |
|
| 79 | 25 |
"linux-api-headers", |
| 80 | 26 |
"glibc", |
| 81 |
- "glibc-devel", |
|
| 82 | 27 |
"zlib", |
| 83 |
- "zlib-devel", |
|
| 84 | 28 |
"file", |
| 85 | 29 |
"binutils", |
| 86 |
- "binutils-devel", |
|
| 87 | 30 |
"gmp", |
| 88 |
- "gmp-devel", |
|
| 89 | 31 |
"mpfr", |
| 90 |
- "mpfr-devel", |
|
| 91 | 32 |
"mpc", |
| 92 | 33 |
"libgcc", |
| 93 |
- "libgcc-devel", |
|
| 94 | 34 |
"libstdc++", |
| 95 |
- "libstdc++-devel", |
|
| 96 | 35 |
"libgomp", |
| 97 |
- "libgomp-devel", |
|
| 98 | 36 |
"gcc", |
| 99 | 37 |
"pkg-config", |
| 100 | 38 |
"ncurses", |
| 101 | 39 |
"readline", |
| 102 | 40 |
"bash"] |
| 103 | 41 |
|
| 104 |
- listToolChainRPMPkgsToInstall=[ |
|
| 42 |
+ # These packages will be built in a second stage to replace publish RPMS |
|
| 43 |
+ listToolChainPackages=[ |
|
| 105 | 44 |
"linux-api-headers", |
| 106 | 45 |
"glibc", |
| 107 |
- "glibc-devel", |
|
| 108 | 46 |
"zlib", |
| 109 |
- "zlib-devel", |
|
| 110 | 47 |
"file", |
| 111 | 48 |
"binutils", |
| 112 |
- "binutils-devel", |
|
| 113 | 49 |
"gmp", |
| 114 |
- "gmp-devel", |
|
| 115 | 50 |
"mpfr", |
| 116 |
- "mpfr-devel", |
|
| 117 | 51 |
"mpc", |
| 118 |
- "libgcc", |
|
| 119 |
- "libgcc-devel", |
|
| 120 |
- "libstdc++", |
|
| 121 |
- "libstdc++-devel", |
|
| 122 |
- "libgomp", |
|
| 123 |
- "libgomp-devel", |
|
| 124 | 52 |
"gcc", |
| 125 | 53 |
"pkg-config", |
| 126 | 54 |
"ncurses", |
| 127 | 55 |
"bash", |
| 128 | 56 |
"bzip2", |
| 129 |
- "bzip2-devel", |
|
| 130 | 57 |
"sed", |
| 131 | 58 |
"procps-ng", |
| 132 | 59 |
"coreutils", |
| ... | ... |
@@ -141,36 +68,36 @@ class constants(object): |
| 141 | 141 |
"make", |
| 142 | 142 |
"patch", |
| 143 | 143 |
"util-linux", |
| 144 |
- "util-linux-devel", |
|
| 145 | 144 |
"tar", |
| 146 | 145 |
"xz", |
| 147 | 146 |
"libtool", |
| 148 | 147 |
"flex", |
| 149 |
- "flex-devel", |
|
| 150 | 148 |
"bison", |
| 151 | 149 |
"lua", |
| 152 | 150 |
"popt", |
| 153 | 151 |
"nspr", |
| 154 | 152 |
"sqlite-autoconf", |
| 155 | 153 |
"nss", |
| 156 |
- "elfutils-libelf", |
|
| 154 |
+ "elfutils", |
|
| 155 |
+ "expat", |
|
| 156 |
+ "libffi", |
|
| 157 | 157 |
"libpipeline", |
| 158 | 158 |
"gdbm", |
| 159 | 159 |
"perl", |
| 160 | 160 |
"texinfo", |
| 161 |
- "libcap", |
|
| 162 |
- "rpm", |
|
| 163 |
- "rpm-build", |
|
| 164 |
- "rpm-devel", |
|
| 165 | 161 |
"autoconf", |
| 166 | 162 |
"automake", |
| 163 |
+ "openssl", |
|
| 164 |
+ "python2", |
|
| 165 |
+ "rpm", |
|
| 167 | 166 |
"groff", |
| 168 | 167 |
"man-pages", |
| 169 |
- "elfutils", |
|
| 170 |
- "cpio", |
|
| 171 |
- "go"] |
|
| 168 |
+ "cpio"] |
|
| 172 | 169 |
|
| 173 |
- listToolChainRPMPkgsToBuild=[ |
|
| 170 |
+ # List or RPMS that will be installed in a chroot prior to build each |
|
| 171 |
+ # package. On a stage1 and stage2 published rpms will/might be used |
|
| 172 |
+ # after stage2 only local RPMS will be used |
|
| 173 |
+ listToolChainRPMsToInstall=[ |
|
| 174 | 174 |
"linux-api-headers", |
| 175 | 175 |
"glibc", |
| 176 | 176 |
"glibc-devel", |
| ... | ... |
@@ -195,6 +122,7 @@ class constants(object): |
| 195 | 195 |
"ncurses", |
| 196 | 196 |
"bash", |
| 197 | 197 |
"bzip2", |
| 198 |
+ "bzip2-devel", |
|
| 198 | 199 |
"sed", |
| 199 | 200 |
"ncurses-devel", |
| 200 | 201 |
"procps-ng", |
| ... | ... |
@@ -224,9 +152,9 @@ class constants(object): |
| 224 | 224 |
"popt-devel", |
| 225 | 225 |
"nspr", |
| 226 | 226 |
"sqlite-autoconf", |
| 227 |
+ "sqlite-libs", |
|
| 227 | 228 |
"nss", |
| 228 | 229 |
"nss-devel", |
| 229 |
- "bzip2-devel", |
|
| 230 | 230 |
"elfutils-libelf", |
| 231 | 231 |
"elfutils", |
| 232 | 232 |
"elfutils-libelf-devel", |
| ... | ... |
@@ -248,10 +176,22 @@ class constants(object): |
| 248 | 248 |
"rpm", |
| 249 | 249 |
"rpm-build", |
| 250 | 250 |
"rpm-devel", |
| 251 |
+ "rpm-libs", |
|
| 251 | 252 |
"groff", |
| 252 | 253 |
"man-pages", |
| 253 |
- "cpio"] |
|
| 254 |
+ "cpio", |
|
| 255 |
+ "go"] |
|
| 256 |
+ |
|
| 257 |
+ # List of RPMs which are not published. They will be created during the |
|
| 258 |
+ # build process |
|
| 259 |
+ listOfRPMsProvidedAfterBuild=[ |
|
| 260 |
+ "util-linux-devel", |
|
| 261 |
+ "flex-devel", |
|
| 262 |
+ "sqlite-libs", |
|
| 263 |
+ "rpm-libs"] |
|
| 254 | 264 |
|
| 265 |
+ # List of packages that will be installed in addition for each |
|
| 266 |
+ # package to make check |
|
| 255 | 267 |
listMakeCheckRPMPkgtoInstall=[ |
| 256 | 268 |
"python2", |
| 257 | 269 |
"python2-devel", |