Commit 54406917 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 avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6016)
parent 0e80714f

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

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

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'

%targets = (

    "dist" => {

        inherit_from     => [ 'BASE_unix' ],

        cc               => "cc",

        cflags           => "-O",

        thread_scheme    => "(unknown)",

    },

);

Configurations/unix-Makefile.tmpl

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