You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2014/09/03 03:38:07 UTC
git commit: BIGTOP-1415: Removing duplicate jars from Spark Package
Repository: bigtop
Updated Branches:
refs/heads/master 77fdb7b4c -> 5cd44c4ba
BIGTOP-1415: Removing duplicate jars from Spark Package
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5cd44c4b
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5cd44c4b
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5cd44c4b
Branch: refs/heads/master
Commit: 5cd44c4bab1b66b0b57f81917656184e5d4c38d9
Parents: 77fdb7b
Author: Mani Narayan <nm...@gmail.com>
Authored: Wed Aug 27 15:42:56 2014 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Tue Sep 2 18:37:51 2014 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/spark/install_spark.sh | 6 ++----
bigtop-packages/src/deb/spark/spark-core.install | 6 ------
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5cd44c4b/bigtop-packages/src/common/spark/install_spark.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/spark/install_spark.sh b/bigtop-packages/src/common/spark/install_spark.sh
index a78c06a..bfe07d3 100644
--- a/bigtop-packages/src/common/spark/install_spark.sh
+++ b/bigtop-packages/src/common/spark/install_spark.sh
@@ -121,7 +121,6 @@ SCALA_HOME=${SCALA_HOME:-/usr/share/scala}
PYSPARK_PYTHON=${PYSPARK_PYTHON:-python}
install -d -m 0755 $PREFIX/$LIB_DIR
-install -d -m 0755 $PREFIX/$LIB_DIR/lib
install -d -m 0755 $PREFIX/$LIB_DIR/bin
install -d -m 0755 $PREFIX/$LIB_DIR/sbin
install -d -m 0755 $PREFIX/$DOC_DIR
@@ -131,12 +130,11 @@ install -d -m 0755 $PREFIX/var/log/spark/
install -d -m 0755 $PREFIX/var/run/spark/
install -d -m 0755 $PREFIX/var/run/spark/work/
-tar --wildcards -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/assembly/target/spark-assembly*-dist.tar.gz 'lib/*'
-
-for comp in core repl bagel mllib streaming assembly; do
+for comp in assembly; do
install -d -m 0755 $PREFIX/$LIB_DIR/$comp/lib
tar --wildcards -C $PREFIX/$LIB_DIR/$comp/lib -zxf ${BUILD_DIR}/assembly/target/spark-assembly*-dist.tar.gz spark-$comp\*
done
+
## FIXME: Spark maven assembly needs to include examples into it.
install -d -m 0755 $PREFIX/$LIB_DIR/examples/lib
cp ${BUILD_DIR}/examples/target/spark-examples*${SPARK_VERSION}.jar $PREFIX/$LIB_DIR/examples/lib
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5cd44c4b/bigtop-packages/src/deb/spark/spark-core.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/spark/spark-core.install b/bigtop-packages/src/deb/spark/spark-core.install
index 77c013f..f012707 100644
--- a/bigtop-packages/src/deb/spark/spark-core.install
+++ b/bigtop-packages/src/deb/spark/spark-core.install
@@ -2,17 +2,11 @@
/usr/bin/spark-executor
/usr/bin/spark-shell
/usr/lib/spark/assembly
-/usr/lib/spark/bagel
/usr/lib/spark/bin/compute-classpath.sh
/usr/lib/spark/bin/spark-class
/usr/lib/spark/bin/spark-shell
/usr/lib/spark/sbin
-/usr/lib/spark/core
/usr/lib/spark/examples
-/usr/lib/spark/lib
-/usr/lib/spark/mllib
-/usr/lib/spark/repl
-/usr/lib/spark/streaming
/usr/lib/spark/ui-resources
/usr/lib/spark/conf
/usr/lib/spark/LICENSE