diff --git a/release/release.conf.sample b/release/release.conf.sample index 3e8279e15f51..176894a08818 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 caa6f267fbf8..07485c952ac8 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}"