diff options
| author | garga <garga@FreeBSD.org> | 2016-06-03 18:37:56 +0000 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2016-06-03 18:37:56 +0000 |
| commit | 93978535c194dc734666ad0721863353a48f4715 (patch) | |
| tree | c8182fac32ca19fd784cda83331a6986e6eee736 /release | |
| parent | 00d1d8a21a765c5a817fcc827094570b37cbacc0 (diff) | |
| download | FreeBSD-src-93978535c194dc734666ad0721863353a48f4715.zip FreeBSD-src-93978535c194dc734666ad0721863353a48f4715.tar.gz | |
One of the already implemented options in release/Makefile is NOSRC. When
it's defined, installation image is shipped without source distribution
(src.txz)
Add the hability of defining NOSRC in release.conf and pass it to
'make release' argument
Approved by: gjb
Sponsored by: Rubicon Communications (Netgate)
Differential Revision: https://reviews.freebsd.org/D6710
Diffstat (limited to 'release')
| -rw-r--r-- | release/release.conf.sample | 1 | ||||
| -rwxr-xr-x | release/release.sh | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/release/release.conf.sample b/release/release.conf.sample index 3e8279e..176894a 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -51,6 +51,7 @@ PORTBRANCH="ports/head@rHEAD" ## Set miscellaneous 'make release' settings. #NODOC= #NOPORTS= +#NOSRC= #WITH_DVD= #WITH_COMPRESSED_IMAGES= diff --git a/release/release.sh b/release/release.sh index caa6f26..07485c9 100755 --- a/release/release.sh +++ b/release/release.sh @@ -102,6 +102,9 @@ env_setup() { NODOC= NOPORTS= + # Set to non-empty value to disable distributing source tree. + NOSRC= + # Set to non-empty value to build dvd1.iso as part of the release. WITH_DVD= WITH_COMPRESSED_IMAGES= @@ -160,15 +163,18 @@ env_check() { NODOC=yes fi - # If NOPORTS and/or NODOC are unset, they must not pass to make as - # variables. The release makefile verifies definedness of the + # If NOSRC, NOPORTS and/or NODOC are unset, they must not pass to make + # as variables. The release makefile verifies definedness of the # NOPORTS/NODOC variables instead of their values. - DOCPORTS= + SRCDOCPORTS= if [ -n "${NOPORTS}" ]; then - DOCPORTS="NOPORTS=yes " + SRCDOCPORTS="NOPORTS=yes" fi if [ -n "${NODOC}" ]; then - DOCPORTS="${DOCPORTS}NODOC=yes" + SRCDOCPORTS="${SRCDOCPORTS}${SRCDOCPORTS:+ }NODOC=yes" + fi + if [ -n "${NOSRC}" ]; then + SRCDOCPORTS="${SRCDOCPORTS}${SRCDOCPORTS:+ }NOSRC=yes" fi # The aggregated build-time flags based upon variables defined within @@ -206,7 +212,7 @@ env_check() { RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \ KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \ - KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${DOCPORTS} \ + KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCDOCPORTS} \ WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}" |
