From nobody Mon Jan 26 17:27:22 2026 X-Original-To: dev-commits-src-branches@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 4f0Fpf4Ft8z6PKZn for ; Mon, 26 Jan 2026 17:27:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0Fpf1VDfz3Qwb for ; Mon, 26 Jan 2026 17:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769448442; 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=J4Bx8wtZ0vbdmWwPVTR1b/7Fv1M5lJrmU0Aw+acUsQU=; b=bx1NZv1GgDmHFUkJC5RuaXN57iI+HjacNhYawDooW3IjLpPHtNScVlDFunqOUb8NNgFOBs 8j4jOlCiaEhQ4DetBPkLFEQeiYphX+IardANwv7GmWw1mORib7FxkE6vFyjaw4zeTM/h1Q GLLv/K6dxYxKtRNM0wlHkiOB3Lv9DJssSqEh2t5YRs8W23WknxfN8KwdpY9jK2mAkpg9kn /5fP+0vrtxe+21q0RY/YlSusnzxUjikR5O6CtUAGYW38TEUHjX9H1Atk3RYITQ88XkYpKv 9s+xhgLpfuK4GTAKaqp4GRc3hoMBSx8NqvHu5240VBtup4ao9BFgS2XwrhSHTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769448442; 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=J4Bx8wtZ0vbdmWwPVTR1b/7Fv1M5lJrmU0Aw+acUsQU=; b=nrjpwcel8OUPHtAc0Bkf8+Nk9V+h7pI1NtrXNGqOHeDOqHopc/t6qUcDuIXyu3RcRW0bI7 q2l54Pu5VsGoWIbNWcNOCHkCo8HReOmdWiT+2nzQFPp5C1WfBkAQdKJwnmr3Uj+LM80ynu SAfrzCO5CuD25bMg+am8QoV4j+q+d3fI3j3E5OwPkYPXxol288YOOgzjxNtqbALi2mdUzy zUufgl5NSZGvwhHNQOaPYnBOSlmy67SCY8DjKihazMtlLeLwPaQg4IbiTh0dVG5L/bcYDJ LZ7TNmL29aTrIW9BlJ2jr1y71IX9P89rGXfVk91vDafzbsHK2QpQPrKCGs5wrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769448442; a=rsa-sha256; cv=none; b=mtNH5FhsYwZWKq/YeOObv1nkRR7tCoo8qkGekmhJnlqBIy+wmuITzqVp0pFIsWlgnQ9OWJ qulDmwDleyG2T+hKIa6Vwo2by5k3fBnJy0hEfulYx/RatSpNqoWL6RXOOWXQCf1dO3fMln nCPfxUexjFGC3YG812a+LVli1a/tvcS4cByltHpCNKTeYGZDV/QISjQSFDz+m7GXu+o2TU 2kEQtZ/kMRfHafc8aV4MEw3RU1dOVDyrbcWd0N6vxqY/AzYs5BFoEPiuaujGe7ofibj5y2 +UszLf16xhDPtHslhk14nYUe0kRG0qzuU1+NIdXTZiB+lt1NGFp+CrF9UiEd3A== 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 4f0Fpf12wHzVVh for ; Mon, 26 Jan 2026 17:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 428d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 17:27:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 37908be664c9 - stable/14 - mkimg(1): Sync mkimg(1) and usage() with the implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37908be664c9d07c7695f17f066c968ea7b5aaca Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 17:27:22 +0000 Message-Id: <6977a3fa.428d8.78dcf8a2@gitrepo.freebsd.org> The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=37908be664c9d07c7695f17f066c968ea7b5aaca commit 37908be664c9d07c7695f17f066c968ea7b5aaca Author: Li-Wen Hsu AuthorDate: 2026-01-23 20:55:32 +0000 Commit: Li-Wen Hsu CommitDate: 2026-01-26 17:27:14 +0000 mkimg(1): Sync mkimg(1) and usage() with the implementation Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54419 (cherry picked from commit 3aa8d5395c4223f1613f28d6f39904c2df4f92d4) --- usr.bin/mkimg/mkimg.1 | 54 ++++++++++++++++++++++++++++++++------------------- usr.bin/mkimg/mkimg.c | 3 +++ 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index ae48904eb16c..d3e6285d110f 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 25, 2025 +.Dd December 30, 2025 .Dt MKIMG 1 .Os .Sh NAME @@ -39,6 +39,7 @@ .Op Fl C Ar max_capacity .Op Fl -capacity Ar capacity .Op Fl f Ar format +.Op Fl h .Op Fl o Ar outfile .Op Fl a Ar active .Op Fl t Ar timestamp @@ -144,6 +145,10 @@ option causes any timestamps embedded in the output file to be set to the given time, specified in seconds since the epoch. .Pp The +.Fl h +option prints a usage message and exits. +.Pp +The .Fl v option increases the level of output that the .Nm @@ -301,34 +306,43 @@ may be used multiple times to specify a list of created partition entries. A specification that is a single dash indicates an unused partition entry. Otherwise, a partition specification has the following format: .Bd -literal -offset indent - ':' +[/