aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-09-28 18:39:21 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-09-28 18:39:21 +0000
commita312aae568ccf6f5e9cca30bb49fe9d0d924d94f (patch)
tree9f50736c4dab8ccb0da820c6702adcd55ed7f5f9 /release/release.sh
parent05212689bb4f66419e4bce80499db4753194cb3e (diff)
downloadsrc-a312aae568ccf6f5e9cca30bb49fe9d0d924d94f.tar.gz
src-a312aae568ccf6f5e9cca30bb49fe9d0d924d94f.zip
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
Notes
Notes: svn path=/head/; revision=288345
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh13
1 files changed, 12 insertions, 1 deletions
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 \