From nobody Sat Oct 17 17:16:23 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 4j6T47378fz6wT5R for ; Sat, 17 Oct 2026 17:16:23 +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 4j6T472Xzbz4YGH for ; Sat, 17 Oct 2026 17:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792257383; 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=1zabpn/dfRb4fs7wYea+2gcRR2601DvtdyP7usuGcMw=; b=WFbpQ9g8iSq2VxAFarURvXWflOIgW2ViUaiTCM9SQghoci6aoTheVpzGGfmPmSJTScrM6H DC1PWrvyij0odA4OIbTS8ZSx1TsIW+8A5tPd1Azqu0iuqEXeA778gmspcYZpnCkxppyeWr GqUIGOHoCFCLmdpoDEk+13SgeGjAQoDoRsxLx/980vsrpozSRWCqW1pS0NB1uQl2fDIU5j vmo2JG19UtvSUE/jlybQ0wnBZHJMthoRQa+dXepeMleuvPbNtbii2HfTC4hX4+NBe34dEk 4/0Ig+r27twyRPabGW3gG2KOu9ucDrwi3SxPplZR2hqHe7/SQ3W/EMgbTJVp8A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792257383; b=w+Q1KLeirNVk6EZ5qKqS5Z8En7K6nOqSw3Ni9X5ps+zfFSuXH8ikUpDmaM2Zc6QxxZgZqs 6leRTDRPU8v8tG2kHkIF81DBCf43X4lsmG7ohh2Myb1fmhST8DhYbDB+17C41O8dUlB+Db D2V+0gcvvSLVgqvlBNgzf1GHtka4ERQX++jnu61or5NLOaINIhIRtE4GGUZl57mdz2xJqp W+XGKCpGCXtikz9X4yMDlLMTH/rAJUqmZIrzP7p7+7HmSWYxZybwz1mpBVwT+iKbtzOcqK okjS56Y+jDBH58dS4xlLRuRMBz0xFN2RonX8/CZR2/m33lEaH7cuRoI/1F9paA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792257383; 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=1zabpn/dfRb4fs7wYea+2gcRR2601DvtdyP7usuGcMw=; b=oxaF3FpCgB2apu5ZUF8ffu2Lefi2UJYWggSlCDwuymdimcQ91cbdSD9nyz13RALWKov08F BNt+fRuQZUsFxcprnQzMdjw7oGFhjDt/FCyTQ+kJhN43u7yHbTJyNZfgKbV9+d/VQ/IEbP 3KS8JweJk2k95mpCrfur4Mx5tTvxC8MGjDLIcGe1/YlO7/BY7kV5yjfaKN2oFnXE/gvHW8 FxIuS8Za+tu8f5NC3S0nRY1FBQWw5eoVsXb54pO7OmblyH4H/xIYOpXQzL8Z+wRPcKtu+o P2VXdP4w80gQXNk+lIFwgtx0VUFpEpSV8u3na3C0qz/MJ0YmQWUywhzzcG9A5w== 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 4j6T471xqsz1BWm for ; Sat, 17 Oct 2026 17:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 17:16:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 7ccf9ae50ce4 - main - Makefile.inc1: Adjust mkimg bootstrap versions List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: 7ccf9ae50ce4e3df8ec2acd1e36aa4f6390629d1 Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 17:16:23 +0000 Message-Id: <6ad3ad67.1cb22.2a4ea954@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7ccf9ae50ce4e3df8ec2acd1e36aa4f6390629d1 commit 7ccf9ae50ce4e3df8ec2acd1e36aa4f6390629d1 Author: Colin Percival AuthorDate: 2026-10-17 17:09:41 +0000 Commit: Colin Percival CommitDate: 2026-10-17 17:09:41 +0000 Makefile.inc1: Adjust mkimg bootstrap versions Stream-optimized VMDK support was merged to stable/15 with __FreeBSD_version 1501504. Sponsored by: Amazon --- Makefile.inc1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 813630a372ac..fa5cfc433214 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2695,8 +2695,9 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf .endif .endif -# 1600027: vmdks support -.if ${BOOTSTRAPPING} < 1600027 || \ +# 1600027, 1501504: vmdks support +.if ${BOOTSTRAPPING} < 1501504 || \ + (${BOOTSTRAPPING} > 1600000 && ${BOOTSTRAPPING} < 1600027) || \ ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no" _mkimg= usr.bin/mkimg ${_bt}-usr.bin/mkimg: ${_bt}-lib/libz