From nobody Tue Sep 10 17:55:03 2024 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 4X3BDm3hlhz5WK5k; Tue, 10 Sep 2024 17:55:04 +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 4X3BDm1mCfz4FHj; Tue, 10 Sep 2024 17:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725990904; 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=E+hOvpmUDg3ZpGxUthih2hod5IDsdx7H2i2WedSs3bQ=; b=JBDQPythmL/DYkW1s+1ocQjvvUcsg3BZa5x8b66eINQ3xIks18dTYlBxbH9qudSe2cCa/X EaTdQBfs/isP6dqKETZo5HaXhFuD8tsTfI/HXi2YpRMAINpLUYgZ4MYXXOIwDpKOtEcRsn 5lZ3FW1O76pckZ6d3qGV4Uxg0ToCqgU9PX/5GqK1Xu1gnCQnOp6Zw6I91wWPpmY/bxrzub uIavR6X3L3yG2JHY+OV7GuYimbHYnFnJfRTlE8eZpMdLjpS8DnBfUVa6+hAh8VEY8Z21FR K4zumvrHhN8fu8NRmVMVLTk3Zk3XPvtgptW1BCCN7GhJhcIWweU4Ku6WlrJdBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725990904; a=rsa-sha256; cv=none; b=PXDlma02bUeUMZVl9S8mHFmNW+emr4ywLk6rxioTeWgxbNY1J4FO/4AkGfqPjocwk/9nk3 2126OxRbf4Ykuiz7LBItkJ/L4OdrlRpm1IoHSOFiagwfkwwOyDkxDx4PRgqhIGkHl2+U0x bOQq5C2+znFWbNFTqhCBHBQfMtdvOvXMSKI/N4QfUGIOQvfCBsH4FH86F/myvhguTmMZH8 XhsLwgyWa4O1NIcYy1ugiX9vDQG8deY16VXOFt3IRMOGaz8etjuOux0b1MaXFSQiK+CT79 jp3u30OXXlARWuAcpD2e9N97hBH4j+Fu2jAzQGtOoyzVEJF8e6hfGuV+j1A+Xg== 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=1725990904; 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=E+hOvpmUDg3ZpGxUthih2hod5IDsdx7H2i2WedSs3bQ=; b=c1YcAGUg8+DrGoGmWLgSL/Nva/xgopPw1yvDg8K74dBPtN8lcIJKSrHHnjVMsftgHrst61 aQmpYh2ov5wGaV2Rc7WUvC27GrVpY24Ws87xffAUzz3n4ZltyRjz/vPD0W656wxTt3Izd0 YIhhHzJ5UtFopRoUYuet+3W3LulWTjlw0yz1OT4jYb46cIl0b29X7Vq/QpzEif2zYuWuPn n4uz5HQQOAeXm3iGUO3tALh5I1Pw39rb/10TSccSjYHpPLFV7MHRm8l6N9fOdae6bhAiVJ AtvTVmjA7BcAMy8eaMAVtRHWs3bkvsNET6O2iTGMf8YSmgZict5QHtqCfUUi9Q== 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 4X3BDm0FcBzxDV; Tue, 10 Sep 2024 17:55:04 +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 48AHt3TZ086425; Tue, 10 Sep 2024 17:55:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48AHt38m086422; Tue, 10 Sep 2024 17:55:03 GMT (envelope-from git) Date: Tue, 10 Sep 2024 17:55:03 GMT Message-Id: <202409101755.48AHt38m086422@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: 0980d0a0376f - main - depend-cleanup.sh: Fix overzealous abd_os.c cleanup 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 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: 0980d0a0376fc73cbaeda9f0713cfb84c881bc2c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0980d0a0376fc73cbaeda9f0713cfb84c881bc2c commit 0980d0a0376fc73cbaeda9f0713cfb84c881bc2c Author: Jessica Clarke AuthorDate: 2024-09-10 17:54:45 +0000 Commit: Jessica Clarke CommitDate: 2024-09-10 17:54:45 +0000 depend-cleanup.sh: Fix overzealous abd_os.c cleanup A source file with the same name is still used to build an abd_os.o, it just comes from a different directory. Thus we need to include part of the path in the regex too. Technically zfs/abd_os\.c would suffice given it's now in sys/contrib/openzfs/lib/libzpool/abd_os.c, but this seems clearer and less likely to have future false-positives. Fixes: fd3d3240b0d7 ("depend-cleanup.sh: Add a rule to work around abd_os.c dependency changes") --- 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 cb2551fced78..b3608e46b65d 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -185,4 +185,4 @@ if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ fi # 20240910 e2df9bb44109 -clean_dep cddl/lib/libzpool abd_os c +clean_dep cddl/lib/libzpool abd_os c "linux/zfs/abd_os\.c"