From nobody Wed Aug 5 15:55:59 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 4hFZl40kqGz6nTNt for ; Wed, 05 Aug 2026 15:56:00 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFZl35ZbLz3Hjn for ; Wed, 05 Aug 2026 15:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785945359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cf/pHW4RAzhnZpaK+bGpBjK0EXSUE+7aCCucVBvvibA=; b=ElOjoi7h9+UrHD7ZEokefKweDFsvDrK7hBwhjBmFWCPOOSF7mAg4CGr3phP1ywnlbrhzLb nAjhIzAmECq67XwvKFjI0NV7JEo5nt0JILykNUUSesc9AECQN45GmU4v0X18n9VWhpj98u uTIVKczql46aT7H0yXi0Gl5/PQ6duF79vpj3OMF07JPn5O3knvgHghuhTwOEx9/II6Ds4J jG0b+QHGP8mpqyoTp4ibUB7Eea2Dn8n5u9l3Te5wHfe3vuwvs0UYugov+TtVQg1VlB3inK DalgIR/EF5C3V526Erq4xnr3gxOPz3y7R5llybQKdOxW5ye+llHcd7mLD/nf5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785945359; a=rsa-sha256; cv=none; b=VBk+0LWoPEmmViR4F+ewFeG3t2wycX3eCxwCp57QSjcMhSG7djwzxmCagMQAqJ3fWtT2Og 5FWRyQ4RECk7xkgLsiG6Np7xOeCBteu/dRhFDZAee1oVoNZHbZXc8j9rZ64BQUvtYAIPo8 G3vBPOQD2I3h0ElJsladBOYXMh9oVT2UbmtuxI4sECne3KX0UJScmbn2sIYMASi76QVKJJ YoGO2nPCzfvT512vV1wdMeBi4IT+9wEi9ZhagVU3vnCL5zI3An5sAPQz9BgCxY+gGqGIig 2GwXTilORAqPvNRxauaEg927r+LBFrUEesk7W8dacZQZjPLkUudf15Gj5waoQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785945359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cf/pHW4RAzhnZpaK+bGpBjK0EXSUE+7aCCucVBvvibA=; b=cmjAnzovvTQGfLlFmvmNMi3hZj6KX4g1akTMdUYheJhSevL3n6gOHjcrtUUA3OFlRqFSWp cGfr/d9qLBAWlPG/mosgz++M9I5ugCXpK4vSvS3rf/ocB4qt79EA+q9aROlvkMTS9OFSpk ldi7ZOr6YIs+MK8PfgCfNlLla9e7iO2k9Z2Wa54g1QBl6znINjj026/WiABlg8EgLTfAS7 lXvljdMCgLC4wYigLO8HLBr5ic1r/9Qp6b6QIZXZzLq22M36JWkupsL+MzRhLpbHkajwu8 30NhXR1nTJMjZ7g1SVb+pa8yPH0h6mhcwlVnmaoM7xNfyO32g08MNyaW3fa2AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFZl346zxzhDM for ; Wed, 05 Aug 2026 15:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18252 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:55:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wolfram Schneider From: Alexander Ziaee Subject: git: 565061836e1d - stable/15 - ctfmerge.1: Import ENVIRONMENT from NetBSD 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 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 565061836e1dabb7c115ea4026307097ca41c7f0 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:55:59 +0000 Message-Id: <6a735d0f.18252.2cf052e3@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=565061836e1dabb7c115ea4026307097ca41c7f0 commit 565061836e1dabb7c115ea4026307097ca41c7f0 Author: Wolfram Schneider AuthorDate: 2026-06-30 13:20:41 +0000 Commit: Alexander Ziaee CommitDate: 2026-08-05 15:54:24 +0000 ctfmerge.1: Import ENVIRONMENT from NetBSD Import the ENVIRONMENT section from NetBSD, minus the variable that our ctfmerge does not have. Alphabetize them, polish grammar and alignment, and add the variables to the man database. While here, remove whitespace from the end of some lines to quiet linter. MFC after: 3 days PR: 291186 Co-authored-by: Alexander Ziaee Obtained from: NetBSD (christos , 8a0c0d8) Differential Revision: https://reviews.freebsd.org/D54054 (cherry picked from commit 32cf24b725fdf899fb642c47004b69fcfae9b9db) --- cddl/usr.bin/ctfmerge/ctfmerge.1 | 74 ++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1 index 2bc70db82dc9..1e371e62c9c5 100644 --- a/cddl/usr.bin/ctfmerge/ctfmerge.1 +++ b/cddl/usr.bin/ctfmerge/ctfmerge.1 @@ -1,32 +1,32 @@ .\" -.\" Copyright (c) 2010 The FreeBSD Foundation -.\" All rights reserved. -.\" +.\" Copyright (c) 2010 The FreeBSD Foundation +.\" All rights reserved. +.\" .\" This software was developed by Rui Paulo under sponsorship from the -.\" FreeBSD Foundation. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.Dd April 21, 2022 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (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 30, 2026 .Dt CTFMERGE 1 .Os .Sh NAME @@ -104,6 +104,28 @@ Copy CTF data from into .Ar destfile . .El +.Sh ENVIRONMENT +The following environment variables are used by +.Nm : +.Bl -tag -width "CTFMERGE_TERMINATE_NO_UNLINK" +.It Ev CTFMERGE_DEBUG_LEVEL +Increase debugging verbosity +.Pq maximum 3 . +.It Ev CTFMERGE_INPUT_THROTTLE +Max queue size to queue +.Pq default 10 . +.It Ev CTFMERGE_PHASE1_BATCH_SIZE +Number of files in a slot that are needed before processing starts +.Pq default 8 . +.It Ev CTFMERGE_MAX_SLOTS +Number of round-robin slots in the input queue that is processed by +worker threads. +Each slot represents a file batch +.Pq default 5 . +.It Ev CTFMERGE_TERMINATE_NO_UNLINK +Do not remove temporary files on exit, +so that they can be examined for debugging. +.El .Sh EXIT STATUS .Ex -std .Sh SEE ALSO