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

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