From nobody Sat Oct 17 17:08:42 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 4j6SvH1Pr8z6wSM2 for ; Sat, 17 Oct 2026 17:08:43 +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 4j6SvG6v6dz4VY9 for ; Sat, 17 Oct 2026 17:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256923; 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=GzJzAMdKW52ZDqSjXwsxekqW8LJvamKyBAFLNQ0AGsM=; b=pkBf/SOAlI3fPusfNMtQ8CR5ZyDKtj/KD0F3f3elI1ghf/DGrZ3ms0A1wUyj1PLkX7TwK6 Du3X36IVC6xoyL3ErKlT3BTNAQ0beKVt/WRqIpZhJqBEUPyyExJBP/TXD8sDuLsiPGmgY2 wLc7OrCCJJACtpDfgLWt5vE/txc8NWsKQyae+U9JQD8V7UV6PHo+1SaG9gXUj3egXu7oTm WZq19NuBx3Map44HjGAK927DkP8YWAftnuD1OdlfH8vwyn+oqlm38oY42VMssGiowS6Ibt 2JDSwAY7e9ZXQ/hY0YbSUbjQ6ovs4yvIa9h9QYl4fnHBlIp5uRSuiZc2DOQ1qg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792256923; b=BKZW9l/7mIyL+5FUJyCc1RHyDDMAzSBrM+8EVnSWayZOe4xS20RNHv2Z9wg0nuMXKn3kAD G2Et49g66SWc0yaHxSEuZijugIarh2GIG9auC9e2e6sVd7ytxVdqFMi5gCSu+9+QtkWnBs nb4WdI/7RtZKNBuEF1xYaUOQ0AeMld3f9qTC3YlQYefvp0g0m7zM5i6OVTebIyd7qA2b/Q 58ulQv+EhdaclYrmH77Wet2UoZ6hTFU+KvpO0lcuqjffSz1UC3M2IMQ0Rc6/uiWeTdgz4t ct2p8J+VDczPUYRJG/l2YSmizbMNXjY4N1RIJiiBqGWTwuyABpywwRt3rZ3Lcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256923; 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=GzJzAMdKW52ZDqSjXwsxekqW8LJvamKyBAFLNQ0AGsM=; b=KKN7kQSXOvC+addjVXu8RweiNglJ9tyyRY0Na5wXka1NOqGVNeP/EzbYvFOWem3i0m4mSX SRvZobpu3OpENpTrcPfx7GtQI218ZU/BtmXRKU2Z/nb/VE2JXJpnQECUGjZdpbHopDz/gk PT1TGUTPNz6YlCMICQ5hhy4yBQgUR6B4DZ/PL2qruxr12kxYJdvhYBfq97IUgLXwCTmpt0 a4yccUvCaPesD+vkyTJdkQU5GtF3O6IbFoNPD+ZqzCUq4r+MfAEIr10a6cun3plMNph/bh mGR618b2ZRAV+m9Z9Y9yFoNRLkHfLWiM/ZvDml0pXdqwZ8pWvKnhp2TNEkqaWg== 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 4j6SvG69gMz1Bq4 for ; Sat, 17 Oct 2026 17:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1955c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 17:08:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: aa59f16dae9c - stable/15 - __FreeBSD_version: Bump for mkimg -f vmdks 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: aa59f16dae9ce8166a2b11160af08c6fa099e79e Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 17:08:42 +0000 Message-Id: <6ad3ab9a.1955c.7251cb4a@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=aa59f16dae9ce8166a2b11160af08c6fa099e79e commit aa59f16dae9ce8166a2b11160af08c6fa099e79e Author: Colin Percival AuthorDate: 2026-09-29 19:44:41 +0000 Commit: Colin Percival CommitDate: 2026-10-17 17:02:27 +0000 __FreeBSD_version: Bump for mkimg -f vmdks Also, adjust bootstrap tools code in Makefile.inc1 to reflect this; in addition to rebuilding mkimg if it is out of date, we now need to build libz, which was not previously needed by mkimg. Reviewed by: kevans MFC after: 2 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60153 X-Cherry-Pick: Logic in Makefile.inc1 was adjusted for new __FreeBSD_version (cherry picked from commit a68ba2d2ce55f7c76174239c1f678379caec5348) --- Makefile.inc1 | 8 +++++--- sys/sys/param.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 162951157c2d..c6501016729a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2652,11 +2652,13 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf .endif .endif -# 1300102: VHDX support -.if ${BOOTSTRAPPING} < 1201520 || \ - (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) || \ +# 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 +_other_bootstrap_tools+=lib/libz .else _bootstrap_tools_links+=mkimg .endif diff --git a/sys/sys/param.h b/sys/sys/param.h index 4e0454a0f432..c4297ff9e577 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1501503 +#define __FreeBSD_version 1501504 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,