Remove all 'make dist' artifacts

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7692)

(cherry picked from commit 8d9535ec3e317641b8e551973c8cfe2ee1c89296)

diff --git a/.travis-create-release.sh b/.travis-create-release.sh
index 311cedd69c098b252529fbcfb82e1dba4ac42b36..3407de7117ff6f84a048ff8f5b1a0697307410d8 100644 (file)
--- a/.travis-create-release.sh
+++ b/.travis-create-release.sh
@@ -1,11 +1,3 @@
 #! /bin/sh
 
-# $1 is expected to be $TRAVIS_OS_NAME
-
-./Configure dist
-if [ "$1" == osx ]; then
-    make NAME='_srcdist' TARFILE='_srcdist.tar' \
-         TAR_COMMAND='$(TAR) $(TARFLAGS) -cvf -' tar
-else
-    make TARFILE='_srcdist.tar' NAME='_srcdist' dist
-fi
+./util/mktar.sh --name=_srcdist

diff --git a/Configurations/dist.conf b/Configurations/dist.conf
deleted file mode 100644 (file)
index 4f58dad..0000000
--- a/Configurations/dist.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-## -*- mode: perl; -*-
-## Build configuration targets for openssl-team members
-
-# This is to support 'make dist'
-%targets = (
-    "dist" => {
-        inherit_from     => [ 'BASE_unix' ],
-        cc               => "cc",
-        cflags           => "-O",
-        thread_scheme    => "(unknown)",
-    },
-);

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7254478af5476753de257800e0ffab0bad160379..b35db4fc1fc7488f478b3cdf207f94d5f15c5776 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -665,36 +665,8 @@ tags TAGS: FORCE
 
 # Release targets (note: only available on Unix) #####################
 
-# If your tar command doesn't support --owner and --group, make sure to
-# use one that does, for example GNU tar
-TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cvf -
-PREPARE_CMD=:
 tar:
-       set -e; \
-       TMPDIR=/var/tmp/openssl-copy.$$$$; \
-       DISTDIR=$(NAME); \
-       mkdir -p $$TMPDIR/$$DISTDIR; \
-       (cd $(SRCDIR); \
-        excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf)"; \
-        echo "$$excl_re"; \
-        git ls-tree -r --name-only --full-tree HEAD \
-        | egrep -v "$$excl_re" \
-        | while read F; do \
-              mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
-              cp $$F $$TMPDIR/$$DISTDIR/$$F; \
-          done); \
-       (cd $$TMPDIR/$$DISTDIR; \
-        $(PREPARE_CMD); \
-        find . -type d -print | xargs chmod 755; \
-        find . -type f -print | xargs chmod a+r; \
-        find . -type f -perm -0100 -print | xargs chmod a+x); \
-       (cd $$TMPDIR; $(TAR_COMMAND) $$DISTDIR) \
-       | (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \
-       rm -rf $$TMPDIR
-       cd $(SRCDIR); ls -l $(TARFILE).gz
-
-dist:
-       @$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' tar
+       $(SRCDIR)/util/mktar.sh --name='$(NAME)' --tarfile='$(TARFILE)'
 
 # Helper targets #####################################################