Commit 918388b5 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5836)
parent aa3b3285

Configurations/90-team.conf→Configurations/90-team.norelease.conf

+0 −6
Original line number Diff line number Diff line
@@ -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",

Configurations/dist.conf

0 → 100644
+12 −0
Original line number Diff line number Diff line 
## -*- 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)",

    },

);

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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" \