From nobody Wed Feb 4 07:33:13 2026 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 4f5XBx2ckpz6NWX1 for ; Wed, 04 Feb 2026 07:33:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5XBx2065z3sGr for ; Wed, 04 Feb 2026 07:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770190393; 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=kilhWy7TApeu1i13DBU1hRlrfzksV79bwIHQqsn6h6g=; b=r3acUqxtA+XKlV4z9fVanDQK4MQDF0loUcqREFe0fJOfWaseOqbIjRL+/sezEyyGjJnODF wJ7FwPIAb8VGWHrAy4SN8gUWRnMJaBp71E2IEVioDRQv30kv0Zpk02OkG5d3UZAWYBYFnK aQaqzAzZzIJTe/sSusUzP3YP8WUitEKUtU2zVhzCBDCNdh2oTRkA7oWsGpZwNCI1VGaDr9 wExYIHDDyh7Rbb7apg4w4q8W+SaIs/3uBirhGjCvW372poghqH0YaHZPxnE2pk7rD/1elz my4KTNcbZGhJrpzDXxMkwyIjA+3Y99C2bfNG7TDlpM1ngCJ4u5XG0nBOr0GzLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770190393; a=rsa-sha256; cv=none; b=NswRxKH90vR1U69xhGBev2nuCvoZW4JPbuVb0+Y5dp473h+lNqR7IFysNYyfzopubPjYop o8YA+H0BCz15i9c9dRsJ2rNVIi9ow8S68rPuEvhgYiritV5Tt5//ePIOxvR/Lw6Eu+IwUK s11x0peEnQ5BqQKG9mhWW4eTOLU77YhrgqmpvWs/1Ac0S5U5A0+1qPuVjD7M9kEplKFEe/ my2QD5mqYGr3BsO5MUDKQsUuh88fPhFQ6p8Nm9Y9rA3h9kP/dyZr56WZpbTaMV0lUEc1pC 0xr+q1VwBSTAM6TkbQGufFsQt3BKXpbeTej59JU3OpP6AfNtV6cRunUABRYEZg== 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=1770190393; 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=kilhWy7TApeu1i13DBU1hRlrfzksV79bwIHQqsn6h6g=; b=DJmICA/qPhv7BrEa0OdlMnzHPiGQLZKX8I8JA0DcLxTxvZPmH0fZQPLMnUPuKFHMyOYDC6 vx1Akix7JIxXm1GXyo66uRl7e9t5R3zggSxLxTjN8s/nCB1B+ar/KRiBp6v+wxgiFCtrKO DklJDhS+MwuM7ff08i0MeVE9JhMqJq9NpYGC0zRv+bdckgrjRDs9+pvKIrmGXwN/RF6lik rVqCua7+ogtijAvMlWZYgHDslyrQClZoDK8GB9Se52Iz+qXdbZuCsYzOETNlDbC8De16yk OL8Ts/XDjHsU2FuUcUvyXwH+T2cgndAThNzfeNMyI4HfbT/L4S17CcfDY96XRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5XBx1TPfzqpq for ; Wed, 04 Feb 2026 07:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 07:33:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: b78806b156f7 - main - Remove additional libtpool and libuutil-related files 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b78806b156f78733f8d6f1e0d593845e5e55221e Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 07:33:13 +0000 Message-Id: <6982f639.375be.4e4cf45e@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=b78806b156f78733f8d6f1e0d593845e5e55221e commit b78806b156f78733f8d6f1e0d593845e5e55221e Author: Enji Cooper AuthorDate: 2026-02-04 07:28:41 +0000 Commit: Enji Cooper CommitDate: 2026-02-04 07:33:04 +0000 Remove additional libtpool and libuutil-related files This change removes additional library files and tests orphaned in the commit referenced below. MFC with: 8b78d412a Fixes: 8b78d412a ("zfs: world changes after 89f729dcc merge") --- ObsoleteFiles.inc | 11 +++++++++-- etc/mtree/BSD.tests.dist | 2 -- lib/libsysdecode/Makefile.depend | 1 - rescue/rescue/Makefile.depend | 2 -- tools/build/mk/OptionalObsoleteFiles.inc | 4 ---- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1bd4339f5cc2..a65251d0a9ee 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -89,8 +89,15 @@ OLD_FILES+=usr/bin/wait OLD_FILES+=boot/firmware/iwm8000C # 20251207: removed libuutil and libtpool -OLD_LIBS+= lib/libuutil.so.2 -OLD_LIBS+= lib/libtpool.so.2 +OLD_LIBS+=lib/libuutil.so.2 +OLD_FILES+=usr/lib/libuutil.a +OLD_FILES+=usr/lib/libuutil.so +OLD_FILES+=usr/lib/libuutil_p.a +OLD_LIBS+=lib/libtpool.so.2 +OLD_LIBS+=usr/lib/libtpool.a +OLD_LIBS+=usr/lib/libtpool.so +OLD_LIBS+=usr/lib/libtpool_p.a +OLD_FILES+=usr/tests/cddl/lib/libtpool/libtpool_test # 20251204: zpfind.9 alias to pfind.9 removed OLD_FILES+=usr/share/man/man9/zpfind.9 diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 5d004964e4e2..97b3bdefe8d4 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -80,8 +80,6 @@ .. cddl lib - libtpool - .. .. sbin .. diff --git a/lib/libsysdecode/Makefile.depend b/lib/libsysdecode/Makefile.depend index a9ccf3aa0870..0f4942adecfe 100644 --- a/lib/libsysdecode/Makefile.depend +++ b/lib/libsysdecode/Makefile.depend @@ -3,7 +3,6 @@ DIRDEPS = \ cddl/lib/libdtrace \ cddl/lib/libnvpair \ - cddl/lib/libtpool \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzfsbootenv \ diff --git a/rescue/rescue/Makefile.depend b/rescue/rescue/Makefile.depend index 0bfb25d3f174..25be7318ad3f 100644 --- a/rescue/rescue/Makefile.depend +++ b/rescue/rescue/Makefile.depend @@ -5,9 +5,7 @@ DIRDEPS = \ cddl/lib/libicp_rescue \ cddl/lib/libnvpair \ cddl/lib/libspl \ - cddl/lib/libtpool \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzfsbootenv \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 36b7a26458c1..5b0a18f75e9e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9255,7 +9255,6 @@ OLD_DIRS+=etc/zfs OLD_LIBS+=lib/libavl.so.2 OLD_LIBS+=lib/libnvpair.so.2 OLD_LIBS+=lib/libumem.so.2 -OLD_LIBS+=lib/libuutil.so.2 OLD_LIBS+=lib/libzfs.so.2 OLD_LIBS+=lib/libzfs.so.3 OLD_LIBS+=lib/libzfs_core.so.2 @@ -9283,9 +9282,6 @@ OLD_FILES+=usr/lib/libnvpair_p.a OLD_FILES+=usr/lib/libumem.a OLD_FILES+=usr/lib/libumem.so OLD_FILES+=usr/lib/libumem_p.a -OLD_FILES+=usr/lib/libuutil.a -OLD_FILES+=usr/lib/libuutil.so -OLD_FILES+=usr/lib/libuutil_p.a OLD_FILES+=usr/lib/libzfs.a OLD_FILES+=usr/lib/libzfs.so OLD_FILES+=usr/lib/libzfs_core.a