svn commit: r288347 - head/release

[Glen Barber]

Author: gjb
Date: Mon Sep 28 19:19:53 2015
New Revision: 288347
URL: https://svnweb.freebsd.org/changeset/base/288347

Log:
  Append VMFORMATS and VMSIZE to RELEASE_RMAKEFLAGS only if
  WITH_VMIMAGES is set.
  
  MFC after:	3 days
  X-MFC-With:	r288341, r288345
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Mon Sep 28 18:58:27 2015	(r288346)
+++ head/release/release.sh	Mon Sep 28 19:19:53 2015	(r288347)
@@ -320,9 +320,9 @@ chroot_build_release() {
 			VMSIZE="$(eval chroot ${CHROOTDIR} \
 				make -C /usr/src/release -V VMSIZE)"
 		fi
+		RELEASE_RMAKEFLAGS="${RELEASE_RMAKEFLAGS} \
+			VMFORMATS=\"${VMFORMATS}\" VMSIZE=${VMSIZE}"
 	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 \