From nobody Fri Jun 5 15:53: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 4gX5ZS6YMxz6g3y1 for ; Fri, 05 Jun 2026 15:53: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gX5ZS2zLVz3w1T for ; Fri, 05 Jun 2026 15:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780674816; 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=Wlk8syqaMnNRzXyzdufoaVLN2Rzbw4MDR9v5cv5/IzQ=; b=oKRQoG0551JORIh9v4f5jR7iZMwd6nAHhqckFR3Ejz/RSHfV1c7pbHD6Ur8xZJlx4fY+P2 E+XDEzgkSXjlmYjphCkTl8jS5B5FL8IhMbzjJunHtj+06PWO4d/8zjAvG+nv8tsAN9rbQM tHjjw+dy1/eOH7m3i9sq8/+j/VaW44bQvhh1vLvBoxvR6jhJ+9zybMzANKWoVadg8wzaSk SomR+brA00hgS2jKhZ9lFoLC8zvT3wuGNutU4D8dvMEALq/Y48rxFeW4tJGjXbRJkR3n16 Qr7ZF1zOpgi8zcVZLha2r1TLQxAjVqTIV+sly8pCje5GLezeljHe8qhY3ePNfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780674816; a=rsa-sha256; cv=none; b=IBkCHgJ02pQfqxNk1FtltfSDSRJTOlx54WB8w5QOy2z1mSdfMGTcpttCUNwawznWsIKvdy NbWvQc5kUNR1Ys7+FItbeAMJU5+9rOHriIIw6TYxadA355W5CU2m3ISWlY+x7/jgHXsnXR DpbH9tRWmswjuFi+fkNeZ4qHWBkCrgwEs/yntTRMzvWtmzng6gW8ax/tVpa/9I4k4KQ0TC uIBeh86iDUCDhDUCnWkl1EoJnil7c/L/T0JkelHOTli2GaQBLENPMHrJtCvVhRDpRluI2m fcHOODz9KMDJGf4Fn6LjBeHmpn4jpgUpikHQ18RelH1Fkh/VipRjHXAjnx662A== 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=1780674816; 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=Wlk8syqaMnNRzXyzdufoaVLN2Rzbw4MDR9v5cv5/IzQ=; b=pKlU6/0/fgdsHMiih5AiRnzU/efWI+8mMXD2O3cHaYe0/Gsr5TzgpN2McaqoqQp3SP3PcY AwbGd6B1XvOj+HyJIzQ0o31lvj+L9bhpZbih2rJgFfd0mcV42c4lSylk7czX4MeSTcX3WK fSAJHh0kbR0O+Af+PCNLf63+fZUg2Uvfnyr1LiRcct34uStpDBkNW2weB5li0HNIXUfxO9 r/eQfZaxpULHVG8PoifMm/zrCRoe1kzsTNGMKvevK5mTiW65p6arSubKLClisuGpSM3O3D ZOJ1yrS3dr2mScHOnRZKTaA+yLHv9QUo1+nPdYT9E5ZMZitW7ZQYXSN0naJlNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gX5ZS20m8zcZw for ; Fri, 05 Jun 2026 15:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42af1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 15:53:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ddf6fad0295a - main - etcupdate: Make nobuild the default 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddf6fad0295aa92af5eed2a4b2fa0bd02f47d94d Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 15:53:36 +0000 Message-Id: <6a22f100.42af1.51deb269@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ddf6fad0295aa92af5eed2a4b2fa0bd02f47d94d commit ddf6fad0295aa92af5eed2a4b2fa0bd02f47d94d Author: Dag-Erling Smørgrav AuthorDate: 2026-06-05 15:53:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-05 15:53:25 +0000 etcupdate: Make nobuild the default The common case for etcupdate is to run it after building and installing the world, in which case we already have an object directory to draw on. Add a -b option to turn nobuild off (opposite of -B), and turn nobuild on by default. MFC after: 1 week Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D57306 --- usr.sbin/etcupdate/etcupdate.8 | 30 +++++++++++++++++------------- usr.sbin/etcupdate/etcupdate.sh | 7 +++++-- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8 index 6216722fc81f..9c070dae4ecb 100644 --- a/usr.sbin/etcupdate/etcupdate.8 +++ b/usr.sbin/etcupdate/etcupdate.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 30, 2026 +.Dd May 27, 2026 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -31,7 +31,8 @@ .Nd "manage updates to system files not updated by installworld" .Sh SYNOPSIS .Nm -.Op Fl npBFN +.Op Fl npFN +.Op Fl B | Fl b .Op Fl d Ar workdir .Op Fl r | Fl s Ar source | Fl t Ar tarball .Op Fl A Ar patterns @@ -42,7 +43,8 @@ .Op Fl m Ar make .Nm .Cm build -.Op Fl BN +.Op Fl N +.Op Fl B | Fl b .Op Fl d Ar workdir .Op Fl s Ar source .Op Fl L Ar logfile @@ -58,7 +60,8 @@ .Op Fl L Ar logfile .Nm .Cm extract -.Op Fl BN +.Op Fl N +.Op Fl B | Fl b .Op Fl d Ar workdir .Op Fl s Ar source | Fl t Ar tarball .Op Fl D Ar destdir @@ -388,15 +391,16 @@ variable or the option will not be installed. .It Fl B Do not build generated files in a private object tree. -Instead, -reuse the generated files from a previously built object tree that matches -the source tree. -This can be useful to avoid gratuitous conflicts in -.Xr sendmail 8 -configuration -files when bootstrapping. -It can also be useful for building a tarball that matches a specific -world build. +Instead, reuse the generated files from a previously built object tree +that matches the source tree. +This is the default. +.It Fl b +Build generated files in a private object tree before trying to +compare anything. +This is necessary in the uncommon case where +.Nm +is not run after a +.Cm buildworld . .It Fl D Ar destdir Specify an alternate destination directory as the target of a merge. This is analogous to the diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 77fd400a624b..404ad434da00 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -1780,12 +1780,15 @@ rerun= always= dryrun= ignore= -nobuild= +nobuild=YES preworld= noroot= difflistonly= -while getopts "d:lm:nprs:t:A:BD:FI:L:M:N" option; do +while getopts "bd:lm:nprs:t:A:BD:FI:L:M:N" option; do case "$option" in + b) + nobuild= + ;; d) WORKDIR=$OPTARG ;;