Author: gjb
Date: Thu Jun 8 16:04:13 2017
New Revision: 319701
URL: https://svnweb.freebsd.org/changeset/base/319701
Log:
MFC r313021, r319621:
r313021 (brd):
Force a few variables to be uppercase when they are evaluated.
r319621:
Ensure ${_CW} is uppercase when passing '-c' to mk-vmimage.sh,
otherwise with 'CLOUDWARE=vagrant-virtualbox', the path to the
configuration file may be incorrect.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/Makefile.vm
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/Makefile.vm
==============================================================================
--- stable/10/release/Makefile.vm Thu Jun 8 15:50:50 2017
(r319700)
+++ stable/10/release/Makefile.vm Thu Jun 8 16:04:13 2017
(r319701)
@@ -61,8 +61,8 @@ cw-${_CW:tl}:
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} \
- -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW}IMAGE} -c ${${_CW}CONF}
+ -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT}
\
+ -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c
${${_CW:tu}CONF}
touch ${.TARGET}
cw${_CW:tl}-install:
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
