From nobody Tue Sep 10 15:31:24 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 4X37306Sy7z5W1yj; Tue, 10 Sep 2024 15:31:24 +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 4X37305b63z4pVy; Tue, 10 Sep 2024 15:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725982284; 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=Nw7fPd4ie0ewG1YUDzo15mHQhP0ul1Bfcay5D63PjuI=; b=uqNbJOX8HhcrfP09h3ZEP466YZW2cTVmf6ywzRPT/lldzhZ4iI+9VrGsv4ZRzfDV8Q7UrQ pJQ+oY0pAR5Q6lG03isSCQ4/Y2p+L9MoVd6Q8bqJqF/JoETGkENAWPvmJrmUe7zUuvRDh9 BYMQSH1iY7wdhOy/pQ8fA1eGv5nuStFulnt0V39U/Y5gTgvfXF+i3ETxo/WhpZyTdeiP0A nx2YJ3DP5H3Ob97RaXgQZtR8bsi6OA1gHS/mBOQquSNDuZhnoqJ+gpyW1zQasM1UHuo+Rq q+yRUwCEi8YiH34tDdOnFiKIt4Go//dVwjLqiGVw45r1OkqTodzciKkaEu7Z9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725982284; a=rsa-sha256; cv=none; b=JdjmGWVUpreeOQpsn+i6/CKKyiZti8ZpN0h/rVv3EG9Ow/Bj9DpQGGy4iPfHAEX4Pjg20p ASUla9gYAcXhQc7aiYHcZKMagdv6+yCy7nhQpyQ5p2SbgQtqOTOCImHin9zbyZe4djce06 14u+9YF0I/C3gApddsIMVOlyZ08sknHn1dmgy8Vht3pgTmsfnHt6Bgi0jJT6got/BF3Dkf w4/WsisUlac5wWv5J7gOu5rb//Pp2Mtkrr2xxX25XWAVfWvqbwgh3A4GO0w5iS1Ju39YhN zp1Rf5CS3QR50IpeJTjKIHDMZGLvIn4VzzFgVI+prbF6jDcIjYEJZpWIe2SaXQ== 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=1725982284; 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=Nw7fPd4ie0ewG1YUDzo15mHQhP0ul1Bfcay5D63PjuI=; b=wty127fpB93w22LyGaKXfq+GZnw379kPguW8hYTTwiQyaPMyDa77UG3gQFqPctwP+lS+3k RfVBqOaIhxRfo2FVFyLPpYbuC0T51ibhVijBj2cwka7Dy1N259iD+sU+RzZJSWQbGthcpO 3pKA2lmP2PXxsQu1UcYngEqkOlkGo9BN3RTvOsw7t1mdJNCEJX7mFzUubFFRAM8PSkl72d uzNhKQRXsRzIO5wl0YH1fQ1JDk2OBO7dYpHElHr/8Vw50ozHSTBkDKLTP9EBuF8oDIEET4 8r+FsndszoJqanKxYyo0Y9g0PZa7CgK1lQG9kbncgUahdwtKBcm7s5oBLPbh5w== 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 4X3730595YzsjG; Tue, 10 Sep 2024 15:31:24 +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 48AFVOMV046176; Tue, 10 Sep 2024 15:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48AFVOiw046173; Tue, 10 Sep 2024 15:31:24 GMT (envelope-from git) Date: Tue, 10 Sep 2024 15:31:24 GMT Message-Id: <202409101531.48AFVOiw046173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fd3d3240b0d7 - main - depend-cleanup.sh: Add a rule to work around abd_os.c dependency changes 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd3d3240b0d7e4fa790e3d2b6d4e055a52754f32 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd3d3240b0d7e4fa790e3d2b6d4e055a52754f32 commit fd3d3240b0d7e4fa790e3d2b6d4e055a52754f32 Author: Mark Johnston AuthorDate: 2024-09-10 15:29:39 +0000 Commit: Mark Johnston CommitDate: 2024-09-10 15:29:39 +0000 depend-cleanup.sh: Add a rule to work around abd_os.c dependency changes Fixes incremental buildworld after the latest OpenZFS import. Fixes: e2df9bb44109 ("zfs: merge openzfs/zfs@b10992582") Sponsored by: Klara, Inc. --- tools/build/depend-cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b7231422c5ed..da3dd05c6c4d 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -182,3 +182,6 @@ if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ echo "removing rescue.mk without nvme_util.o" rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi + +# 20240910 e2df9bb44109 +clean_dep cddl/lib/libzpool abd_os c