aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.ec2
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2018-08-06 19:21:32 +0000
committerColin Percival <cperciva@FreeBSD.org>2018-08-06 19:21:32 +0000
commita7ec419d932898f19340a2e061c5e02981d07362 (patch)
treeb906ce455b0e15e2b6db954ed8f19197a6a9149a /release/Makefile.ec2
parent564ec04ea8de9046beee5708e1f3fa4e115b9240 (diff)
downloadsrc-a7ec419d932898f19340a2e061c5e02981d07362.tar.gz
src-a7ec419d932898f19340a2e061c5e02981d07362.zip
Add EC2PUBLICSNAP option to EC2 builds; this passes a (recently added)
flag to bsdec2-image-upload instructing it to mark the snapshot of its root disk as public (which is independent from marking the created AMIs as public). Requested by: Amazon
Notes
Notes: svn path=/head/; revision=337394
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r--release/Makefile.ec25
1 files changed, 4 insertions, 1 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 58332dec20ea..ab50e22d6a13 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -35,6 +35,9 @@ AMINAMESUFFIX!= date +-%Y-%m-%d
.if defined(EC2PUBLIC) && !empty(EC2PUBLIC)
PUBLISH= --public
.endif
+.if defined(EC2PUBLICSNAP) && !empty(EC2PUBLICSNAP)
+PUBLISH= --publicsnap
+.endif
.if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
EC2SNSREL= ${REVISION}-${BRANCH}
EC2SNSVERS= ${EC2_SVNBRANCH}@${EC2_SVNREV}
@@ -79,7 +82,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
@echo "--------------------------------------------------------------"
@false
.endif
- /usr/local/bin/bsdec2-image-upload ${PUBLISH} --sriov --ena \
+ /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} --sriov --ena \
${.OBJDIR}/ec2.raw \
"${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
"${TYPE}/${TARGET} ${EC2_SVNBRANCH}@${EC2_SVNREV}" \