Don't distribute team internal config targets
authorRichard Levitte <levitte@openssl.org>
Mon, 2 Apr 2018 08:24:33 +0000 (10:24 +0200)
committerRichard Levitte <levitte@openssl.org>
Thu, 19 Apr 2018 13:02:19 +0000 (15:02 +0200)
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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5836)

Configurations/90-team.norelease.conf [moved from Configurations/90-team.conf with 96% similarity]
Configurations/dist.conf [new file with mode: 0644]
Configurations/unix-Makefile.tmpl

similarity index 96%
rename from Configurations/90-team.conf
rename to Configurations/90-team.norelease.conf
index a5cc6da..a9ab98d 100644 (file)
@@ -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 (file)
index 0000000..2a458bc
--- /dev/null
@@ -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)",
+    },
+);
index f23dff4..799eaa8 100644 (file)
@@ -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" \