diff options
| author | gjb <gjb@FreeBSD.org> | 2014-10-29 16:18:29 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-10-29 16:18:29 +0000 |
| commit | b2f4325812859a3c741c1c51a4a01eb697361b95 (patch) | |
| tree | d380677829747f4fb63cf1f36f33e4f0b2732dff /release/Makefile.vm | |
| parent | 312c939c86a5d14589ab78630e9aff85d0e79cdb (diff) | |
| download | FreeBSD-src-b2f4325812859a3c741c1c51a4a01eb697361b95.zip FreeBSD-src-b2f4325812859a3c741c1c51a4a01eb697361b95.tar.gz | |
Avoid hard-coding the Azure image file format.
While here, avoid using OSRELEASE for the output
file name.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/Makefile.vm')
| -rw-r--r-- | release/Makefile.vm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm index 82eb7d4..ce7f0ea 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -11,7 +11,7 @@ VMSIZE?= 20G VMBASE?= vm CLOUDWARE?= AZURE -AZURE_FORMAT= vhd +AZURE_FORMAT= vhdf .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -20,6 +20,7 @@ CLEANDIRS+= vm-${_CW:tl} CLEANFILES+= ${_CW:tl}.img \ ${_CW:tl}.${${_CW:tu}_FORMAT} \ ${_CW:tl}.${${_CW:tu}_FORMAT}.raw +${_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 @@ -59,7 +60,8 @@ vm-image: vm-base vm-azure: .if exists(${.CURDIR}/${TARGET}/mk-azure.sh) env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} AZURECONF=${AZURECONF} \ + AZURE_FORMAT=${AZURE_FORMAT} \ ${.CURDIR}/${TARGET}/mk-azure.sh ${.TARGET} azure.img \ - ${WORLDDIR} ${.TARGET} ${VMSIZE} ${OSRELEASE}.vhd + ${WORLDDIR} ${.TARGET} ${VMSIZE} ${AZUREIMAGE} .endif touch ${.TARGET} |
