diff options
| author | gjb <gjb@FreeBSD.org> | 2015-05-21 17:39:42 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-05-21 17:39:42 +0000 |
| commit | ba307f79ae0de7bc8108458af27ce0949aeff3ed (patch) | |
| tree | b1413cbd3e9a89ef72932f30033b81551eb3ce32 /release | |
| parent | 6064bc7d5fa30100c0a5d706c8ac6d3725c2220a (diff) | |
| download | FreeBSD-src-ba307f79ae0de7bc8108458af27ce0949aeff3ed.zip FreeBSD-src-ba307f79ae0de7bc8108458af27ce0949aeff3ed.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.ec2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index f7f34a6..a781bc6 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} |
