git: 3522eaca6366 - stable/15 - ObsoleteFiles: Deduplicate

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Thu, 19 Feb 2026 13:45:57 UTC
The branch stable/15 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=3522eaca63667c20af5da3ea626be11b717a3ebb

commit 3522eaca63667c20af5da3ea626be11b717a3ebb
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-02-17 22:58:31 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-02-19 13:45:19 +0000

    ObsoleteFiles: Deduplicate
    
    Since we dropped support for profile libraries, all optional entries for
    them are now non-optional.  Most of them were already duplicated there,
    a few were not.
    
    MFC after:      3 days
    Reviewed by:    jhb, emaste
    Differential Revision:  https://reviews.freebsd.org/D55329
    
    (cherry picked from commit f9f4a022a8583763903771915eafcd064184766a)
---
 ObsoleteFiles.inc                        |  3 +++
 tools/build/mk/OptionalObsoleteFiles.inc | 41 --------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 7067dab2ad03..e3bc68bdb541 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -346,6 +346,8 @@ OLD_FILES+=usr/lib/libalias_skinny_p.a
 OLD_FILES+=usr/lib/libalias_smedia_p.a
 OLD_FILES+=usr/lib/libarchive_p.a
 OLD_FILES+=usr/lib/libasn1_p.a
+OLD_FILES+=usr/lib/libatf-c++_p.a
+OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libbe_p.a
 OLD_FILES+=usr/lib/libbegemot_p.a
@@ -354,6 +356,7 @@ OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libbsdxml_p.a
 OLD_FILES+=usr/lib/libbsm_p.a
 OLD_FILES+=usr/lib/libbsnmp_p.a
+OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_FILES+=usr/lib/libbz2_p.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc_p.a
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 1cf8b44eaca3..f0d276b45adb 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -166,7 +166,6 @@ OLD_FILES+=etc/blocklistd.conf
 OLD_FILES+=etc/rc.d/blocklistd
 OLD_FILES+=usr/include/blocklist.h
 OLD_FILES+=usr/lib/libblocklist.a
-OLD_FILES+=usr/lib/libblocklist_p.a
 OLD_FILES+=usr/lib/libblocklist.so
 OLD_LIBS+=usr/lib/libblocklist.so.0
 OLD_FILES+=usr/libexec/blocklistd-helper
@@ -185,7 +184,6 @@ OLD_FILES+=etc/blacklistd.conf
 OLD_FILES+=etc/rc.d/blacklistd
 OLD_FILES+=usr/include/blacklist.h
 OLD_FILES+=usr/lib/libblacklist.a
-OLD_FILES+=usr/lib/libblacklist_p.a
 OLD_FILES+=usr/lib/libblacklist.so
 OLD_LIBS+=usr/lib/libblacklist.so.0
 OLD_FILES+=usr/libexec/blacklistd-helper
@@ -237,11 +235,9 @@ OLD_FILES+=usr/include/sdp.h
 OLD_FILES+=usr/lib/libbluetooth.a
 OLD_FILES+=usr/lib/libbluetooth.so
 OLD_LIBS+=usr/lib/libbluetooth.so.4
-OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libsdp.a
 OLD_FILES+=usr/lib/libsdp.so
 OLD_LIBS+=usr/lib/libsdp.so.4
-OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/sbin/ath3kfw
 OLD_FILES+=usr/sbin/bcmfw
 OLD_FILES+=usr/sbin/bluetooth-config
@@ -480,11 +476,9 @@ OLD_FILES+=usr/include/bsnmp/snmpmod.h
 OLD_FILES+=usr/lib/libbsnmp.a
 OLD_FILES+=usr/lib/libbsnmp.so
 OLD_LIBS+=usr/lib/libbsnmp.so.7
-OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools.so
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
-OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_FILES+=usr/lib/snmp_bridge.so
 OLD_LIBS+=usr/lib/snmp_bridge.so.6
 OLD_FILES+=usr/lib/snmp_hast.so
@@ -1414,7 +1408,6 @@ OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h
 OLD_FILES+=usr/include/cuse.h
 OLD_FILES+=usr/lib/libcuse.a
 OLD_LIBS+=usr/lib/libcuse.so.1
-OLD_FILES+=usr/lib/libcuse_p.a
 OLD_FILES+=usr/share/man/man3/cuse.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz
