The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1c52229528e7fee22440dd9a7180b562d3cbf339
commit 1c52229528e7fee22440dd9a7180b562d3cbf339
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2025-07-30 10:10:16 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2025-07-30 10:11:38 +0000
lib: Move libopencsd to /usr/lib and make private
libopencsd is used to decode Arm CoreSight traces. It isn't needed
during the boot so can be moved to /usr/lib, and may change it's API
so can be marked as private as onlt the future hwt tool will use it.
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D51380
---
ObsoleteFiles.inc | 5 +++++
lib/libopencsd/Makefile | 6 +-----
release/packages/ucl/libopencsd-all.ucl | 5 -----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 83fb2d3f3a2c..99a528806695 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,11 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250801: libopencsd libraries moved to /usr/lib and made private
+OLD_FILES+=lib/libopencsd.so.0
+OLD_FILES+=usr/lib/libopencsd.a
+OLD_FILES+=usr/lib/libopencsd.so
+
# 20250728: zfsboot (MBR) removed
OLD_FILES+=boot/zfsboot
OLD_FILES+=usr/share/man/man8/zfsboot.8.gz
diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile
index 649e756eacf6..b37a864f7cbb 100644
--- a/lib/libopencsd/Makefile
+++ b/lib/libopencsd/Makefile
@@ -1,8 +1,3 @@
-PACKAGE=lib${LIB}
-SHLIBDIR?= /lib
-
-.include <src.opts.mk>
-
OPENCSDSRC= ${SRCTOP}/contrib/opencsd
.PATH: ${OPENCSDSRC}/decoder/source/ete/ \
@@ -182,6 +177,7 @@ INCSGROUPS=INCS APIINCS ETEINCS ETMV3INCS ETMV4INCS PTMINCS
STMINCS
LIBADD= cxxrt
WARNS?= 1
+PRIVATELIB= true
HAS_TESTS=
diff --git a/release/packages/ucl/libopencsd-all.ucl
b/release/packages/ucl/libopencsd-all.ucl
deleted file mode 100644
index af46292dceed..000000000000
--- a/release/packages/ucl/libopencsd-all.ucl
+++ /dev/null
@@ -1,5 +0,0 @@
-comment = "ARM CoreSight Trace Decode Library"
-desc = <<EOD
-This library provides an API suitable for the decode of ARM CoreSight
-trace streams.
-EOD
