svn commit: r283252 - head/release

[Glen Barber]

Author: gjb
Date: Thu May 21 17:39:42 2015
New Revision: 283252
URL: https://svnweb.freebsd.org/changeset/base/283252

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

Modified:
  head/release/Makefile.ec2

Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2	Thu May 21 16:44:31 2015	(r283251)
+++ head/release/Makefile.ec2	Thu May 21 17:39:42 2015	(r283252)
@@ -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}