From nobody Fri Jan 23 20:57: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 4dyVd10whdz6PllX for ; Fri, 23 Jan 2026 20:57:57 +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 4dyVd03mjyz3gGk for ; Fri, 23 Jan 2026 20:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769201876; 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=tNt588Pq3ctuA+exaTHjihLnA1i1z8DC/7sqAVxQ2Fs=; b=AVOEHqT+gDZdtxAojJVECGNpFWlJ6xjBp5iMfF7gx1eoTS/v+sKPQkL8ts3fj8NMksZbAt B6eE6YjlKNDOJ2LuhRvkC7n5w2AIuaFAHUa6YMnqZKv4RmtvMal6RIwo4atiW50FVoEgJR cTPlLwC0qgLHhi+bNCp8/yKuu6fMyg0nKTuLRSPxosLlNR/VC6LkSLGPmUSD0tSsSYrUaR jkzCCxqjegbqFsTzQ2VR5BEsRbIFNUizdc7uuGWLTIVHKKa37qs+JAP7wLCOCYtVE3nado zvWbWLnCvMzitnHW4T7olMDG0l5vFtOqF8WUiE83UVFvw1hOnK/xkqzXY1IZRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769201876; 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=tNt588Pq3ctuA+exaTHjihLnA1i1z8DC/7sqAVxQ2Fs=; b=mWoWUEiskNidqysLmAV+IeNYAVpo42gRei3CtjAhpwtaIFG+AX/J0cO9F8+DtJANuqGgU1 /ZDC+iSVSiJeFOqdF348uh+qFpbzhUVuqotd74IEpKJC6618VEzZUi9f6qoviYj+PHFp3Q t77GSzEcazj+7a01W9G8Nx8WxLYuWX/fscI5DEhq959oHzs6kwbqO6uTx3SHy/1qX4rGyy NMkGBQpev+/BDWoQgoXEV5vxsWhXPOoq41VXB37CFxvtxq/ap6RrG38yd5MIPQ8zpb2Ve5 aVQLxz3RCBODe28h8GDT+Oz5vbBxvnKnqTGpA7er4JVd1KDBJgzvFMLdKtIYMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769201876; a=rsa-sha256; cv=none; b=HTLzjcFC9lXDTyeUTTyBLn90EQ72sLIYli0VtgkhdQno82SOBPLWrk4sF2tiOGz+vMH6pv 6m262U+8pDCKA88+R4f1Bem3RxU2WNLzJ4P1T38EclxtLWvd3/F7AWFmHV6cQUQcv+PHky +arGgevcmILwEstrSJeE2McvN5KHzkFZ6TBjZJ/t4oZX58kyFnyr8Qb6rcak7wrg1Fn2mK 4kXtlhiTclyBYCGCZaiFPUtq4gp1rzbsw8N8PESPci8hSzH67vfgwrMXBFRA78rk/HHdq+ 76YWWrlrq9DksdnxZvG2ggxcIvL3sqW/qlFsqqrtCiD6MHK2anRUNJWTSV9S5Q== 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 4dyVcq5m6rzbZs for ; Fri, 23 Jan 2026 20:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24be9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 20:57:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 3aa8d5395c42 - main - mkimg(1): Sync mkimg(1) and usage() with the implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 3aa8d5395c4223f1613f28d6f39904c2df4f92d4 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 20:57:42 +0000 Message-Id: <6973e0c6.24be9.2295dea@gitrepo.freebsd.org> The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa8d5395c4223f1613f28d6f39904c2df4f92d4 commit 3aa8d5395c4223f1613f28d6f39904c2df4f92d4 Author: Li-Wen Hsu AuthorDate: 2026-01-23 20:55:32 +0000 Commit: Li-Wen Hsu CommitDate: 2026-01-23 20:55:32 +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 --- 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 - ':' +[/