diff options
| author | gjb <gjb@FreeBSD.org> | 2015-04-30 00:35:45 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-04-30 00:35:45 +0000 |
| commit | 64b7754f6bf764fc7c4f921916e19418075e80e9 (patch) | |
| tree | fbab1cad578bb1a8e675ee296b1e61f6651a5b9e | |
| parent | 759d86de9675cedf32b3c7d7557bc0899385a13a (diff) | |
| download | FreeBSD-src-64b7754f6bf764fc7c4f921916e19418075e80e9.zip FreeBSD-src-64b7754f6bf764fc7c4f921916e19418075e80e9.tar.gz | |
MFC r282116:
Add the cw-ec2-portinstall target to always install the
net/bsdec2-image-upload port.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | release/Makefile.ec2 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 869ebc1..f74d320 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" |
