svn commit: r308737 - head/release

[Glen Barber]

Author: gjb
Date: Wed Nov 16 18:08:50 2016
New Revision: 308737
URL: https://svnweb.freebsd.org/changeset/base/308737

Log:
  Pass SWAPSIZE in env(1) when invoking mk-vmimage.sh, otherwise
  mkimg(1) does not create the second partition after r307008.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.vm

Modified: head/release/Makefile.vm
==============================================================================
--- head/release/Makefile.vm	Wed Nov 16 17:11:05 2016	(r308736)
+++ head/release/Makefile.vm	Wed Nov 16 18:08:50 2016	(r308737)
@@ -55,7 +55,7 @@ ${_CW:tu}CONF?=	${.CURDIR}/tools/${_CW:t
 
 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} \