From owner-svn-src-projects@FreeBSD.ORG  Wed Oct  1 19:25:03 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 24BA88AE;
 Wed,  1 Oct 2014 19:25:03 +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 112B9A9D;
 Wed,  1 Oct 2014 19:25:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s91JP2gK060968;
 Wed, 1 Oct 2014 19:25:02 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s91JP2NH060967;
 Wed, 1 Oct 2014 19:25:02 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410011925.s91JP2NH060967@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: Wed, 1 Oct 2014 19:25:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272381 - 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: Wed, 01 Oct 2014 19:25:03 -0000

Author: gjb
Date: Wed Oct  1 19:25:02 2014
New Revision: 272381
URL: https://svnweb.freebsd.org/changeset/base/272381

Log:
  After evaluating WITH_VMIMAGES is non-empty, ensure
  the mk-vmimage.sh script exists before running it.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/Makefile

Modified: projects/release-vmimage/release/Makefile
==============================================================================
--- projects/release-vmimage/release/Makefile	Wed Oct  1 19:13:42 2014	(r272380)
+++ projects/release-vmimage/release/Makefile	Wed Oct  1 19:25:02 2014	(r272381)
@@ -317,18 +317,22 @@ install:
 
 vm-base:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
 		${VMBASE}.img ${WORLDDIR} ${.OBJDIR}/${.TARGET} ${VMSIZE}
+. endif
 .endif
 	touch ${.TARGET}
 
 vm-image: vm-base
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
-. for FORMAT in ${VMFORMATS}
+. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+.  for FORMAT in ${VMFORMATS}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
 		${VMBASE}.img ${FORMAT} ${VMBASE}.${FORMAT}
-. endfor
+.  endfor
+. endif
 .endif
 	touch ${.TARGET}