Repository: bigtop Updated Branches: refs/heads/master 39390b270 -> ace0d5c28
BIGTOP-2589: Fix spark1 build break Signed-off-by: amir sanjar <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ace0d5c2 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ace0d5c2 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ace0d5c2 Branch: refs/heads/master Commit: ace0d5c28b6fb84bacf098fb0e65e0b55be7f241 Parents: 39390b2 Author: amir sanjar <[email protected]> Authored: Thu Nov 17 13:10:39 2016 +0100 Committer: amir sanjar <[email protected]> Committed: Thu Nov 17 13:20:11 2016 +0100 ---------------------------------------------------------------------- bigtop-packages/src/common/spark1/install_spark.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/ace0d5c2/bigtop-packages/src/common/spark1/install_spark.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark1/install_spark.sh b/bigtop-packages/src/common/spark1/install_spark.sh index 530b355..c612849 100644 --- a/bigtop-packages/src/common/spark1/install_spark.sh +++ b/bigtop-packages/src/common/spark1/install_spark.sh @@ -139,13 +139,13 @@ tar --wildcards -C $PREFIX/$LIB_DIR/ -zxf ${BUILD_DIR}/assembly/target/spark-ass rm -rf $PREFIX/$LIB_DIR/bin/*.cmd # External/extra jars -ls ${BUILD_DIR}/{external,extras}/*/target/*${SPARK_VERSION}.jar | grep -v 'original-\|assembly' | xargs -IJARS cp JARS $PREFIX/$LIB_DIR/extras/lib +ls ${BUILD_DIR}/{external,extras}/*/target/*${SPARK1_VERSION}.jar | grep -v 'original-\|assembly' | xargs -IJARS cp JARS $PREFIX/$LIB_DIR/extras/lib # Examples jar -cp ${BUILD_DIR}/examples/target/spark-examples*${SPARK_VERSION}.jar $PREFIX/$LIB_DIR/lib/spark-examples-${SPARK_VERSION}-hadoop${HADOOP_VERSION}.jar +cp ${BUILD_DIR}/examples/target/spark-examples*${SPARK1_VERSION}.jar $PREFIX/$LIB_DIR/lib/spark-examples-${SPARK1_VERSION}-hadoop${HADOOP_VERSION}.jar # Spark YARN Shuffle jar -cp ${BUILD_DIR}/network/yarn/target/*/spark-${SPARK_VERSION}-yarn-shuffle.jar $PREFIX/$LIB_DIR/lib/ +cp ${BUILD_DIR}/network/yarn/target/*/spark-${SPARK1_VERSION}-yarn-shuffle.jar $PREFIX/$LIB_DIR/lib/ # Examples src cp -ra ${BUILD_DIR}/examples/src $PREFIX/$EXAMPLES_DIR/
