diff options
author | gjb <gjb@FreeBSD.org> | 2015-05-08 02:21:29 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2015-05-08 02:21:29 +0000 |
commit | b48d3ee8e0b9264b5c609e743bda864f76948075 (patch) | |
tree | 0ae5f88146d8b25877ce100a4e4ba0e47e197179 | |
parent | 8ef9c9b39e25706df435e6b65e8a992924ecbe2a (diff) | |
download | FreeBSD-src-b48d3ee8e0b9264b5c609e743bda864f76948075.zip FreeBSD-src-b48d3ee8e0b9264b5c609e743bda864f76948075.tar.gz |
MFC r282419, r282435:
r282419:
Add logic to detect if the net/bsdec2-image-upload port needs
to be installed. [1]
For the cw-ec2-portinstall and ec2ami targets, touch the
.TARGET file after completion to prevent duplicate invocations.
Add cw-ec2-portinstall and ec2ami to CLEANFILES.
r282435:
Remove a debugging line that snuck in with the previous commit.
Sponsored by: The FreeBSD Foundation
-rw-r--r-- | release/Makefile.ec2 | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index f74d320..f7f34a6 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -12,6 +12,15 @@ AMINAMESUFFIX!= date +-%Y-%m-%d PUBLISH= --public .endif +CLEANFILES+= ec2ami + +.if !exists(/usr/local/bin/bsdec2-image-upload) +CW_EC2_PORTINSTALL= cw-ec2-portinstall +CLEANFILES+= ${CW_EC2_PORTINSTALL} +.else +CW_EC2_PORTINSTALL= +.endif + cw-ec2-portinstall: .if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean @@ -21,8 +30,9 @@ cw-ec2-portinstall: . endif env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload .endif + @touch ${.TARGET} -ec2ami: cw-ec2 cw-ec2-portinstall +ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" @@ -46,3 +56,4 @@ ec2ami: cw-ec2 cw-ec2-portinstall "${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \ "${TYPE} ${REVISION}-${BRANCH}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} + @touch ${.TARGET} |