aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.ec2
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-05-21 17:39:42 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-05-21 17:39:42 +0000
commit9aa91d25f9bff7443fab6398a7292d22656f770f (patch)
treeb1413cbd3e9a89ef72932f30033b81551eb3ce32 /release/Makefile.ec2
parentc636f94bd2ff15be5b904939872b4bce31456c18 (diff)
downloadsrc-9aa91d25f9bff7443fab6398a7292d22656f770f.tar.gz
src-9aa91d25f9bff7443fab6398a7292d22656f770f.zip
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
Notes
Notes: svn path=/head/; revision=283252
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r--release/Makefile.ec24
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index f7f34a6fab79..a781bc6d346a 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -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}