summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2017-06-08 17:54:27 +0000
committergjb <gjb@FreeBSD.org>2017-06-08 17:54:27 +0000
commitde6a59f2084a31a6abc6cdf4f8d1752d30670e67 (patch)
tree6e5c6a9ce2ff10c771804a735fed8db0a59b4af3 /release
parent23f455ae3ae9ca16909a7ab16123ccfbd4a6c6ac (diff)
downloadFreeBSD-src-de6a59f2084a31a6abc6cdf4f8d1752d30670e67.zip
FreeBSD-src-de6a59f2084a31a6abc6cdf4f8d1752d30670e67.tar.gz
MFC 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. Approved by: re (marius) Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.vm2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 9f71a54..9ccd057 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -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:
OpenPOWER on IntegriCloud