hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 06:12:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add logic to detect if the net/bsdec2-image-upload port needs

Browse Source 
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.

Submitted by:	cperciva[1]
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-05-04 15:04:39 +00:00
parent f49c3ab774
commit 98becbfc3c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=282419
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
release/Makefile.ec2
View File

@ -12,6 +12,15 @@ AMINAMESUFFIX!= date +-%Y-%m-%d
PUBLISH= --public PUBLISH= --public
.endif .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: cw-ec2-portinstall:
.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) .if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
@ -21,8 +30,10 @@ cw-ec2-portinstall:
. endif . endif
env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload
.endif .endif
@touch ${.TARGET}
ec2ami: cw-ec2 cw-ec2-portinstall ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
@false
.if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE})
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation"
@ -46,3 +57,4 @@ ec2ami: cw-ec2 cw-ec2-portinstall
"${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \ "${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \
"${TYPE} ${REVISION}-${BRANCH}" \ "${TYPE} ${REVISION}-${BRANCH}" \
${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}
@touch ${.TARGET}