aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.ec2
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-05-01 18:07:18 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-05-01 18:07:18 +0000
commitde7df74b4855cd9bdd01583a12409d5b1e6da354 (patch)
treeca54c9ba1af0ca2eb29e395b069252993a4e1ada /release/Makefile.ec2
parent7263c8c0998402e9860a0865013fbec4ece98cd4 (diff)
parent24f93ee714b6bc904bdc6e7f7022c4dbe1117581 (diff)
downloadsrc-de7df74b4855cd9bdd01583a12409d5b1e6da354.tar.gz
src-de7df74b4855cd9bdd01583a12409d5b1e6da354.zip
MFH: r281855-r282312
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-arm-redux/; revision=282313
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r--release/Makefile.ec216
1 files changed, 10 insertions, 6 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 869ebc15264e..f74d32027a7d 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"