svn commit: r337394 - head/release

[Colin Percival]

Author: cperciva
Date: Mon Aug  6 19:21:32 2018
New Revision: 337394
URL: https://svnweb.freebsd.org/changeset/base/337394

Log:
  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

Modified:
  head/release/Makefile.ec2

Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2	Mon Aug  6 19:09:55 2018	(r337393)
+++ head/release/Makefile.ec2	Mon Aug  6 19:21:32 2018	(r337394)
@@ -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}" \