svn commit: r282116 - head/release
Glen Barber
gjb at FreeBSD.org
Mon Apr 27 21:38:13 UTC 2015
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"
More information about the svn-src-head
mailing list