Date: Mon, 28 Sep 2015 18:39:22 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288345 - head/release Message-ID: <201509281839.t8SIdMOw021922@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Sep 28 18:39:21 2015 New Revision: 288345 URL: https://svnweb.freebsd.org/changeset/base/288345 Log: 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 Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Mon Sep 28 18:19:22 2015 (r288344) +++ head/release/release.sh Mon Sep 28 18:39:21 2015 (r288345) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509281839.t8SIdMOw021922>