svn commit: r283345 - stable/10/release

[Glen Barber]

Author: gjb
Date: Sun May 24 02:15:18 2015
New Revision: 283345
URL: https://svnweb.freebsd.org/changeset/base/283345

Log:
  MFC r283252:
    Include the TARGET in the EC2 AMI name.
  
    Without this, AWS rejects subsequent image uploads of a different
    architecture because the name conflicts.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile.ec2
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile.ec2
==============================================================================
--- stable/10/release/Makefile.ec2	Sun May 24 01:52:22 2015	(r283344)
+++ stable/10/release/Makefile.ec2	Sun May 24 02:15:18 2015	(r283345)
@@ -53,7 +53,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
 .endif
 	/usr/local/bin/bsdec2-image-upload ${PUBLISH}		\
 	    ${.OBJDIR}/ec2.raw					\
-	    "${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}"	\
-	    "${TYPE} ${REVISION}-${BRANCH}"			\
+	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}"	\
+	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}"			\
 	    ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}
 	@touch ${.TARGET}