aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.vm
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2014-11-20 03:46:35 +0000
committerColin Percival <cperciva@FreeBSD.org>2014-11-20 03:46:35 +0000
commit48096f81ed910e33371f0a2fb5212c06c9c707c4 (patch)
treec04235ffb11072f0177f63a40cb3e1418dd2e71d /release/Makefile.vm
parent3b4252413d2c175ee3678e69c6e8095e57060fee (diff)
downloadsrc-48096f81ed910e33371f0a2fb5212c06c9c707c4.tar.gz
src-48096f81ed910e33371f0a2fb5212c06c9c707c4.zip
Merge duplicative vm-CLOUDTYPE targets before additional duplication gets
added by the impending arrival of ec2 and gcloud.
Notes
Notes: svn path=/projects/release-vmimage/; revision=274734
Diffstat (limited to 'release/Makefile.vm')
-rw-r--r--release/Makefile.vm27
1 files changed, 9 insertions, 18 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm
index d362324379f7..bb5311fdc66c 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -26,6 +26,15 @@ ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT}
. if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf
. endif
+
+vm-${_CW:tl}:
+ mkdir -p ${.OBJDIR}/${.TARGET}
+ env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+ ${.CURDIR}/scripts/mk-vmimage.sh \
+ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
+ -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW}_FORMAT} \
+ -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW}IMAGE} -c ${${_CW}CONF}
+ touch ${.TARGET}
. endfor
.endif
@@ -53,21 +62,3 @@ vm-image:
touch ${.TARGET}
vm-cloudware: ${CLOUDTARGETS}
-
-vm-azure:
- mkdir -p ${.OBJDIR}/${.TARGET}
- env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/scripts/mk-vmimage.sh \
- -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
- -i ${.OBJDIR}/azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \
- -S ${WORLDDIR} -o ${.OBJDIR}/${AZUREIMAGE} -c ${AZURECONF}
- touch ${.TARGET}
-
-vm-openstack:
- mkdir -p ${.OBJDIR}/${.TARGET}
- env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/scripts/mk-vmimage.sh \
- -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
- -i ${.OBJDIR}/openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \
- -S ${WORLDDIR} -o ${.OBJDIR}/${OPENSTACKIMAGE} -c ${OPENSTACKCONF}
- touch ${.TARGET}