svn commit: r273824 - projects/release-vmimage/release
Glen Barber
gjb at FreeBSD.org
Wed Oct 29 15:52:18 UTC 2014
Author: gjb
Date: Wed Oct 29 15:52:17 2014
New Revision: 273824
URL: https://svnweb.freebsd.org/changeset/base/273824
Log:
Add glue to allow enabling building cloud provider
VM images by default.
When WITH_CLOUDWARE is not empty, add CLOUDTARGETS
to the release/Makefile 'release' target.
CLOUDTARGETS is generated from the contents of
CLOUDWARE, which should be a list of all supported
target providers.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-vmimage/release/Makefile
projects/release-vmimage/release/Makefile.vm
Modified: projects/release-vmimage/release/Makefile
==============================================================================
--- projects/release-vmimage/release/Makefile Wed Oct 29 14:57:30 2014 (r273823)
+++ projects/release-vmimage/release/Makefile Wed Oct 29 15:52:17 2014 (r273824)
@@ -269,6 +269,9 @@ release:
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}
.endif
+.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
+ ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS}
+.endif
install:
.if defined(DESTDIR) && !empty(DESTDIR)
Modified: projects/release-vmimage/release/Makefile.vm
==============================================================================
--- projects/release-vmimage/release/Makefile.vm Wed Oct 29 14:57:30 2014 (r273823)
+++ projects/release-vmimage/release/Makefile.vm Wed Oct 29 15:52:17 2014 (r273824)
@@ -9,7 +9,22 @@ VMTARGETS= vm-base vm-image
VMFORMATS?= vhd vmdk qcow2 raw
VMSIZE?= 20G
VMBASE?= vm
-AZURECONF?= ${.CURDIR}/tools/azure.conf
+
+CLOUDWARE?= AZURE
+AZURE_FORMAT= vhd
+
+.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
+. for _CW in ${CLOUDWARE}
+CLOUDTARGETS+= vm-${_CW:tl}
+CLEANDIRS+= vm-${_CW:tl}
+CLEANFILES+= ${_CW:tl}.img \
+ ${_CW:tl}.${${_CW:tu}_FORMAT} \
+ ${_CW:tl}.${${_CW:tu}_FORMAT}.raw
+. if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
+${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf
+. endif
+. endfor
+.endif
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
CLEANDIRS+= ${VMTARGETS}
@@ -19,13 +34,6 @@ CLEANFILES+= ${VMBASE}.${FORMAT}
. endfor
.endif
-.if exists(${.CURDIR}/${TARGET}/mk-azure.sh)
-CLEANFILES+= ${OSRELEASE}.vhd \
- ${OSRELEASE}.vhd.raw \
- azure.img
-CLEANDIRS+= vm-azure
-.endif
-
vm-base:
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
More information about the svn-src-projects
mailing list