From nobody Sat Oct 03 15:42:45 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 4hxqfY6tG1z6vcV9 for ; Sat, 03 Oct 2026 15:42: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 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 4hxqfY3nySz4T1G for ; Sat, 03 Oct 2026 15:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042165; 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=5N+w+g0Bjr09uD00nBKiyH1zFh1Ft8OteUsSjTPO/1s=; b=Nn+NTgQYcIlXhUQOHa5OyPYxLAm3njfbdMah4G9zUXszH7bOqrkASLYJTq3IMTdl/hMJBj gTT7VRkE9uDmJIuq0sglmkaiEmw9fvsUXjHXTVesJC14IBmnuegIDXS9yYnY3HM6gXsvZl BOpI7+rMwlSV4AxGPpFIPycUYy6/+hUN/GJ1zMvWktMr2fcqBgYKNgNKfO/R9qW9GqDplS JUj1dHR31/9NSJwk4qmtwze0J9OBa0Y6sTYCzGwWYVHew7ULhYv0lHt0rq7Bpu3iIxJpTY JDwjLynqPtv/J7ZVbmb3kJuPLhSPUQB7YZaBwfMlufguPehmQuOngQqftAOEng== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791042165; b=q5OP4tnXktCu5aLQ2ZtF6oBys1aKcbDbPu0RHmvhFWh8KwZY/nmuPHpZ8gqNcDAVm8v7YV eF9akgicfXLLWPl+/ZWv2bmIg9gx9fphAxGdZ2RAWfgXzar967EIgMS79GIIpskKftLcf5 FC92tSmdlXatL/1/Nb6AXd0BhcLeDewP9R4C2HBZsOUeAc1TDcMPro9OuRmMRr6SNhB0lB v6o3gtR5dTOCW76hmNj2mruWmeI7ut5dqwjYtUzBXGMJb4Libixct6Hu8VSqLy2RMU1OUF +qQwn8YOS04VyIP+tGenQvx0BDzk3zfYy6e8LDPegyE9sizqSBPL1hOVueLbhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042165; 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=5N+w+g0Bjr09uD00nBKiyH1zFh1Ft8OteUsSjTPO/1s=; b=U2fREX0NBYDem/T32FmuFAW99sRNGWO+GGjrNeSuc4WGhVYKzhzzsN0X7MREPjubRWcBRh UaSy5pJQipFNLc70HjQq3fiUm9GWwKGl78/ebUJfbNibPqWgvg3HRM9O0LSWhLu3HF1R6q +9kh68HRnBlLIIA4k/nHe4AhwW2oj2eiYUutNKswkJX75NZ24QZl7sXj7i42GO9k8NjaND SGxDSQ9x4NC/Fq3JKvYYU1zP9JX8Z5/aZwIBOzyDoN8+rXA2+VMSpQg73OkGF6Hwy6ppFd HfTqlbs6AZvtk4BU8yGjbwqBDGzNQJQ7YwfcQTJYZtAej1Xym0b/hgtm8EAa9g== 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 4hxqfY2rlsz18Fm for ; Sat, 03 Oct 2026 15:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41e7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 15:42:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: a68ba2d2ce55 - main - __FreeBSD_version: Bump for mkimg -f vmdks 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: a68ba2d2ce55f7c76174239c1f678379caec5348 Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 15:42:45 +0000 Message-Id: <6ac12275.41e7d.41269c9a@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a68ba2d2ce55f7c76174239c1f678379caec5348 commit a68ba2d2ce55f7c76174239c1f678379caec5348 Author: Colin Percival AuthorDate: 2026-09-29 19:44:41 +0000 Commit: Colin Percival CommitDate: 2026-10-03 15:42:20 +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 --- Makefile.inc1 | 7 ++++--- sys/sys/param.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b457a46febfe..1c2ea853dc91 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2660,11 +2660,12 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf .endif .endif -# 1300102: VHDX support -.if ${BOOTSTRAPPING} < 1201520 || \ - (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) || \ +# 1600027: vmdks support +.if ${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 5b14612a228a..73efc74c8307 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 1600026 +#define __FreeBSD_version 1600027 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,