From owner-svn-src-projects@FreeBSD.ORG  Sat Nov  8 12:45:36 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 68353302;
 Sat,  8 Nov 2014 12:45:36 +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 3C39CC29;
 Sat,  8 Nov 2014 12:45:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8Cja95097455;
 Sat, 8 Nov 2014 12:45:36 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8CjakI097454;
 Sat, 8 Nov 2014 12:45:36 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201411081245.sA8CjakI097454@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Nov 2014 12:45:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274283 - projects/release-vmimage/release
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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2014 12:45:36 -0000

Author: gjb
Date: Sat Nov  8 12:45:35 2014
New Revision: 274283
URL: https://svnweb.freebsd.org/changeset/base/274283

Log:
  Fix DESTDIR for installworld, and make sure it is created
  before use.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/Makefile.vm

Modified: projects/release-vmimage/release/Makefile.vm
==============================================================================
--- projects/release-vmimage/release/Makefile.vm	Sat Nov  8 12:45:02 2014	(r274282)
+++ projects/release-vmimage/release/Makefile.vm	Sat Nov  8 12:45:35 2014	(r274283)
@@ -44,9 +44,10 @@ vm-image:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 . if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
 .  for FORMAT in ${VMFORMATS}
+	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh \
-		-C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \
 		-S ${WORLDDIR} -o ${VMBASE}.${FORMAT}
 .  endfor
@@ -58,9 +59,10 @@ vm-cloudware:	${CLOUDTARGETS}
 
 vm-azure:
 .if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh \
-		-C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \
 		-S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF}
 .endif
@@ -68,9 +70,10 @@ vm-azure:
 
 vm-openstack:
 .if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh \
-		-C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \
 		-S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF}
 .endif