You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2015/11/14 16:49:08 UTC
[1/4] bigtop git commit: BIGTOP-2137: Fix bigtop-groovy package
Repository: bigtop
Updated Branches:
refs/heads/master e1c6d96c7 -> 855c112e8
BIGTOP-2137: Fix bigtop-groovy package
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/38cf28a4
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/38cf28a4
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/38cf28a4
Branch: refs/heads/master
Commit: 38cf28a49e1cfc869e30859989584a2cebcfaa3c
Parents: e1c6d96
Author: Olaf Flebbe <of...@ofleb.be>
Authored: Fri Nov 13 21:53:35 2015 +0100
Committer: Olaf Flebbe <of...@ofleb.be>
Committed: Sat Nov 14 16:42:25 2015 +0100
----------------------------------------------------------------------
.../src/common/bigtop-groovy/install_groovy.sh | 1 +
.../deb/bigtop-groovy/bigtop-groovy.postinst | 36 --------------------
bigtop-packages/src/deb/bigtop-groovy/compat | 2 +-
bigtop-packages/src/deb/bigtop-groovy/control | 2 +-
bigtop-packages/src/deb/bigtop-groovy/rules | 2 +-
5 files changed, 4 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh b/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
index 14a14f2..42fe44a 100755
--- a/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
+++ b/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
@@ -94,6 +94,7 @@ echo ${BIGTOP_GROOVY_BASE_VERSION}
install -d -m 0755 ${PREFIX}/${BIN_DIR}
cp ${BUILD_DIR}/bin/startGroovy ${PREFIX}/${BIN_DIR}
cp ${BUILD_DIR}/bin/groovy ${PREFIX}/${BIN_DIR}
+chmod 755 ${PREFIX}/${BIN_DIR}/*
# lib
install -d -m 0755 ${PREFIX}/${LIB_DIR}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
deleted file mode 100644
index 29db417..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# postinst script for bigtop-groovy
-
-set -e
-
-case "$1" in
- configure)
- chmod 0755 /usr/lib/bigtop-groovy/bin/*
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/compat
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/compat b/bigtop-packages/src/deb/bigtop-groovy/compat
index 7f8f011..ec63514 100755
--- a/bigtop-packages/src/deb/bigtop-groovy/compat
+++ b/bigtop-packages/src/deb/bigtop-groovy/compat
@@ -1 +1 @@
-7
+9
http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/control b/bigtop-packages/src/deb/bigtop-groovy/control
index f88bd8b..dbf6e0e 100755
--- a/bigtop-packages/src/deb/bigtop-groovy/control
+++ b/bigtop-packages/src/deb/bigtop-groovy/control
@@ -21,7 +21,7 @@ Standards-Version: 3.8.0
Homepage: http://groovy.codehaus.org/
Package: bigtop-groovy
-Architecture: any
+Architecture: all
Depends: bigtop-utils (>= 0.7)
Description: An agile and dynamic language for the Java Virtual Machine
Groovy provides a JVM based runtime environment for function programming and scripting.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/38cf28a4/bigtop-packages/src/deb/bigtop-groovy/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/rules b/bigtop-packages/src/deb/bigtop-groovy/rules
index f4cd744..c6310c0 100755
--- a/bigtop-packages/src/deb/bigtop-groovy/rules
+++ b/bigtop-packages/src/deb/bigtop-groovy/rules
@@ -21,7 +21,7 @@
export DH_VERBOSE=1
# This has to be exported to make some magic below work.
-export DH_OPTIONS=-s
+export DH_OPTIONS=
%:
dh $@
[2/4] bigtop git commit: BIGTOP-2139:crunch compile fails with
Insufficient memory on POWER
Posted by of...@apache.org.
BIGTOP-2139:crunch compile fails with Insufficient memory on POWER
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/991d699e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/991d699e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/991d699e
Branch: refs/heads/master
Commit: 991d699ee89f7b1cb1989bce3a14d6cf176f752a
Parents: 38cf28a
Author: Olaf Flebbe <of...@ofleb.be>
Authored: Fri Nov 13 22:46:37 2015 +0100
Committer: Olaf Flebbe <of...@ofleb.be>
Committed: Sat Nov 14 16:45:01 2015 +0100
----------------------------------------------------------------------
bigtop-packages/src/common/crunch/do-component-build | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/991d699e/bigtop-packages/src/common/crunch/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/crunch/do-component-build b/bigtop-packages/src/common/crunch/do-component-build
index ca68401..6145f16 100644
--- a/bigtop-packages/src/common/crunch/do-component-build
+++ b/bigtop-packages/src/common/crunch/do-component-build
@@ -18,6 +18,8 @@ set -ex
. `dirname $0`/bigtop.bom
+export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m"
+
mvn -DskipTests -Dcrunch.platform=2 \
-Dhadoop.version=$HADOOP_VERSION \
-Dhbase.version=$HBASE_VERSION-hadoop2 \
[3/4] bigtop git commit: BIGTOP-2140: hbase compile fails with
Insufficient memory on POWER
Posted by of...@apache.org.
BIGTOP-2140: hbase compile fails with Insufficient memory on POWER
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ffb048a9
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ffb048a9
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ffb048a9
Branch: refs/heads/master
Commit: ffb048a95c9583bcc81d418fbf471528eb7fd3a5
Parents: 991d699
Author: Olaf Flebbe <of...@ofleb.be>
Authored: Fri Nov 13 23:47:14 2015 +0100
Committer: Olaf Flebbe <of...@ofleb.be>
Committed: Sat Nov 14 16:45:01 2015 +0100
----------------------------------------------------------------------
bigtop-packages/src/common/hbase/do-component-build | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ffb048a9/bigtop-packages/src/common/hbase/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build
index 049d4c8..a602998 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -21,6 +21,8 @@ set -ex
#A hack to disable Codehaus repository since it's out of service
sed --in-place -e '/http:\/\/repository.codehaus.org/,/<\/repository>/s/true/false/' pom.xml
+export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m"
+
#An awful hack for BIGTOP-1429 to satisfy ASF CI build deps. resolution
bash -x ./dev-support/generate-hadoopX-poms.sh $HBASE_VERSION $HBASE_VERSION-hadoop2
[4/4] bigtop git commit: BIGTOP-2131. [Docker] bigtop slaves images
should be built without cache
Posted by of...@apache.org.
BIGTOP-2131. [Docker] bigtop slaves images should be built without cache
Signed-off-by: Olaf Flebbe <of...@ofleb.be>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/855c112e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/855c112e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/855c112e
Branch: refs/heads/master
Commit: 855c112e8171cd39b9ec84b64f6ba55c426d7612
Parents: ffb048a
Author: Evans Ye <ev...@apache.org>
Authored: Sat Nov 14 15:02:59 2015 +0800
Committer: Olaf Flebbe <of...@ofleb.be>
Committed: Sat Nov 14 16:47:33 2015 +0100
----------------------------------------------------------------------
build.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/855c112e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index eab4f1f..3aca98c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -322,6 +322,7 @@ task "bigtop-slaves"(type:Exec,
'docker', 'build',
'-t', 'bigtop/slaves:' + _prefix + '-' + _OS,
'-f', "docker/bigtop-slaves/" + _OS + "/Dockerfile",
+ '--force-rm', '--no-cache', '--pull', '--rm',
'.'
]
workingDir '.'