diff options
| author | gjb <gjb@FreeBSD.org> | 2015-10-01 00:47:30 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-10-01 00:47:30 +0000 |
| commit | a79133b7d5ec07ca7b6f15d7f4704957b3bb25a9 (patch) | |
| tree | ddd842a8faf0dfafdea5b785f1ae6b7e77eb69cc /release | |
| parent | 702cf0edc4ae0f8d06c650d9582c64e10b3ff1d9 (diff) | |
| download | FreeBSD-src-a79133b7d5ec07ca7b6f15d7f4704957b3bb25a9.zip FreeBSD-src-a79133b7d5ec07ca7b6f15d7f4704957b3bb25a9.tar.gz | |
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
Diffstat (limited to 'release')
| -rwxr-xr-x | release/release.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/release/release.sh b/release/release.sh index 94a9bb6..e168422 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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 \ |
