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: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6016)

diff --git a/Configurations/90-team.conf b/Configurations/90-team.norelease.conf
similarity index 97%
rename from Configurations/90-team.conf
rename to Configurations/90-team.norelease.conf
index 0a83c22aaa1ebcc696110e78b728bb72c28def05..c7f709538673f5d3b2318fd34fa47fb47268854f 100644 (file)
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.norelease.conf
@@ -76,11 +76,6 @@
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-    "dist" => {
-        cc               => "cc",
-        cflags           => "-O",
-        thread_scheme    => "(unknown)",
-    },
     "debug-test-64-clang" => {
         inherit_from     => [ "x86_64_asm" ],
         cc               => "clang",

diff --git a/Configurations/dist.conf b/Configurations/dist.conf
new file mode 100644 (file)
index 0000000..4f58dad
--- /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'
+%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 1bfaa97af162f856bd349d5597735776df4f210b..034d93e653d232058aa58503f35e940101bb000b 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -664,8 +664,10 @@ tar:
        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 \
-         | grep -v '^fuzz/corpora' \
+        | egrep -v "$$excl_re" \
         | while read F; do \
               mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
               cp $$F $$TMPDIR/$$DISTDIR/$$F; \