@@ -1471,11 +1464,9 @@ OLD_FILES+=usr/bin/dpv
 OLD_FILES+=usr/lib/libdialog.a
 OLD_FILES+=usr/lib/libdialog.so
 OLD_LIBS+=usr/lib/libdialog.so.10
-OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
 OLD_LIBS+=usr/lib/libdpv.so.3
-OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/share/man/man1/dialog.1.gz
 OLD_FILES+=usr/share/man/man1/dpv.1.gz
 OLD_FILES+=usr/share/man/man3/dialog.3.gz
@@ -1529,10 +1520,8 @@ OLD_FILES+=usr/lib/dtrace/udplite.d
 OLD_FILES+=usr/lib/dtrace/unistd.d
 OLD_FILES+=usr/lib/libctf.a
 OLD_FILES+=usr/lib/libctf.so
-OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libdtrace.a
 OLD_FILES+=usr/lib/libdtrace.so
-OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_FILES+=usr/libexec/dwatch/chmod
 OLD_FILES+=usr/libexec/dwatch/errno
@@ -2162,19 +2151,15 @@ OLD_FILES+=usr/include/private/gtest/internal/gtest-port.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-string.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-type-util.h
 OLD_FILES+=usr/lib/libprivategmock.a
-OLD_FILES+=usr/lib/libprivategmock_p.a
 OLD_LIBS+=usr/lib/libprivategmock.so
 OLD_LIBS+=usr/lib/libprivategmock.so.0
 OLD_FILES+=usr/lib/libprivategmock_main.a
-OLD_FILES+=usr/lib/libprivategmock_main_p.a
 OLD_LIBS+=usr/lib/libprivategmock_main.so
 OLD_LIBS+=usr/lib/libprivategmock_main.so.0
 OLD_FILES+=usr/lib/libprivategtest.a
-OLD_FILES+=usr/lib/libprivategtest_p.a
 OLD_LIBS+=usr/lib/libprivategtest.so
 OLD_LIBS+=usr/lib/libprivategtest.so.0
 OLD_FILES+=usr/lib/libprivategtest_main.a
-OLD_FILES+=usr/lib/libprivategtest_main_p.a
 OLD_LIBS+=usr/lib/libprivategtest_main.so
 OLD_LIBS+=usr/lib/libprivategtest_main.so.0
 OLD_FILES+=usr/tests/lib/googletest/Kyuafile
@@ -2251,7 +2236,6 @@ OLD_FILES+=usr/include/libgpio.h
 OLD_FILES+=usr/lib/libgpio.a
 OLD_FILES+=usr/lib/libgpio.so
 OLD_LIBS+=usr/lib/libgpio.so.0
-OLD_FILES+=usr/lib/libgpio_p.a
 OLD_FILES+=usr/sbin/gpioctl
 OLD_FILES+=usr/share/man/man3/gpio.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_close.3.gz
@@ -3796,7 +3780,6 @@ OLD_LIBS+=usr/lib/libverto.so.122
 OLD_FILES+=usr/lib/libprivateldns.a
 OLD_FILES+=usr/lib/libprivateldns.so
 OLD_LIBS+=usr/lib/libprivateldns.so.5
-OLD_FILES+=usr/lib/libprivateldns_p.a
 .endif
 
 .if ${MK_LDNS_UTILS} == no
@@ -5714,7 +5697,6 @@ OLD_FILES+=usr/include/netgraph.h
 OLD_FILES+=usr/lib/libnetgraph.a
 OLD_FILES+=usr/lib/libnetgraph.so
 OLD_LIBS+=usr/lib/libnetgraph.so.4
-OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/libexec/pppoed
 OLD_FILES+=usr/sbin/flowctl
 OLD_FILES+=usr/sbin/lmcconfig
@@ -5780,7 +5762,6 @@ OLD_FILES+=usr/include/ypclnt.h
 OLD_FILES+=usr/lib/libypclnt.a
 OLD_FILES+=usr/lib/libypclnt.so
 OLD_LIBS+=usr/lib/libypclnt.so.4
-OLD_FILES+=usr/lib/libypclnt_p.a
 OLD_FILES+=usr/libexec/mknetid
 OLD_FILES+=usr/libexec/yppwupdate
 OLD_FILES+=usr/libexec/ypxfr
