aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-09-28 19:19:53 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-09-28 19:19:53 +0000
commit238397876dc4b0a3cd8e88384bd8f54157009e66 (patch)
tree76b0d0910b68af7528cf6510ea0d16ddb3fbb8b1 /release/release.sh
parenta312aae568ccf6f5e9cca30bb49fe9d0d924d94f (diff)
downloadsrc-238397876dc4b0a3cd8e88384bd8f54157009e66.tar.gz
src-238397876dc4b0a3cd8e88384bd8f54157009e66.zip
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
Notes
Notes: svn path=/head/; revision=288347
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/release.sh b/release/release.sh
index 43c03ce00c7f..e16842204080 100755
--- 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 \