Repository: spark Updated Branches: refs/heads/master 8cf6fd1c2 -> 30aa37fca
[SPARK-24654][BUILD][FOLLOWUP] Update, fix LICENSE and NOTICE, and specialize for source vs binary ## What changes were proposed in this pull request? Fix location of licenses-binary in binary release, and remove binary items from source release ## How was this patch tested? N/A Closes #22436 from srowen/SPARK-24654.2. Authored-by: Sean Owen <sean.o...@databricks.com> Signed-off-by: Sean Owen <sean.o...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/30aa37fc Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/30aa37fc Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/30aa37fc Branch: refs/heads/master Commit: 30aa37fca45ec0ad4f30076bc855d1a201cfc097 Parents: 8cf6fd1 Author: Sean Owen <sean.o...@databricks.com> Authored: Mon Sep 17 08:54:44 2018 -0500 Committer: Sean Owen <sean.o...@databricks.com> Committed: Mon Sep 17 08:54:44 2018 -0500 ---------------------------------------------------------------------- dev/create-release/release-build.sh | 4 ++++ dev/make-distribution.sh | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/30aa37fc/dev/create-release/release-build.sh ---------------------------------------------------------------------- diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index ca066be..098aa57 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -171,6 +171,10 @@ if [[ "$1" == "package" ]]; then # Source and binary tarballs echo "Packaging release source tarballs" cp -r spark spark-$SPARK_VERSION + # For source release, exclude copy of binary license/notice + rm spark-$SPARK_VERSION/LICENSE-binary + rm spark-$SPARK_VERSION/NOTICE-binary + rm -r spark-$SPARK_VERSION/licenses-binary tar cvzf spark-$SPARK_VERSION.tgz spark-$SPARK_VERSION echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --armour --output spark-$SPARK_VERSION.tgz.asc \ --detach-sig spark-$SPARK_VERSION.tgz http://git-wip-us.apache.org/repos/asf/spark/blob/30aa37fc/dev/make-distribution.sh ---------------------------------------------------------------------- diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index 778d376..668682f 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -213,7 +213,6 @@ cp -r "$SPARK_HOME/examples/src/main" "$DISTDIR/examples/src/" # Copy license and ASF files cp "$SPARK_HOME/LICENSE-binary" "$DISTDIR/LICENSE" -mkdir -p "$DISTDIR/licenses" cp -r "$SPARK_HOME/licenses-binary" "$DISTDIR/licenses" cp "$SPARK_HOME/NOTICE-binary" "$DISTDIR/NOTICE" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
