From f27438c75256f550d9327bf6d3915fc83fd34620 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 29 Oct 2014 16:18:29 +0000
Subject: [PATCH] Avoid hard-coding the Azure image file format. While here,
 avoid using OSRELEASE for the output file name.

Sponsored by:	The FreeBSD Foundation
---
 release/Makefile.vm       | 6 ++++--
 release/amd64/mk-azure.sh | 2 +-
 release/i386/mk-azure.sh  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 82eb7d4ece4..ce7f0eab922 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}
diff --git a/release/amd64/mk-azure.sh b/release/amd64/mk-azure.sh
index 45b70ae73a1..43c92040ed3 100755
--- a/release/amd64/mk-azure.sh
+++ b/release/amd64/mk-azure.sh
@@ -132,7 +132,7 @@ vm_create_azure() {
 
 	echo "Creating image...  Please wait."
 
-	mkimg -f vhdf -s gpt \
+	mkimg -f ${AZURE_FORMAT} -s gpt \
 		-b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \
 		-p freebsd-swap/swapfs::1G \
 		-p freebsd-ufs/rootfs:=${VMBASE} \
diff --git a/release/i386/mk-azure.sh b/release/i386/mk-azure.sh
index 45b70ae73a1..43c92040ed3 100755
--- a/release/i386/mk-azure.sh
+++ b/release/i386/mk-azure.sh
@@ -132,7 +132,7 @@ vm_create_azure() {
 
 	echo "Creating image...  Please wait."
 
-	mkimg -f vhdf -s gpt \
+	mkimg -f ${AZURE_FORMAT} -s gpt \
 		-b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \
 		-p freebsd-swap/swapfs::1G \
 		-p freebsd-ufs/rootfs:=${VMBASE} \