From nobody Wed Oct 21 20:48:36 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 4j91b86WsPz6wV1J for ; Wed, 21 Oct 2026 20:48:36 +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 4j91b856rCz4r2R for ; Wed, 21 Oct 2026 20:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615716; 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=85PBDm9iqeOcX2Qm1DuzmfTDMGlKFuLbkCt+lR5hk78=; b=P2bDC7aA4ZukVEXsPn7kjPaIuDAGMMYQA7nGwl0C1qfP7Thpvy2A39Oe4gv/J1Q9KxQeGM q+DkrnE7D2S+UfAamRJ+edv7/d0CYyU4lMEBd8j+RQgsXpArSxHXJRvNGHptazuFiVxSQO F9Zc7OkQkwaHt0144nYXFAcrJrRFBrBAtFzJClaadzNjZmme2EJOFlh+GYWVaIbY9ACtVK kU9HTeiVrlgzFZZRkU7hXL9eallMr+ztQPz4YcC2pv81GK/RNCxj37RAIogrTHz9jGeju8 OcC2uuKHyRY9kGY6ZAj5JZC1QX1zmwlgBhviREaZmBi+4gWtT5trqhilFKzlgg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792615716; b=H4vJZDM1JRnMXPD+a+EJ/EKvoowFAzXdFkrKAnzS/DxW3Kf1WvcoZ47ULn/6SAg4ricm/z BUyXXxtRzKn/glhgIo/NkgG5059j9kqU8VecaCfQnplRFhBT1GMeXjJPqbWislBrjZ6mJy fChyO/NKV3OVTq2/mA/9F3oubmYddszkLO4Lq914yi9HAhPVxRtpfxoC/ezQuYpLmpF33B V9+RQKANAU/jfgQW7rbnV1UKbxsXwZUkTyPy0j6ZZhjsDZvUI1Hr6VcnptDW86M4B9YkEF r1MFBJ3Jw2kaCHKGbBRkD72Cfj7aaFGmu9/ODWmQGFZ+1G3H3k01UKkFQqoIDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615716; 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=85PBDm9iqeOcX2Qm1DuzmfTDMGlKFuLbkCt+lR5hk78=; b=RL50veR3fTKkce02UQlsFFOydl4gcVLs/RbzHLALQXwjq/DkKpNrxX3QOGwUQL2248Oakx N1Hj34k+EPRExSrIU1ZsVandxu45bAO8LEZATkF1efj0g7vtMTQw+r8w40lY4YDuAviRex bwPCxgPMMFG4bqxBaBBoCcdJRiNMohrg20BAWbgShknC0WQ5CcmcI6xSL6W363Fe5tjD3y G4X3djw0Cbn8gSLhTykXKYmny/d3EG+6wnVkZZTIiRdndD7g4RPX4GyDPL9rHgB1uQ60oF SreAWx6YdEUvTVTjwlihJXSZYqnrUG+J1VxyzuUnsgrKyr+sygXZ7tOrNTHNcQ== 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 4j91b84mrvz19XY for ; Wed, 21 Oct 2026 20:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f4a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Oct 2026 20:48:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 0f787e867d21 - main - __FreeBSD_version: Bump for mkimg %align feature 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: 0f787e867d217583017181d1a904933939b4c34d Auto-Submitted: auto-generated Date: Wed, 21 Oct 2026 20:48:36 +0000 Message-Id: <6ad92524.1f4a1.2288a6ce@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0f787e867d217583017181d1a904933939b4c34d commit 0f787e867d217583017181d1a904933939b4c34d Author: Colin Percival AuthorDate: 2026-10-08 00:47:49 +0000 Commit: Colin Percival CommitDate: 2026-10-21 20:40:37 +0000 __FreeBSD_version: Bump for mkimg %align feature MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60453 --- Makefile.inc1 | 5 ++--- sys/sys/param.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index fa5cfc433214..1ab53d6a3bcd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2695,9 +2695,8 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf .endif .endif -# 1600027, 1501504: vmdks support -.if ${BOOTSTRAPPING} < 1501504 || \ - (${BOOTSTRAPPING} > 1600000 && ${BOOTSTRAPPING} < 1600027) || \ +# 1600029: %align support +.if ${BOOTSTRAPPING} < 1600029 || \ ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no" _mkimg= usr.bin/mkimg ${_bt}-usr.bin/mkimg: ${_bt}-lib/libz diff --git a/sys/sys/param.h b/sys/sys/param.h index 7b953293f888..94c63c8bfdbd 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 1600028 +#define __FreeBSD_version 1600029 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,