diff options
| author | gjb <gjb@FreeBSD.org> | 2017-05-25 01:31:12 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-05-25 01:31:12 +0000 |
| commit | 770a812c2e327bf934bed62b602bdc8127932ea2 (patch) | |
| tree | 5c216214d0835df1b223443c60400f2301b2574b /release | |
| parent | 561b0424eedcb86dbc1071bb3adc4302a39b3b08 (diff) | |
| download | FreeBSD-src-770a812c2e327bf934bed62b602bdc8127932ea2.zip FreeBSD-src-770a812c2e327bf934bed62b602bdc8127932ea2.tar.gz | |
MFC r308737, r308779:
r308737:
Pass SWAPSIZE in env(1) when invoking mk-vmimage.sh, otherwise
mkimg(1) does not create the second partition after r307008.
r308779:
Pass SWAPSIZE in env(1) when invoking mk-vmimage.sh for the
vm-image target, missed in r308737.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.vm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm index ea77271..bb55fbc 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -58,7 +58,7 @@ ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf cw-${_CW:tl}: mkdir -p ${.OBJDIR}/${.TARGET} - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW}_FORMAT} \ @@ -101,7 +101,7 @@ vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} mkdir -p ${.OBJDIR}/${.TARGET} - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \ |
