[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5b7b0115256c4d0be0f92468df14bdf1c57634a5 (commit)
      from  296cbb57776054f0725e004ff51d0f9b50eb1d80 (commit)


- Log -----------------------------------------------------------------
commit 5b7b0115256c4d0be0f92468df14bdf1c57634a5
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Aug 17 09:38:02 2017 +0200

    When building a tarball, avoid trying to copy submodules
    
    submodules are directories that we don't want in our tarballs, so
    avoid them.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4178)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7923661..0603b41 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -686,8 +686,11 @@ tar:
 	DISTDIR=$(NAME); \
 	mkdir -p $$TMPDIR/$$DISTDIR; \
 	(cd $(SRCDIR); \
+	 excl_re=`git submodule status | sed -e 's/^.//' | cut -d' ' -f2`; \
+	 excl_re="^(fuzz/corpora|`echo $$excl_re | sed -e 's/ /$$|/g'`\$$)"; \
+	 echo "$$excl_re"; \
 	 git ls-tree -r --name-only --full-tree HEAD \
-         | grep -v '^fuzz/corpora' \
+	 | grep -v -E "$$excl_re" \
 	 | while read F; do \
 	       mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
 	       cp $$F $$TMPDIR/$$DISTDIR/$$F; \