You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2019/02/19 23:00:26 UTC
[kudu] branch master updated: [minicluster] Fix building with
python 2.6
This is an automated email from the ASF dual-hosted git repository.
granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 30ebeee [minicluster] Fix building with python 2.6
30ebeee is described below
commit 30ebeee99217760eeec08d0de8b2f75a26aa8b92
Author: Grant Henke <gr...@apache.org>
AuthorDate: Tue Feb 19 15:53:16 2019 -0600
[minicluster] Fix building with python 2.6
This patch fixes building the minicluster binary
jar with python 2.6. This is imporant because python
2.6 is the default version on centos 6 which is the
primary linux OS that the kudu-binary jar is built on.
Because I used Docker to test this, the related Docker
build fixes are included too.
Change-Id: Id9e7ce9a1fd7ac813866678d6ec804fdf91ea729
Reviewed-on: http://gerrit.cloudera.org:8080/12526
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Reviewed-by: Andrew Wong <aw...@cloudera.com>
Tested-by: Kudu Jenkins
---
.dockerignore | 5 +++++
build-support/mini-cluster/relocate_binaries_for_mini_cluster.py | 2 +-
docker/bootstrap-dev-env.sh | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.dockerignore b/.dockerignore
index 5316c91..007dd33 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -21,6 +21,11 @@
*
# General top level source files.
+!CONTRIBUTING.adoc
+!LICENSE.txt
+!NOTICE.txt
+!README.adoc
+!RELEASING.adoc
!version.txt
# Docker files.
diff --git a/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py b/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py
index 30ecdba..87bb602 100755
--- a/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py
+++ b/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py
@@ -116,7 +116,7 @@ def check_for_command(command):
Ensure that the specified command is available on the PATH.
"""
try:
- _ = subprocess.check_output(['which', command])
+ _ = check_output(['which', command])
except subprocess.CalledProcessError as err:
logging.error("Unable to find %s command", command)
raise err
diff --git a/docker/bootstrap-dev-env.sh b/docker/bootstrap-dev-env.sh
index bf966fb..4cbddcf 100755
--- a/docker/bootstrap-dev-env.sh
+++ b/docker/bootstrap-dev-env.sh
@@ -58,6 +58,7 @@ if [[ -f "/usr/bin/yum" ]]; then
yum install -y \
autoconf \
automake \
+ chrpath \
cyrus-sasl-devel \
cyrus-sasl-gssapi \
cyrus-sasl-plain \
@@ -142,6 +143,7 @@ elif [[ -f "/usr/bin/apt-get" ]]; then
apt-get install -y --no-install-recommends \
autoconf \
automake \
+ chrpath \
curl \
flex \
g++ \