Date: Thu, 26 May 2016 21:08:44 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300776 - head/release Message-ID: <201605262108.u4QL8iY7021334@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu May 26 21:08:44 2016 New Revision: 300776 URL: https://svnweb.freebsd.org/changeset/base/300776 Log: Remove vestigial cloudware-install bits missed in r300767. Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile head/release/Makefile.vm Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Thu May 26 20:55:15 2016 (r300775) +++ head/release/Makefile Thu May 26 21:08:44 2016 (r300776) @@ -291,7 +291,7 @@ real-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -install: release-install vm-install cloudware-install +install: release-install vm-install release-install: .if defined(DESTDIR) && !empty(DESTDIR) Modified: head/release/Makefile.vm ============================================================================== --- head/release/Makefile.vm Thu May 26 20:55:15 2016 (r300775) +++ head/release/Makefile.vm Thu May 26 21:08:44 2016 (r300776) @@ -46,7 +46,6 @@ CLEANFILES+= ${_CW:tl}.img \ ${_CW:tl}.${${_CW:tu}_FORMAT} \ ${_CW:tl}.${${_CW:tu}_FORMAT}.raw \ cw${_CW:tl}-package -CLOUDINSTALL+= cw${_CW:tl}-install CLOUDPACKAGE+= cw${_CW:tl}-package ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} . if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF) @@ -145,11 +144,6 @@ cloudware-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS} .endif -cloudware-install: -.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDINSTALL} -.endif - .include "${.CURDIR}/Makefile.ec2" .include "${.CURDIR}/Makefile.azure" .include "${.CURDIR}/Makefile.gce"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605262108.u4QL8iY7021334>