Repository: aurora-packaging Updated Branches: refs/heads/master afb1efdfd -> 9e5aa2f87
Add deps to centos 7 image to handle thrift patch. The thrift Makefile now applies a patch that invalidates the grammar requiring a flex pass. The openssl package is needed as well to support the new fingerprint checks in the Makefile. Additionally, simplify the `pants.ini` used by both rpm and deb builds and turn on exception printing to help debug build failures more easily when packaging. Reviewed at https://reviews.apache.org/r/40680/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/9e5aa2f8 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/9e5aa2f8 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/9e5aa2f8 Branch: refs/heads/master Commit: 9e5aa2f8710777492e7ed539ce9069c982d11744 Parents: afb1efd Author: John Sirois <[email protected]> Authored: Wed Nov 25 08:25:21 2015 -0800 Committer: Bill Farner <[email protected]> Committed: Wed Nov 25 08:25:21 2015 -0800 ---------------------------------------------------------------------- builder/deb/ubuntu-trusty/pants.ini | 6 +----- builder/rpm/centos-7/Dockerfile | 2 ++ builder/rpm/centos-7/pants.ini | 6 +----- 3 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9e5aa2f8/builder/deb/ubuntu-trusty/pants.ini ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/pants.ini b/builder/deb/ubuntu-trusty/pants.ini index ed1a5ce..2ff2d5e 100644 --- a/builder/deb/ubuntu-trusty/pants.ini +++ b/builder/deb/ubuntu-trusty/pants.ini @@ -1,9 +1,5 @@ [DEFAULT] -pants_cachedir: %(homedir)s/.pants.d - -[python-setup] -download_cache: %(pants_cachedir)s/python/downloads -install_cache: %(pants_cachedir)s/python/eggs +print_exception_stacktrace: True [python-repos] repos: ['third_party/', 'https://svn.apache.org/repos/asf/incubator/aurora/3rdparty/ubuntu/trusty64/python/'] http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9e5aa2f8/builder/rpm/centos-7/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/rpm/centos-7/Dockerfile b/builder/rpm/centos-7/Dockerfile index 05da048..1df37c7 100644 --- a/builder/rpm/centos-7/Dockerfile +++ b/builder/rpm/centos-7/Dockerfile @@ -18,12 +18,14 @@ RUN yum install -y \ yum-utils \ apr-devel \ cyrus-sasl-devel \ + flex \ gcc \ gcc-c++ \ git \ java-1.8.0-openjdk-devel \ krb5-devel \ libcurl-devel \ + openssl \ patch \ python \ python-devel \ http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9e5aa2f8/builder/rpm/centos-7/pants.ini ---------------------------------------------------------------------- diff --git a/builder/rpm/centos-7/pants.ini b/builder/rpm/centos-7/pants.ini index 00074cb..0d7ec6b 100644 --- a/builder/rpm/centos-7/pants.ini +++ b/builder/rpm/centos-7/pants.ini @@ -1,9 +1,5 @@ [DEFAULT] -pants_cachedir: %(homedir)s/.pants.d - -[python-setup] -download_cache: %(pants_cachedir)s/python/downloads -install_cache: %(pants_cachedir)s/python/eggs +print_exception_stacktrace: True [python-repos] repos: ['third_party/', 'https://svn.apache.org/repos/asf/incubator/aurora/3rdparty/centos/7/python/']