@@ -6807,7 +6788,6 @@ OLD_LIBS+=usr/lib/pam_ssh.so.6
 OLD_FILES+=usr/lib/libprivatessh.a
 OLD_FILES+=usr/lib/libprivatessh.so
 OLD_LIBS+=usr/lib/libprivatessh.so.5
-OLD_FILES+=usr/lib/libprivatessh_p.a
 OLD_FILES+=usr/libexec/sftp-server
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-helper
@@ -6947,18 +6927,15 @@ OLD_FILES+=usr/include/libpmcstat.h
 OLD_FILES+=usr/lib/libipt.a
 OLD_FILES+=usr/lib/libipt.so
 OLD_LIBS+=lib/libipt.so.0
-OLD_FILES+=usr/lib/libipt_p.a
 .endif
 .if ${TARGET_ARCH} == "aarch64"
 OLD_FILES+=usr/lib/libopencsd.a
 OLD_FILES+=usr/lib/libopencsd.so
 OLD_LIBS+=lib/libopencsd.so.0
-OLD_FILES+=usr/lib/libopencsd_p.a
 .endif
 OLD_FILES+=usr/lib/libpmc.a
 OLD_FILES+=usr/lib/libpmc.so
 OLD_LIBS+=usr/lib/libpmc.so.5
-OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/sbin/pmc
 OLD_FILES+=usr/sbin/pmcannotate
 OLD_FILES+=usr/sbin/pmccontrol
@@ -7061,7 +7038,6 @@ OLD_FILES+=usr/share/man/man8/repquota.8.gz
 OLD_FILES+=usr/lib/libradius.a
 OLD_FILES+=usr/lib/libradius.so
 OLD_LIBS+=usr/lib/libradius.so.4
-OLD_FILES+=usr/lib/libradius_p.a
 OLD_FILES+=usr/lib/pam_radius.so
 OLD_LIBS+=usr/lib/pam_radius.so.6
 OLD_FILES+=usr/include/radlib.h
@@ -7147,7 +7123,6 @@ OLD_DIRS+=usr/include/libmilter
 OLD_FILES+=usr/lib/libmilter.a
 OLD_FILES+=usr/lib/libmilter.so
 OLD_LIBS+=usr/lib/libmilter.so.5
-OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/libexec/mail.local
 OLD_FILES+=usr/libexec/sendmail/sendmail
 OLD_FILES+=usr/libexec/smrsh
@@ -7699,11 +7674,9 @@ OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
-OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
-OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/libprivateatf-c.so.0
 OLD_LIBS+=usr/lib/libprivateatf-c++.so.1
 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
@@ -8173,11 +8146,9 @@ OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c++.hpp
-OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_FILES+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_FILES+=usr/lib/libatf-c++.a
-OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c++.so.1
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
@@ -8741,7 +8712,6 @@ OLD_FILES+=etc/unbound
 OLD_FILES+=usr/lib/libprivateunbound.a
 OLD_FILES+=usr/lib/libprivateunbound.so
 OLD_LIBS+=usr/lib/libprivateunbound.so.5
-OLD_FILES+=usr/lib/libprivateunbound_p.a
 OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz
@@ -8769,11 +8739,9 @@ OLD_FILES+=usr/include/usbhid.h
 OLD_FILES+=usr/lib/libusb.a
 OLD_FILES+=usr/lib/libusb.so
 OLD_LIBS+=usr/lib/libusb.so.3
-OLD_FILES+=usr/lib/libusb_p.a
 OLD_FILES+=usr/lib/libusbhid.a
 OLD_FILES+=usr/lib/libusbhid.so
 OLD_LIBS+=usr/lib/libusbhid.so.4
-OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc
@@ -9232,27 +9200,18 @@ OLD_FILES+=usr/bin/zinject
 OLD_FILES+=usr/bin/zstreamdump
 OLD_FILES+=usr/bin/ztest
 OLD_FILES+=usr/lib/libbe.a
-OLD_FILES+=usr/lib/libbe_p.a
 OLD_FILES+=usr/lib/libbe.so
 OLD_LIBS+=lib/libbe.so.1
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
-OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libnvpair.a
 OLD_FILES+=usr/lib/libnvpair.so
-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
 OLD_FILES+=usr/lib/libzfs_core.so
-OLD_FILES+=usr/lib/libzfs_core_p.a
-OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
 OLD_LIBS+=usr/lib/libzpool.so.2