You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by yw...@apache.org on 2015/04/28 06:42:38 UTC
bigtop git commit: BIGTOP-1831: Upgrade Mahout to 0.10
Repository: bigtop
Updated Branches:
refs/heads/master e4ff5ff6e -> 4a10e473d
BIGTOP-1831: Upgrade Mahout to 0.10
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/4a10e473
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/4a10e473
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/4a10e473
Branch: refs/heads/master
Commit: 4a10e473d75eb4ace28630c4bbd424b712b88740
Parents: e4ff5ff
Author: YoungWoo Kim <yw...@apache.org>
Authored: Thu Mar 12 20:12:24 2015 +0900
Committer: YoungWoo Kim <yw...@apache.org>
Committed: Tue Apr 28 13:41:57 2015 +0900
----------------------------------------------------------------------
bigtop-packages/src/common/mahout/do-component-build | 7 ++++++-
bigtop-packages/src/common/mahout/install_mahout.sh | 4 ++++
bigtop-packages/src/deb/mahout/control | 2 +-
bigtop-packages/src/rpm/mahout/SPECS/mahout.spec | 3 ++-
bigtop.mk | 4 ++--
5 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4a10e473/bigtop-packages/src/common/mahout/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/mahout/do-component-build b/bigtop-packages/src/common/mahout/do-component-build
index e2db59b..06b6380 100644
--- a/bigtop-packages/src/common/mahout/do-component-build
+++ b/bigtop-packages/src/common/mahout/do-component-build
@@ -18,7 +18,12 @@ set -ex
. `dirname $0`/bigtop.bom
-mvn clean install -Dmahout.skip.distribution=false -DskipTests -Dhadoop2.version=$HADOOP_VERSION "$@"
+mvn clean install -DskipTests -Dmahout.skip.distribution=false \
+ -Phadoop2 \
+ -Dhadoop.version=$HADOOP_VERSION \
+ -Dhbase.version=$HBASE_VERSION-hadoop2 \
+ "$@"
+
mkdir build
for i in distribution/target/mahout*.tar.gz ; do
tar -C build --strip-components=1 -xzf $i
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4a10e473/bigtop-packages/src/common/mahout/install_mahout.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/mahout/install_mahout.sh b/bigtop-packages/src/common/mahout/install_mahout.sh
index 3bc5c1a..af8906f 100644
--- a/bigtop-packages/src/common/mahout/install_mahout.sh
+++ b/bigtop-packages/src/common/mahout/install_mahout.sh
@@ -109,6 +109,7 @@ cp -ra ${BUILD_DIR}/lib/* $PREFIX/${LIB_DIR}/lib/
cp ${BUILD_DIR}/mahout*.jar $PREFIX/$LIB_DIR
cp -a ${BUILD_DIR}/*.txt $PREFIX/$DOC_DIR
cp -a ${BUILD_DIR}/bin/* $PREFIX/${LIB_DIR}/bin
+rm -rf $PREFIX/${LIB_DIR}/bin/*.cmd
# Copy in the configuration files
install -d -m 0755 $PREFIX/$CONF_DIR
@@ -138,3 +139,6 @@ exec $INSTALLED_LIB_DIR/bin/mahout "\$@"
EOF
chmod 755 $PREFIX/$BIN_DIR/mahout
+rm -f ${PREFIX}/${LIB_DIR}/lib/zookeeper-*.jar
+ln -sf /usr/lib/zookeeper/zookeeper.jar ${PREFIX}/${LIB_DIR}/lib/
+
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4a10e473/bigtop-packages/src/deb/mahout/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/mahout/control b/bigtop-packages/src/deb/mahout/control
index b860c62..84b63ff 100644
--- a/bigtop-packages/src/deb/mahout/control
+++ b/bigtop-packages/src/deb/mahout/control
@@ -23,7 +23,7 @@ Homepage: http://mahout.apache.org
Package: mahout
Architecture: all
-Depends: hadoop-client, bigtop-utils (>= 0.7)
+Depends: hadoop-client, bigtop-utils (>= 0.7), zookeeper
Description: A set of Java libraries for scalable machine learning.
Mahout's goal is to build scalable machine learning libraries.
With scalable we mean:
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4a10e473/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec b/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
index a36e72c..3635b21 100644
--- a/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
+++ b/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
@@ -44,7 +44,8 @@ License: ASL 2.0
Source0: %{name}-distribution-%{mahout_base_version}-src.tar.gz
Source1: do-component-build
Source2: install_%{name}.sh
-Requires: hadoop-client, bigtop-utils >= 0.7
+Source3: bigtop.bom
+Requires: hadoop-client, bigtop-utils >= 0.7, zookeeper
%description
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4a10e473/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index b555504..10d640b 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -166,8 +166,8 @@ $(eval $(call PACKAGE,oozie,OOZIE))
MAHOUT_NAME=mahout
MAHOUT_RELNOTES_NAME=Apache Mahout
MAHOUT_PKG_NAME=mahout
-MAHOUT_BASE_VERSION=0.9
-MAHOUT_PKG_VERSION=0.9
+MAHOUT_BASE_VERSION=0.10.0
+MAHOUT_PKG_VERSION=0.10.0
MAHOUT_RELEASE_VERSION=1
MAHOUT_TARBALL_DST=mahout-distribution-$(MAHOUT_BASE_VERSION)-src.tar.gz
MAHOUT_TARBALL_SRC=$(MAHOUT_TARBALL_DST)