From nobody Mon Dec 09 16:25:00 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 4Y6RzK1jQWz5gVJV; Mon, 09 Dec 2024 16:25: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6RzK0tKVz4VpQ; Mon, 9 Dec 2024 16:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761501; 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=nwLJGnw500U/7pshiupsdv02j9FSB2HPyNH5yoDL5dE=; b=HkuAgP6AHulC+ZsuodKrOlOYYLnLZGIAnNILfib+AghyKoQ/jFrjyDhngxlHIT8hT3Puhv DbYeQRavOGeYYnzUkB1osPImflnpng0LOl4o1ONfNrONo/0aFUgQIowCXEMbMQKwCp5v/m RfYqq1xiJCCuDTWQQc5z8zza8WUuXT3GhUYXQIh+aAVW3SKaPg6uAKX6LrZ8TZTko8WFiB PGW4KJQxWEumGUoVD2xDPe4oNVCKUepuFMWvtzfj9eW4O+wFe0V7VCQItcylUot1rqoKKQ /aM+ZhGAVc+mFCX1/UNU+8rSiUtmCljN3JurZHCWRfhvMMDdwbNxo0c+h5jZMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761501; 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=nwLJGnw500U/7pshiupsdv02j9FSB2HPyNH5yoDL5dE=; b=LwVB3uhOUTzIPiW0voKeA1wW3Qb6vhCX6iQEe/ttQjAcZRKJJRbk7J/42y+9VMoJHbWSsT yD3GEk7hXph23KA1v453pxLu0SuYVNyzFuJ8u6oh8MXW7BC8D0uzcSQ5toSQwPU9do+dnU +4Vyb6IsK2Fw43rH9lmFgIZd/+9VZ/kEVeLC+5zJ6iO12i9mig9jqcuhciFq/DEn2KuNhj quMGBi6C3O2itG77Nnh2mQJrkqmrjZir+rFY7gYwt3FkFyLkHUnh9bkQ9m2sw2SoIAmNh+ d+A3/LyysXsgLJmYirkbVc3cpY5Uko+aRDPLB5ap2tWrd0WgV1X84ZutjmIdKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761501; a=rsa-sha256; cv=none; b=KdDz/fnnMFHTfvmfuUuXXYzxrFBkSW4muNF/xMZJRud5Nr8bk4IeYLofdzdSUjLcqvqu49 6dJbUtAjLdolzxuaKLD4tv9RPqIEp1Tqa1s9LamQwpgG0yDoSKEjFR4j8Ckmvoj82p/CZb 4h/JWmGOJu/ALq61P5lvTR7cJMDZAb2rv8A6rMsPL4Jm6LLRDStyPaXwSpSwapJwrn4J1A tOY4FiJZP/8gXuco76EG6WTE3O+u2E2pWnnC0lEZTaMm4y0blr7kHEJLeNJiokH/gCnWKf KSClf/UkwflwXl8CiCl5hbOMoEUc4N23TnvDJ1Nazu1GKIW82PQPrPSWsyDPiQ== 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 4Y6RzK0Ls5zlbr; Mon, 9 Dec 2024 16:25:01 +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 4B9GP04J037157; Mon, 9 Dec 2024 16:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GP02K037154; Mon, 9 Dec 2024 16:25:00 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:25:00 GMT Message-Id: <202412091625.4B9GP02K037154@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: 9266d812eaf4 - stable/14 - depend-cleanup.sh: Fix pretend (-n) mode 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: 9266d812eaf4d810eeb482b07fbe320d405e7361 Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9266d812eaf4d810eeb482b07fbe320d405e7361 commit 9266d812eaf4d810eeb482b07fbe320d405e7361 Author: Jessica Clarke AuthorDate: 2024-09-10 16:14:37 +0000 Commit: Jessica Clarke CommitDate: 2024-12-09 16:24:25 +0000 depend-cleanup.sh: Fix pretend (-n) mode Fixes: 26a09db3add3 ("Fix incremental build with WITH_NVME newly enabled") MFC after: 1 week (cherry picked from commit 7ce171bd4220b2e8946556bb806c787b51324993) --- 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 6da37606300c..aad4f6b9218f 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -164,7 +164,7 @@ fi if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then echo "removing rescue.mk without nvme_util.o" - rm -f "$OBJTOP"/rescue/rescue/rescue.mk + run rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi # 20241018 5deeebd8c6ca Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6