svn commit: r319621 - head/release
Glen Barber
gjb at FreeBSD.org
Tue Jun 6 14:08:55 UTC 2017
Author: gjb
Date: Tue Jun 6 14:08:54 2017
New Revision: 319621
URL: https://svnweb.freebsd.org/changeset/base/319621
Log:
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.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.vm
Modified: head/release/Makefile.vm
==============================================================================
--- head/release/Makefile.vm Tue Jun 6 10:12:58 2017 (r319620)
+++ head/release/Makefile.vm Tue Jun 6 14:08:54 2017 (r319621)
@@ -59,7 +59,7 @@ cw-${_CW:tl}:
${.CURDIR}/scripts/mk-vmimage.sh \
-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT} \
- -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c ${${_CW}CONF}
+ -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c ${${_CW:tu}CONF}
touch ${.TARGET}
cw${_CW:tl}-package:
More information about the svn-src-head
mailing list