From owner-svn-src-head@FreeBSD.ORG  Mon Apr 27 21:38:13 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 317D1F3E;
 Mon, 27 Apr 2015 21:38:13 +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 1FF0110E7;
 Mon, 27 Apr 2015 21:38:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RLcCLD010348;
 Mon, 27 Apr 2015 21:38:12 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RLcCLl010347;
 Mon, 27 Apr 2015 21:38:12 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201504272138.t3RLcCLl010347@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: Mon, 27 Apr 2015 21:38:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282116 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Apr 2015 21:38:13 -0000

Author: gjb
Date: Mon Apr 27 21:38:12 2015
New Revision: 282116
URL: https://svnweb.freebsd.org/changeset/base/282116

Log:
  Add the cw-ec2-portinstall target to always install the
  net/bsdec2-image-upload port.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.ec2

Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2	Mon Apr 27 21:27:51 2015	(r282115)
+++ head/release/Makefile.ec2	Mon Apr 27 21:38:12 2015	(r282116)
@@ -12,13 +12,17 @@ AMINAMESUFFIX!=	date +-%Y-%m-%d
 PUBLISH=	--public
 .endif
 
-ec2ami: cw-ec2
-.if !exists(/usr/local/bin/bsdec2-image-upload)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Creating EC2 AMIs requires bsdec2-image-upload"
-	@echo "--------------------------------------------------------------"
-	@false
+cw-ec2-portinstall:
+.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
+	make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
+.else
+. if !exists(/usr/local/sbin/pkg-static)
+	env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
+. endif
+	env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload
 .endif
+
+ec2ami: cw-ec2 cw-ec2-portinstall
 .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE})
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation"