From nobody Mon Dec 09 16:25:02 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 4Y6RzL1dByz5gV1w; Mon, 09 Dec 2024 16:25:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6RzL10Brz4VtZ; Mon, 9 Dec 2024 16:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761502; 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=vOktDMzuAXZO5ELoTq6HrSPoLMBZ7hDDgtAvWJ8BmPI=; b=W0ADkNKl9dfmsuv9I75jwOusTkKfkTkufAOWwK9mFai/MyhlzT3hnf5U/5jg77+PwCozl6 kzY0ttssUGVw7Ihk8gD0kNYRUJLWhU7Qon3DlF7McYDwUxSJr+rqdpGbuWm8tfraJBAcgN HM0PrXPQZh/4ltoUQQSMk2OoO+N25r4Oy34+pEL2kIw5yZmYnkRAM/GG2UwMAcDMYoEhfu Rtztuhm6kizJMBI0YQyi4A74t/zP9CMZnNwx5k+nUSK7/i9EKSOH+RbgK0R4YSVcn98ACt N5Ruyl5JS5se31zKiY7wcvoFoEDDNqpVG6dLjn+UAdXTM87l0jsyni8cDfpr+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761502; 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=vOktDMzuAXZO5ELoTq6HrSPoLMBZ7hDDgtAvWJ8BmPI=; b=VOUpm2CvVN7jjWEEydNjZGnW2U/i9e71TNVet+rzKPu0SoaGXUVFk+TIbLORfdOjnaozwx SAlHDST4g0CX2V2qfybXc/ZuS9gSTasq2S7LuwGEe96zZ4hmDenbwIAYhnYDTUaQKSUwx0 1EHiQjdVSk4K1UhBh6ecghCU0F398RbVnFJ0B7/vmiUeJdxAdLJ+3TrVmkNVSVp75ZU5T6 X+2avXDJ2aDgOTnNNaDDg2sZ3O7oTJVfH/QC2nUIpM2NXGXFf/x00cARto2N8ABF6QxAAw rufkSG+Py5LLtVJlOny8Q6ZI3xhUIcQxcI08cqtsVmwOcUPG8VFmYCarKo+1wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761502; a=rsa-sha256; cv=none; b=pHPkgW9P4PB+dh09jVYzpKjEVVPb4xuJFyx3I/J1+b7rgxawYAY/6AJjh8QaNzp7Klrj6t TtbLnRr0oswGQzsTaaKYgMOUbJSVw4KvWzVPLIljktKs7gVQOQv4cCBOqslVScMzea+KRM T1VNF08rP1HGduudOC6q79fL8kYwR88gLGKcSakMy9v5HZ9xf1awtYCcG+NCrclvBSq25c 48Fsftm8SM0d8fBerg7PjbtyeonKbaKS1tYFKYgZDHxW+O71RbCPJ4+M4daBjM4PxF1IYK 3OPwvyAITf9KjifiXgB/5u+8tSOU2nwID6n/RkbiWC/SORv6hRaQM1XPDP25lg== 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 4Y6RzL0cBNzlnV; Mon, 9 Dec 2024 16:25:02 +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 4B9GP2vR037216; Mon, 9 Dec 2024 16:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GP2wF037211; Mon, 9 Dec 2024 16:25:02 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:25:02 GMT Message-Id: <202412091625.4B9GP2wF037211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: be778581eb31 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: be778581eb3168bcd8f9d8034e5175873efba416 Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=be778581eb3168bcd8f9d8034e5175873efba416 commit be778581eb3168bcd8f9d8034e5175873efba416 Author: Jessica Clarke AuthorDate: 2024-09-10 16:33:06 +0000 Commit: Jessica Clarke CommitDate: 2024-12-09 16:24:25 +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 (cherry picked from commit e546c3950a2c98b298b8ddfb68b50cb496fe7fac) --- 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 aad4f6b9218f..7441cd1d7d81 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -162,7 +162,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