You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ja...@apache.org on 2014/12/18 04:04:27 UTC
bigtop git commit: BIGTOP-1550. Spark update to 1.1.0
Repository: bigtop
Updated Branches:
refs/heads/master 388beca8e -> 7e008b781
BIGTOP-1550. Spark update to 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/7e008b78
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/7e008b78
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/7e008b78
Branch: refs/heads/master
Commit: 7e008b781aaa26b6fbc4b5fb9b709da1dbcd4e62
Parents: 388beca
Author: jayunit100 <ja...@apache.org>
Authored: Fri Dec 12 19:25:55 2014 -0500
Committer: jayunit100 <ja...@apache.org>
Committed: Wed Dec 17 22:03:20 2014 -0500
----------------------------------------------------------------------
bigtop-packages/src/common/spark/install_spark.sh | 6 ++++--
bigtop-packages/src/deb/spark/spark-core.install | 1 +
bigtop-packages/src/rpm/spark/SPECS/spark.spec | 1 +
bigtop.mk | 4 ++--
4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7e008b78/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 bfe07d3..f09642b 100644
--- a/bigtop-packages/src/common/spark/install_spark.sh
+++ b/bigtop-packages/src/common/spark/install_spark.sh
@@ -149,6 +149,8 @@ cp -a $BUILD_DIR/bin/spark-class $PREFIX/$LIB_DIR/bin/
cp -a $BUILD_DIR/sbin/spark-executor $PREFIX/$LIB_DIR/sbin/
cp -a ${SOURCE_DIR}/compute-classpath.sh $PREFIX/$LIB_DIR/bin/
cp -a ${BUILD_DIR}/bin/spark-shell $PREFIX/$LIB_DIR/bin/
+cp -a ${BUILD_DIR}/bin/spark-submit $PREFIX/$LIB_DIR/bin/
+
touch $PREFIX/$LIB_DIR/RELEASE
# Copy in the configuration files
@@ -161,14 +163,14 @@ ln -s /etc/spark/conf $PREFIX/$LIB_DIR/conf
tar --wildcards -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/assembly/target/spark-assembly*-dist.tar.gz ui-resources/\*
# set correct permissions for exec. files
-for execfile in bin/spark-class bin/spark-shell sbin/spark-executor ; do
+for execfile in bin/spark-class bin/spark-shell sbin/spark-executor bin/spark-submit; do
chmod 755 $PREFIX/$LIB_DIR/$execfile
done
chmod 755 $PREFIX/$LIB_DIR/bin/compute-classpath.sh
# Copy in the wrappers
install -d -m 0755 $PREFIX/$BIN_DIR
-for wrap in sbin/spark-executor bin/spark-shell ; do
+for wrap in sbin/spark-executor bin/spark-shell bin/spark-submit; do
cat > $PREFIX/$BIN_DIR/`basename $wrap` <<EOF
#!/bin/bash
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7e008b78/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 f012707..236e11d 100644
--- a/bigtop-packages/src/deb/spark/spark-core.install
+++ b/bigtop-packages/src/deb/spark/spark-core.install
@@ -1,5 +1,6 @@
/etc/spark
/usr/bin/spark-executor
+/usr/bin/spark-submit
/usr/bin/spark-shell
/usr/lib/spark/assembly
/usr/lib/spark/bin/compute-classpath.sh
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7e008b78/bigtop-packages/src/rpm/spark/SPECS/spark.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
index 91da770..1008b1b 100644
--- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
+++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
@@ -161,6 +161,7 @@ done
%attr(0755,root,root) %{bin_spark}
%{bin}/spark-shell
%{bin}/spark-executor
+%{bin}/spark-submit
%files -n spark-python
%defattr(-,root,root,755)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7e008b78/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index f071bf5..5902be1 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -247,8 +247,8 @@ $(eval $(call PACKAGE,crunch,CRUNCH))
SPARK_NAME=spark
SPARK_RELNOTES_NAME=Spark
SPARK_PKG_NAME=spark-core
-SPARK_BASE_VERSION=0.9.1
-SPARK_PKG_VERSION=0.9.1
+SPARK_BASE_VERSION=1.1.0
+SPARK_PKG_VERSION=1.1.0
SPARK_RELEASE_VERSION=1
SPARK_TARBALL_DST=spark-$(SPARK_BASE_VERSION).tar.gz
SPARK_TARBALL_SRC=spark-$(SPARK_BASE_VERSION).tgz