From owner-svn-src-all@FreeBSD.ORG  Thu May 21 17:39:43 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0F85CB30;
 Thu, 21 May 2015 17:39:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F310D1D69;
 Thu, 21 May 2015 17:39:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4LHdgQX027603;
 Thu, 21 May 2015 17:39:42 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4LHdgrZ027602;
 Thu, 21 May 2015 17:39:42 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505211739.t4LHdgrZ027602@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 21 May 2015 17:39:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283252 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 May 2015 17:39:43 -0000

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}