git: 65840afc8855 - main - EC2: Pass --vmdk to bsdec2-image-upload if needed

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=65840afc88553f89c051b96b081061a532cb7df3

commit 65840afc88553f89c051b96b081061a532cb7df3
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-10-03 16:42:07 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-10-03 16:42:07 +0000

    EC2: Pass --vmdk to bsdec2-image-upload if needed
    
    Starting with version 1.5.0, bsdec2-image-upload supports uploading
    stream-optimized VMDK files.  If we build images in that format, we
    need to upload them appropriately.
    
    MFC after:      2 weeks
    Sponsored by:   Amazon
---
 release/Makefile.ec2 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index c33345201b36..bc891dac0d58 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -32,6 +32,9 @@ AMIBASENAME=${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}
 .else
 AMIBASENAME=${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD}
 .endif
+.if ${EC2_FORMAT} == "vmdks"
+EC2_VMDK=	--vmdk
+.endif
 
 CLEANFILES+=		ec2ami
 
@@ -88,7 +91,7 @@ ec2ami-${_FL}-${_FS}: cw-ec2-${_FL}-${_FS} ${CW_EC2_PORTINSTALL}
 .endif
 	/usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \
 	    ${EC2ARCH} ${SSMOPTS_${_FL}_${_FS}} ${SSMOPTSEXTRA_${_FL}_${_FS}} \
-	    ${BOOTMODEOPT} --sriov --ena \
+	    ${BOOTMODEOPT} ${EC2_VMDK} --sriov --ena \
 	    ${.OBJDIR}/${EC2-${_FL:tu}${_FS:tu}IMAGE} \
 	    "${AMIBASENAME} ${_FL} ${_FS:tu}" \
 	    "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \