From 5e9b2fe15213a1082f674cfd28647a4814bfaf35 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 10 Dec 2013 17:26:52 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259181 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/release.conf.sample | 1 +
 release/release.sh          | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/release/release.conf.sample b/release/release.conf.sample
index 5f30b4b9..882f911b 100644
--- a/release/release.conf.sample
+++ b/release/release.conf.sample
@@ -39,3 +39,4 @@ PORTBRANCH="ports/head@rHEAD"
 #NODOC=
 #NOPORTS=
 #RELSTRING=
+#WITH_DVD=
diff --git a/release/release.sh b/release/release.sh
index 9186c05b..f31c87ac 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -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=
-- 
2.42.0