From 88be71c6e205dacf7407dd74e9c9c8cded02d96e Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Mon, 28 Sep 2015 18:39:21 +0000
Subject: [PATCH] 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
---
 release/release.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/release/release.sh b/release/release.sh
index f76efa522ce7..43c03ce00c7f 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -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 \
-- 
2.39.5