From 52f1969670f4e0ce2e45200a970e5ede810eb608 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 30 Apr 2015 00:35:45 +0000
Subject: [PATCH] MFC r282116:   Add the cw-ec2-portinstall target to always
 install the   net/bsdec2-image-upload port.

Sponsored by:	The FreeBSD Foundation


git-svn-id: svn://svn.freebsd.org/base/stable/10@282263 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/Makefile.ec2 | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 869ebc152..f74d32027 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -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"
-- 
2.45.0