mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 21:05:08 +00:00
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
This commit is contained in:
parent
c636f94bd2
commit
9aa91d25f9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=283252
|
@ -53,7 +53,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
|
||||||
.endif
|
.endif
|
||||||
/usr/local/bin/bsdec2-image-upload ${PUBLISH} \
|
/usr/local/bin/bsdec2-image-upload ${PUBLISH} \
|
||||||
${.OBJDIR}/ec2.raw \
|
${.OBJDIR}/ec2.raw \
|
||||||
"${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \
|
"${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
|
||||||
"${TYPE} ${REVISION}-${BRANCH}" \
|
"${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \
|
||||||
${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}
|
${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}
|
||||||
@touch ${.TARGET}
|
@touch ${.TARGET}
|
||||||
|
|
Loading…
Reference in a new issue