From owner-svn-src-head@freebsd.org  Mon Sep 28 18:39:22 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C9EFA0A376;
 Mon, 28 Sep 2015 18:39:22 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2B14713BA;
 Mon, 28 Sep 2015 18:39:22 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8SIdMWY021923;
 Mon, 28 Sep 2015 18:39:22 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8SIdMOw021922;
 Mon, 28 Sep 2015 18:39:22 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201509281839.t8SIdMOw021922@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 28 Sep 2015 18:39:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288345 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Sep 2015 18:39:22 -0000

Author: gjb
Date: Mon Sep 28 18:39:21 2015
New Revision: 288345
URL: https://svnweb.freebsd.org/changeset/base/288345

Log:
  In followup to r288341, ensure VMFORMATS and VMSIZE are not
  set to empty values, which would result in nonintuitive build
  errors.
  
  MFC after:	3 days
  X-MFC-With:	r288341
  PR:		203420 (related to)
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Mon Sep 28 18:19:22 2015	(r288344)
+++ head/release/release.sh	Mon Sep 28 18:39:21 2015	(r288345)
@@ -208,7 +208,6 @@ env_check() {
 	RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \
 		KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${DOCPORTS} \
 		WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
-		VMFORMATS=\"${VMFORMATS}\" VMSIZE=${VMSIZE} \
 		WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"
 
 	return 0
@@ -312,6 +311,18 @@ chroot_build_target() {
 # chroot_build_release(): Invoke the 'make release' target.
 chroot_build_release() {
 	load_target_env
+	if [ ! -z "${WITH_VMIMAGES}" ]; then
+		if [ -z "${VMFORMATS}" ]; then
+			VMFORMATS="$(eval chroot ${CHROOTDIR} \
+				make -C /usr/src/release -V VMFORMATS)"
+		fi
+		if [ -z "${VMSIZE}" ]; then
+			VMSIZE="$(eval chroot ${CHROOTDIR} \
+				make -C /usr/src/release -V VMSIZE)"
+		fi
+	fi
+	RELEASE_RMAKEFLAGS="${RELEASE_RMAKEFLAGS} VMFORMATS=\"${VMFORMATS}\" \
+		VMSIZE=${VMSIZE}"
 	eval chroot ${CHROOTDIR} make -C /usr/src/release \
 		${RELEASE_RMAKEFLAGS} release
 	eval chroot ${CHROOTDIR} make -C /usr/src/release \