d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

One of the already implemented options in release/Makefile is NOSRC. When

Browse Source 
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
This commit is contained in:
Renato Botelho 2016-06-03 18:37:56 +00:00
parent 0bf716e988
commit c6750673bf
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/release.conf.sample
View File

@ -51,6 +51,7 @@ PORTBRANCH="ports/head@rHEAD"
## Set miscellaneous 'make release' settings.
#NODOC=
#NOPORTS=
#NOSRC=
#WITH_DVD=
#WITH_COMPRESSED_IMAGES=

18
release/release.sh
View File

@ -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}"