From nobody Sat Oct 17 17:08:45 2026 X-Original-To: dev-commits-src-all@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 4j6SvK6JYlz6wSBK for ; Sat, 17 Oct 2026 17:08:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j6SvK1hFLz4Vdc for ; Sat, 17 Oct 2026 17:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256925; 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=Zupx817noVzfakkhOj3K9IidD1NvbaYvgOeg13jZ23g=; b=eHYIRLV9JX1V4z4I5rF2tAVg4EsJmkK/6GIs0Uupjs4q5EwQrxx3h+Btxuv9yZfpVid3kL 0vXH/SuGMyzqKjaBZvP3+hJirQy5GvgHa4ZkskdmgQRWO/GSMJsogq1htdQ316byM8icqi 9Ps2NqdzirDF18c7M27jsxTGMsxu0O0TDvy33Qw2ObKxpCcUOxE8MVFq+KvfUPecGq/pfS 0rMXZNC5AGywTJrw8lKl07AiPIAPoEWRqCzfCi4Tfcf4HmR+v2xbBg3dmdYl0ZxapvExVU XTNjIFnxjoNMwrOzExMqAe78lWCrv8X7XTXsyj3YJ0dGNxl2f9tPP2jKchpAgg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792256925; b=qZwAimAJH9LHCuj7SktFUwR4BubV/+9WcADtMDB8Cb3gKyX2+chqsCGIooLQe4YMjBBR7e Qy0DKlwDVhxSbdnm+qaOX1xHWBpRyAKHk3WmGzAGkLOA+Tjbus3hexB9wPSCmndjCrGKYp c0cF1UwTlTqsyivjs5SUdQslphoeVoq2D7eMV+hQhRtHv3JqiMfT5xq3mIGZnm8eNg/Kcj OCMaCIZ+3aVLbqCjjOBxCaF23HusGtvBQPVks8D2kgi1wXLz79snbW9W1C32x6bEDSWNhf tQ59UmR1+vR+br8zwhdvh4qy1xtJEIp2DtVHYz4yqPjPDu1WoyT/fpKbqkxpVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256925; 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=Zupx817noVzfakkhOj3K9IidD1NvbaYvgOeg13jZ23g=; b=e2o2UF2ak8MahcyJ2RHhjoffgW5SYmOYFDih7AbIuRWtrPa1QP1vonXYVO3UiyiFiFo3au KgbjlncrKtVRbVXG6MeGCCQZ0AKNvOgdcktPo8ACyV0ZcLZHmiqjyEfR7T+DenMd8uOvxw /pVrjlPhc8LNQLTVbblKcYG2KT0T9TlZtL6K9FsD0MHCqvesvNc1ComjeTdMxT7FvOi0Cu wOp1wPVPxJR/os8/+A/62SkCeZ8ZUp71o5ymBf2td3aB6dEwL+nsdLwPI8L6B9sKYLzWsH aSGfLVugb/xseVGy6KTeuEk08nN8PbA7GCNit1tNtRXCY5PFT6GP548Mb4Yvvw== 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 4j6SvK1LYYz1Br7 for ; Sat, 17 Oct 2026 17:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c73e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 17:08:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3720eae2ba39 - stable/15 - EC2: Pass --vmdk to bsdec2-image-upload if needed List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3720eae2ba39d7a4c76997fed0255bfa7cd8800c Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 17:08:45 +0000 Message-Id: <6ad3ab9d.1c73e.7d576dc5@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3720eae2ba39d7a4c76997fed0255bfa7cd8800c commit 3720eae2ba39d7a4c76997fed0255bfa7cd8800c Author: Colin Percival AuthorDate: 2026-10-03 16:42:07 +0000 Commit: Colin Percival CommitDate: 2026-10-17 17:02:27 +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 (cherry picked from commit 65840afc88553f89c051b96b081061a532cb7df3) --- 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}" \