Page MenuHomeFreeBSD
Paste P697

Command-Line Input
ActivePublic
Actions

Authored by ngie on Wed, Feb 4, 7:15 AM.
Tags
None
Referenced Files
F144072348: Command-Line Input
Wed, Feb 4, 7:15 AM
Subscribers
None
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1bd4339f5cc2..653084a032b2 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -89,8 +89,14 @@ 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_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

Event Timeline

ngie created this paste.Wed, Feb 4, 7:15 AM