From owner-svn-src-stable@freebsd.org  Thu Oct  1 00:47:31 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 1EEAFA0CD2C;
 Thu,  1 Oct 2015 00:47:31 +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 0FCB8178C;
 Thu,  1 Oct 2015 00:47:31 +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 t910lUnj084937;
 Thu, 1 Oct 2015 00:47:30 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t910lUhP084936;
 Thu, 1 Oct 2015 00:47:30 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201510010047.t910lUhP084936@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: Thu, 1 Oct 2015 00:47:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r288435 - stable/10/release
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Oct 2015 00:47:31 -0000

Author: gjb
Date: Thu Oct  1 00:47:30 2015
New Revision: 288435
URL: https://svnweb.freebsd.org/changeset/base/288435

Log:
  MFC r288341, r288345, r288347:
  
  r288341:
    Honor VMFORMATS and VMSIZE if set in release.conf. [1]
  
  r288345:
    In followup to r288341, ensure VMFORMATS and VMSIZE are not
    set to empty values, which would result in nonintuitive build
    errors.
  
  r288347:
    Append VMFORMATS and VMSIZE to RELEASE_RMAKEFLAGS only if
    WITH_VMIMAGES is set.
  
  PR:		203420 [1]
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/release.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/release.sh
==============================================================================
--- stable/10/release/release.sh	Thu Oct  1 00:44:45 2015	(r288434)
+++ stable/10/release/release.sh	Thu Oct  1 00:47:30 2015	(r288435)
@@ -311,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
+		RELEASE_RMAKEFLAGS="${RELEASE_RMAKEFLAGS} \
+			VMFORMATS=\"${VMFORMATS}\" VMSIZE=${VMSIZE}"
+	fi
 	eval chroot ${CHROOTDIR} make -C /usr/src/release \
 		${RELEASE_RMAKEFLAGS} release
 	eval chroot ${CHROOTDIR} make -C /usr/src/release \