Date: Thu, 30 Apr 2015 00:35:46 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282263 - stable/10/release Message-ID: <201504300035.t3U0Zk43042607@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Apr 30 00:35:45 2015 New Revision: 282263 URL: https://svnweb.freebsd.org/changeset/base/282263 Log: MFC r282116: Add the cw-ec2-portinstall target to always install the net/bsdec2-image-upload port. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/Makefile.ec2 Directory Properties: stable/10/ (props changed) Modified: stable/10/release/Makefile.ec2 ============================================================================== --- stable/10/release/Makefile.ec2 Thu Apr 30 00:34:41 2015 (r282262) +++ stable/10/release/Makefile.ec2 Thu Apr 30 00:35:45 2015 (r282263) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504300035.t3U0Zk43042607>