From nobody Tue Sep 10 16:36:31 2024 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 4X38V72Zdfz5W8h8; Tue, 10 Sep 2024 16:36:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X38V723jHz42TY; Tue, 10 Sep 2024 16:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725986191; 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=FdFre3kBH4n5UI0JlV84dKqvwlouQSfo+6ClOfpmfIg=; b=hfDHxIy8VjgF/sSvm82NCxT6lu081G4NH8R22fuJdWV60MmehSb+xxomE51VAvcHPUbv6k uhja3PZjPpuIymg/O50JqqiLvnAAxR2nCuOLx49U3XPAleEHDifXSN4rCb63nuHBxCasAD ZSda5TeKy8NC/UGbX5PuEE2ZYBwhg1poKhIJQfmPeG8eKjRlbW1L6r152tVI0j9J0nnv+9 QCU/NLzp9YKCFCZJiL0lUd0Jy9BzBqUZUgtKJzhBXdYl2qutCqdfCAQjfVEGYEfmOWv8pR vFn+qczbkiViNoD+iNG71wEZ+SP1IyzIIUO00A/MTw/4r4ddXOBSZ7iv2JVlSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725986191; a=rsa-sha256; cv=none; b=QrcbFb+DCnGWk3OEot8YDc2CpfVGd4P7VDVBsEHYyaD82k+Ptal4Y4dri3jMEZ+9d6rQp2 Kvcu9utJRQKd1a+DcVupV7IJguSxtmGmJkLnyfecgKchrMRE4Auf/j+uOb4X/Qp55yW1Iq fT/R94J8PT+agKC4nZUboB8125fN2NVerMmQka35XNv3uvRdvLwoiC6EBiw5eLddkBMre9 z8TKK/kCsai9rF1QURR/+5SgI/cO6rJ0DAN52fVYu9qsYGMPjDQqlPAsa/9a0B3ft/H9KK cgUfp2palHv2OS6T3tTcE/XNnyb4H+A9/Gb2npfMEITNEbY7AAmttAPS/FxoTA== 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=1725986191; 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=FdFre3kBH4n5UI0JlV84dKqvwlouQSfo+6ClOfpmfIg=; b=rK4mgmKAaN7G/wdsprE530wC3sE5YJjKSRs3ZGnyum7mHHCUBu633n+U/XsJFYi4LNwyBI RZPVqx373oPAkurUSpFzrcNCRt1E/NOYrlIaqVUwYb8g4KVjRzxVnBOiH4z7+WkH84Hht1 dLgztDMV8dCo/bAqWlXFh5WpQ+EVojudJ2SDFDSozUkHz93iTnVJQ2osAHITJWEMCh7gal eHW9kEb8ARavwZp1QZ78j7lzhPNq2phPJnWj07ic4uK1HJEIoqvpl+6jCW/hNRdIXxz0O0 qnnxqlVbCW10K+RmURnvvYrb1JDpotyaodnKKrCAceg6YPF1mj5MTlLhTeiLuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X38V71gNnzvJ1; Tue, 10 Sep 2024 16:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48AGaVHY050678; Tue, 10 Sep 2024 16:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48AGaVN4050675; Tue, 10 Sep 2024 16:36:31 GMT (envelope-from git) Date: Tue, 10 Sep 2024 16:36:31 GMT Message-Id: <202409101636.48AGaVN4050675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: e546c3950a2c - main - depend-cleanup.sh: Fix overzealous rescue.mk cleanup 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e546c3950a2c98b298b8ddfb68b50cb496fe7fac Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e546c3950a2c98b298b8ddfb68b50cb496fe7fac commit e546c3950a2c98b298b8ddfb68b50cb496fe7fac Author: Jessica Clarke AuthorDate: 2024-09-10 16:33:06 +0000 Commit: Jessica Clarke CommitDate: 2024-09-10 16:33:06 +0000 depend-cleanup.sh: Fix overzealous rescue.mk cleanup grep -q -v means "are there any lines that don't match", not "are there no lines that match", and since the file has lines other than ones with nvme_util.o when up-to-date this triggers on every build. Fixes: 26a09db3add3 ("Fix incremental build with WITH_NVME newly enabled") MFC after: 1 week --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 2ae5a8c77448..828586e9d231 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -178,7 +178,7 @@ fi # 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ - grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then + ! grep -q 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then echo "removing rescue.mk without nvme_util.o" run rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi