svn commit: r259181 - releng/10.0/release

[Glen Barber]

Author: gjb
Date: Tue Dec 10 17:26:52 2013
New Revision: 259181
URL: http://svnweb.freebsd.org/changeset/base/259181

Log:
  MFstable10 r259151:
    Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually
    passed to 'make release'.
  
  Approved by:	re (glebius)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.0/release/release.conf.sample
  releng/10.0/release/release.sh
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/release/release.conf.sample
==============================================================================
--- releng/10.0/release/release.conf.sample	Tue Dec 10 17:16:13 2013	(r259180)
+++ releng/10.0/release/release.conf.sample	Tue Dec 10 17:26:52 2013	(r259181)
@@ -39,3 +39,4 @@ PORTBRANCH="ports/head at rHEAD"
 #NODOC=
 #NOPORTS=
 #RELSTRING=
+#WITH_DVD=

Modified: releng/10.0/release/release.sh
==============================================================================
--- releng/10.0/release/release.sh	Tue Dec 10 17:16:13 2013	(r259180)
+++ releng/10.0/release/release.sh	Tue Dec 10 17:26:52 2013	(r259181)
@@ -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=