[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  918388b5a02351ef2c5f560cd9369e928e8a1cd0 (commit)
      from  aa3b328541ff67dde7c40ae73dd11a296647ae3d (commit)


- Log -----------------------------------------------------------------
commit 918388b5a02351ef2c5f560cd9369e928e8a1cd0
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 2 10:24:33 2018 +0200

    Don't distribute team internal config targets
    
    Configurations/90-team.conf isn't for public consumption, so we rename
    it to 90-team.norelease.conf and make sure 'make dist' and 'make tar'
    don't include it in the tarball.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5836)

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

Summary of changes:
 Configurations/{90-team.conf => 90-team.norelease.conf} |  6 ------
 Configurations/dist.conf                                | 12 ++++++++++++
 Configurations/unix-Makefile.tmpl                       |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename Configurations/{90-team.conf => 90-team.norelease.conf} (96%)
 create mode 100644 Configurations/dist.conf

diff --git a/Configurations/90-team.conf b/Configurations/90-team.norelease.conf
similarity index 96%
rename from Configurations/90-team.conf
rename to Configurations/90-team.norelease.conf
index a5cc6da..a9ab98d 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.norelease.conf
@@ -79,12 +79,6 @@ my %targets = (
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
     },
-    "dist" => {
-        inherit_from     => [ 'BASE_unix' ],
-        CC               => "cc",
-        CFLAGS           => "-O",
-        thread_scheme    => "(unknown)",
-    },
     "debug-test-64-clang" => {
         inherit_from     => [ 'BASE_unix', "x86_64_asm" ],
         cc               => "clang",
diff --git a/Configurations/dist.conf b/Configurations/dist.conf
new file mode 100644
index 0000000..2a458bc
--- /dev/null
+++ b/Configurations/dist.conf
@@ -0,0 +1,12 @@
+## -*- mode: perl; -*-
+## Build configuration targets for openssl-team members
+
+# This is to support 'make dist'
+my %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 f23dff4..799eaa8 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -797,7 +797,7 @@ tar:
 	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'`\$$)"; \
+	 excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf|`echo $$excl_re | sed -e 's/ /$$|/g'`\$$)"; \
 	 echo "$$excl_re"; \
 	 git ls-tree -r --name-only --full-tree HEAD \
 	 | egrep -v "$$excl_re" \