svn commit: r318849 - in stable: 10/release 11/release

[Glen Barber]

Author: gjb
Date: Thu May 25 01:31:12 2017
New Revision: 318849
URL: https://svnweb.freebsd.org/changeset/base/318849

Log:
  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

Modified:
  stable/10/release/Makefile.vm
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/release/Makefile.vm
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/release/Makefile.vm
==============================================================================
--- stable/10/release/Makefile.vm	Thu May 25 01:17:07 2017	(r318848)
+++ stable/10/release/Makefile.vm	Thu May 25 01:31:12 2017	(r318849)
@@ -58,7 +58,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} \
@@ -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} \