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

diff --git a/release/release.sh b/release/release.sh
index 43c03ce00c7f915d2d6dcd971337d668080942f6..e168422040806e6b71c5f2caf53dfb01b39d50cf 100755 (executable)
--- a/release/release.sh
+++ b/release/release.sh
@@ -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 \