From nobody Sat Oct 03 16:46:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hxs4Y2FZRz6vj30 for ; Sat, 03 Oct 2026 16:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hxs4X5sPMz4bg8 for ; Sat, 03 Oct 2026 16:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791046012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eK0ySEP0q89yaJ6AjWSNeJ3N1k+ZnwCe2I17yFiNAV8=; b=Dq9hK/oZt/S0Wc6EtrY9Ci0B0SjXrW85p+LGklYCO8a6EA8fHgQrQsMRx98TpXzlxPatkI wrgge6DLHfLFdt6wnnMF3HlhSkYeN08FXLEpP8e5Zc+kgku9bB6Rdhyure+sFQxchvDbvi ghPm0NUSgPwMYmDcg3CIzLtOsUzJtWr4P3thGP7apRjHzIV2TdSDUw6YQl3q396dZ8mvkf Mwb1MfjLgD3nNonZr+oAEUCYjRGdW5Vyb7tcTabd4NxgHIq5+zHgXpX/IEmtpqrLN/7ckD pQbjN1FSfudHfzRlyLped31mHSckJakAMPZlyBnk8e8d6x6tSHkJdqmgk9Qkyw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791046012; b=l+KwYSm4F/6tViVExCoshj/ZGzl59OUTrDofWLD/geM/mdhST06iGUp7WvuARDP2V/oUTt s6HAVo4IX3W5DdJ7tQi5vU3U8G6leyvh9n0SAdmv/UoXgYcs57JKt6b6tuCqirnopQts47 LcRw22Xwj/TQP9jYurxDs5uQK+zBPENxSSsCZFuDb05FsLnNgUBccQqZ+G3ZiCYTxKLrcy dRF4vaxgac8eBTyFvs1RtdEmf/EiQKSujQVCRqmCRF1odtqQbVkRdwBJ8QcBm2tkWlq+Pg 2JX/wOK2QJd/pNO0JRhwj3mlelySc+5ie5YpgCJmp9d34P1/9mOg0WGHbRv5Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791046012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eK0ySEP0q89yaJ6AjWSNeJ3N1k+ZnwCe2I17yFiNAV8=; b=t7+BltopmQx+7PcLhT4U9yH8wNMmJ4+cUG+lQ/cWJOMXstHXh1/9O1GruytiMZRtJioVZJ Af04STuPqTd+1POJRUL7mZ4BmDjk7Gt8urBDdJPzCnqVzkptiU9NpAGdpLVzAA0gak1c41 8juws50Pzq493YSPRUSMGIAU6GwhOcQBmnJtE5IZhxdzjHOAm8QzcD+UIgAUUDwnbZdotr odxEvEfErPjuRWzdq/YYpE6pzo+qYCs7kCtp1PoFG3jWLOL7Mr6ylva1T7uSIq7qAfDy0v RlCgnZ9vBEH6f1YDGbb0E8sJ2ObM4H4vZo6bplWlPuA17hM5IY/gKxmoimMXEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hxs4X4v3Rz19mm for ; Sat, 03 Oct 2026 16:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18628 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 16:46:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 65840afc8855 - main - EC2: Pass --vmdk to bsdec2-image-upload if needed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65840afc88553f89c051b96b081061a532cb7df3 Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 16:46:52 +0000 Message-Id: <6ac1317c.18628.70f07fa3@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=65840afc88553f89c051b96b081061a532cb7df3 commit 65840afc88553f89c051b96b081061a532cb7df3 Author: Colin Percival AuthorDate: 2026-10-03 16:42:07 +0000 Commit: Colin Percival 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}" \