Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually

passed to 'make release'.

MFC after:	3 days
X-Before-RC2:	yes
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2013-12-07 19:39:38 +00:00
parent 6cd2b1dc63
commit 1d75f17448
2 changed files with 5 additions and 1 deletions

View File

@ -39,3 +39,4 @@ PORTBRANCH="ports/head@rHEAD"
#NODOC=
#NOPORTS=
#RELSTRING=
#WITH_DVD=

View File

@ -72,6 +72,9 @@ KERNEL="GENERIC"
NODOC=
NOPORTS=
# Set to non-empty value to build dvd1.iso as part of the release.
WITH_DVD=
usage() {
echo "Usage: $0 [-c release.conf]"
exit 1
@ -129,7 +132,7 @@ CHROOT_DMAKEFLAGS="${CONF_FILES}"
RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
${DOCPORTS}"
${DOCPORTS} WITH_DVD=${WITH_DVD}"
# Force src checkout if configured
FORCE_SRC_KEY=