From owner-svn-src-all@FreeBSD.ORG  Tue Dec 10 17:26:53 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 13DDC67D;
 Tue, 10 Dec 2013 17:26:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F38B41F1A;
 Tue, 10 Dec 2013 17:26:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAHQqJ9036811;
 Tue, 10 Dec 2013 17:26:52 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAHQqkJ036809;
 Tue, 10 Dec 2013 17:26:52 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312101726.rBAHQqkJ036809@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 10 Dec 2013 17:26:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r259181 - releng/10.0/release
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 17:26:53 -0000

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@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=