Merge duplicative vm-CLOUDTYPE targets before additional duplication gets
added by the impending arrival of ec2 and gcloud.
This commit is contained in:
parent
3b4252413d
commit
48096f81ed
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/release-vmimage/; revision=274734
@ -26,6 +26,15 @@ ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT}
|
|||||||
. if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
|
. if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
|
||||||
${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf
|
${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf
|
||||||
. endif
|
. 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
|
. endfor
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
@ -53,21 +62,3 @@ vm-image:
|
|||||||
touch ${.TARGET}
|
touch ${.TARGET}
|
||||||
|
|
||||||
vm-cloudware: ${CLOUDTARGETS}
|
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}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user