Repository: bigtop Updated Branches: refs/heads/master 7007c0265 -> 51e751f78
BIGTOP-2981: Packaging SparkR is broken due to BIGTOP-2959 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/51e751f7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/51e751f7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/51e751f7 Branch: refs/heads/master Commit: 51e751f78db4a157a2dfcf893a4616e5a31f190b Parents: 7007c02 Author: Youngwoo Kim <yw...@apache.org> Authored: Thu Jan 4 10:28:41 2018 +0900 Committer: Youngwoo Kim <yw...@apache.org> Committed: Thu Jan 4 10:28:41 2018 +0900 ---------------------------------------------------------------------- bigtop-packages/src/common/spark/do-component-build | 2 +- bigtop-packages/src/deb/spark/rules | 2 ++ bigtop-packages/src/rpm/spark/SPECS/spark.spec | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/51e751f7/bigtop-packages/src/common/spark/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/do-component-build b/bigtop-packages/src/common/spark/do-component-build index 084f9f2..c2a2322 100644 --- a/bigtop-packages/src/common/spark/do-component-build +++ b/bigtop-packages/src/common/spark/do-component-build @@ -28,7 +28,7 @@ BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${ -Dyarn.version=$HADOOP_VERSION \ -Dprotobuf.version=2.5.0 \ -DrecompileMode=all \ - -Pyarn -Phadoop-2.7 -Phadoop-provided \ + -Pyarn -Phadoop-2.7 \ -Phive -Phive-thriftserver \ -Psparkr \ $SPARK_BUILD_OPTS" http://git-wip-us.apache.org/repos/asf/bigtop/blob/51e751f7/bigtop-packages/src/deb/spark/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/spark/rules b/bigtop-packages/src/deb/spark/rules index 5bd9833..501963f 100644 --- a/bigtop-packages/src/deb/spark/rules +++ b/bigtop-packages/src/deb/spark/rules @@ -49,3 +49,5 @@ override_dh_install: dh_install # BIGTOP-2588 drop datanucleus jars from spark-core rm -Rf debian/spark-core/usr/lib/spark/jars/datanucleus* + + rm -f debian/tmp/${lib_spark}/jars/hadoop-*.jar http://git-wip-us.apache.org/repos/asf/bigtop/blob/51e751f7/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 8e73cd8..95fbc88 100644 --- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec +++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec @@ -166,6 +166,8 @@ bash $RPM_SOURCE_DIR/install_spark.sh \ --prefix=$RPM_BUILD_ROOT \ --doc-dir=%{doc_spark} +%__rm -f $RPM_BUILD_ROOT/%{lib_spark}/jars/hadoop-*.jar + for service in %{spark_services} do # Install init script
