Date: Thu, 8 Jun 2017 17:54:27 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r319712 - stable/11/release Message-ID: <201706081754.v58HsRvw007706@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Jun 8 17:54:27 2017 New Revision: 319712 URL: https://svnweb.freebsd.org/changeset/base/319712 Log: 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 Modified: stable/11/release/Makefile.vm Directory Properties: stable/11/ (props changed) Modified: stable/11/release/Makefile.vm ============================================================================== --- stable/11/release/Makefile.vm Thu Jun 8 17:10:58 2017 (r319711) +++ stable/11/release/Makefile.vm Thu Jun 8 17:54:27 2017 (r319712) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706081754.v58HsRvw007706>