Date: Thu, 1 Oct 2015 00:47:30 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r288435 - stable/10/release Message-ID: <201510010047.t910lUhP084936@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Oct 1 00:47:30 2015 New Revision: 288435 URL: https://svnweb.freebsd.org/changeset/base/288435 Log: MFC r288341, r288345, r288347: r288341: Honor VMFORMATS and VMSIZE if set in release.conf. [1] r288345: In followup to r288341, ensure VMFORMATS and VMSIZE are not set to empty values, which would result in nonintuitive build errors. r288347: Append VMFORMATS and VMSIZE to RELEASE_RMAKEFLAGS only if WITH_VMIMAGES is set. PR: 203420 [1] Sponsored by: The FreeBSD Foundation Modified: stable/10/release/release.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/release/release.sh ============================================================================== --- stable/10/release/release.sh Thu Oct 1 00:44:45 2015 (r288434) +++ stable/10/release/release.sh Thu Oct 1 00:47:30 2015 (r288435) @@ -311,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 + RELEASE_RMAKEFLAGS="${RELEASE_RMAKEFLAGS} \ + VMFORMATS=\"${VMFORMATS}\" VMSIZE=${VMSIZE}" + fi 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?201510010047.t910lUhP084936>