From owner-svn-src-projects@FreeBSD.ORG Wed Oct 29 16:18:31 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 124E494E; Wed, 29 Oct 2014 16:18:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7A64F83; Wed, 29 Oct 2014 16:18:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9TGIUCA019583; Wed, 29 Oct 2014 16:18:30 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9TGIUNC019580; Wed, 29 Oct 2014 16:18:30 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201410291618.s9TGIUNC019580@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 29 Oct 2014 16:18:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r273825 - in projects/release-vmimage/release: . amd64 i386 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 16:18:31 -0000 Author: gjb Date: Wed Oct 29 16:18:29 2014 New Revision: 273825 URL: https://svnweb.freebsd.org/changeset/base/273825 Log: Avoid hard-coding the Azure image file format. While here, avoid using OSRELEASE for the output file name. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile.vm projects/release-vmimage/release/amd64/mk-azure.sh projects/release-vmimage/release/i386/mk-azure.sh Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Wed Oct 29 15:52:17 2014 (r273824) +++ projects/release-vmimage/release/Makefile.vm Wed Oct 29 16:18:29 2014 (r273825) @@ -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} Modified: projects/release-vmimage/release/amd64/mk-azure.sh ============================================================================== --- projects/release-vmimage/release/amd64/mk-azure.sh Wed Oct 29 15:52:17 2014 (r273824) +++ projects/release-vmimage/release/amd64/mk-azure.sh Wed Oct 29 16:18:29 2014 (r273825) @@ -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} \ Modified: projects/release-vmimage/release/i386/mk-azure.sh ============================================================================== --- projects/release-vmimage/release/i386/mk-azure.sh Wed Oct 29 15:52:17 2014 (r273824) +++ projects/release-vmimage/release/i386/mk-azure.sh Wed Oct 29 16:18:29 2014 (r273825) @@ -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} \