From nobody Mon Jun 22 19:00:01 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 4gkcvj5Rpzz6hqVb for ; Mon, 22 Jun 2026 19:00:01 +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 4gkcvj2wgqz3tsR for ; Mon, 22 Jun 2026 19:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782154801; 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=Evc28T0V9W1hxl7QWyigxFtiyvN8dhxcU5YAEyu1k10=; b=SSTnhrf9r5HewV/Rv0PHG2nSUIpMljFMWIibayQqo85y6CJNgkv12NVtFRntPTVZUwkhHr H7TBw9D3V51jmcbjU6skB0ftyyPNBc9BGtfttAylqGV6ckucz/jnwt+kAdLtBiO/l8pJlv S7rvLEQaZMIhjw4N/VYYVvtcMW//RB0a5MJIAYfJjfQlu4dvulJP4hUMlbFHoIqQ/VIFId LXzNxFUK1oyUof1sY9Lhhj3cYZfULpoWJ6sO+ZkiFhkFGZhHjl4f3IwHIK/PYZIepd4cZi 7uMDUcPVOEtTTMalFLbNEPlTUjfr41gjSz3+2VI2InWRZuMUCOojcdtRHhb0Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782154801; a=rsa-sha256; cv=none; b=X35Movz3VF98eSqcw9dQFUJ6WwUPpAOsP61kf5RSnoaGXSHr+c9aC2dipK5Co8hivKvyXY 0S+DPx+cvBMVgRFTQsV9W+YVxT84sqkUxQISUt7xwYU2NFdQsBoBnbWikCk0pikXuk1tnO LHEMzOx9j3WFYbU+mtHA+7g/7ltqg4Q9ymXE2WqxBInjAStexZtjfgOfG4Aky7z6knxGAZ Wxc4G1h468FbM2iFbPcYyxzaGo3x+zmWRwq5j7HIw10hRbHHdRXVMAFWQabVGgoc6mAGEC wm7bU3r0PNdXfVyTM0C7PSkO7Tx4whQZLGh/j41qOQhzpuldKWccx0PieaQaMQ== 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=1782154801; 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=Evc28T0V9W1hxl7QWyigxFtiyvN8dhxcU5YAEyu1k10=; b=ElBFBVndf8M7RHEjOZmwW4WlCVAh4iLBpRbUcXjrVzUz/+pQWGrpoXufUUVKIn8kf4ziIC wVOeN1/Ps3rZn2irgs22KMOHLbvSkqzCSPii2afURuPnwkoajU05Ag6Tv2LBRTizAfpRoV HXCe33YacTA1ma6jRIoz6E/v2+0kFHFdmOKOD4OHECOmQhbpeq+MqGDiHa7pKQPycj0aaE QVcH7du5wbTNeUUZowjJpvQP+AbEubxg79dhRDwmBb+4ColNYzr2KmLB0fgPVDJgiieOIl tBf3DhmSsahIbGUWXM4t5kgJTrzHVrQwON9AuINNwsHXkLxcU2YAfQ9h8pm2Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkcvj0xqyz10d0 for ; Mon, 22 Jun 2026 19:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33cf6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 19:00:01 +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: 53a3d4760eb9 - main - etcupdate: Warn if the tree hasn't been built 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: 53a3d4760eb90c89bf04636c957511882d7f347d Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 19:00:01 +0000 Message-Id: <6a398631.33cf6.d2f31ea@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=53a3d4760eb90c89bf04636c957511882d7f347d commit 53a3d4760eb90c89bf04636c957511882d7f347d Author: Dag-Erling Smørgrav AuthorDate: 2026-06-22 18:59:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-22 18:59:41 +0000 etcupdate: Warn if the tree hasn't been built Warn the user before trying `make installetc` if etcupdate was invoked without -b (or with -B) and it appears that `make buildetc` hasn't already been run (which usually happens as part of `make buildworld`). MFC after: 1 week Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D57504 --- usr.sbin/etcupdate/etcupdate.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 404ad434da00..4743e81a1562 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -200,6 +200,7 @@ build_tree() log "Building tree at $1 with $make" + exec 4>&2 exec >&3 2>&1 mkdir -p $1/usr/obj @@ -216,7 +217,16 @@ build_tree() else ( cd $SRCDIR || exit 1 - if ! [ -n "$nobuild" ]; then + if [ -n "$nobuild" ]; then + # Check for prior build + objdir=$($make -V .OBJDIR) + if ! [ -f "${objdir}/${BUILD_SENTINEL}" ]; then + cat <&4 +Build sentinel not found in object directory, did you forget to make +buildworld or pass -b to etcupdate? +EOF + fi + else export MAKEOBJDIRPREFIX=$destdir/usr/obj if [ -n "$($make -V.ALLTARGETS:Mbuildetc)" ]; then $make buildetc || exit 1 @@ -1900,6 +1910,9 @@ EDITOR=${EDITOR:-/usr/bin/vi} # Files that need to be updated before installworld. PREWORLD_FILES="etc/master.passwd etc/group" +# A file we know the build produces in the object directory. +BUILD_SENTINEL=etc/termcap/termcap.small + # Handle command-specific argument processing such as complaining # about unsupported options. Since the configuration file is always # included, do not complain about extra command line arguments that