aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/dtrace/dtrace.111
-rw-r--r--cddl/lib/drti/Makefile1
-rw-r--r--cddl/lib/libdtrace/Makefile1
-rw-r--r--cddl/lib/libicp/Makefile3
-rw-r--r--cddl/lib/libspl/Makefile12
-rw-r--r--cddl/lib/libzpool/Makefile3
-rw-r--r--cddl/usr.bin/zinject/Makefile2
-rw-r--r--cddl/usr.bin/zstream/Makefile2
-rw-r--r--cddl/usr.libexec/zpool_influxdb/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/Makefile3
-rw-r--r--cddl/usr.sbin/lockstat/Makefile1
-rw-r--r--cddl/usr.sbin/plockstat/Makefile1
-rw-r--r--cddl/usr.sbin/zdb/Makefile2
-rw-r--r--cddl/usr.sbin/zhack/Makefile2
14 files changed, 34 insertions, 12 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
index 1a9f8029e6de..86887bbe8dd9 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
@@ -20,7 +20,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 6, 2025
+.Dd November 12, 2025
.Dt DTRACE 1
.Os
.Sh NAME
@@ -1252,6 +1252,14 @@ command line to define a set of macro variables and so forth).
The additional arguments can be used in D programs specified using the
.Fl s
option or on the command line.
+.Sh ENVIRONMENT
+.Bl -tag -width 'DTRACE_DEBUG'
+.It Ev DTRACE_DEBUG
+When defined,
+.Nm
+will output debug log messages to
+.Xr stderr 4 .
+.El
.Sh FILES
.Bl -tag -width /boot/dtrace.dof -compact
.It Pa /boot/dtrace.dof
@@ -1301,6 +1309,7 @@ in
.Xr dtrace_lockstat 4 ,
.Xr dtrace_pid 4 ,
.Xr dtrace_proc 4 ,
+.Xr dtrace_priv 4 ,
.Xr dtrace_profile 4 ,
.Xr dtrace_sched 4 ,
.Xr dtrace_sctp 4 ,
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index 4a7a8350cac8..50250887e379 100644
--- a/cddl/lib/drti/Makefile
+++ b/cddl/lib/drti/Makefile
@@ -11,6 +11,7 @@ CLEANFILES= ${FILES}
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
.undef LIBRARIES_ONLY
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index d086fffb07bc..dae6200d80c1 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -77,6 +77,7 @@ SYSINCS+= ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
index 1a9a79103b50..833ecbb1c7f7 100644
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -91,9 +91,6 @@ KERNEL_C = \
core/kcf_prov_tabs.c \
$(ASM_SOURCES_C)
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs
-KERNEL_C+= zfs_impl.c
-
SRCS= $(ASM_SOURCES_AS) $(KERNEL_C)
WARNS?= 2
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 26e14ea72b8a..173e9116e284 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -13,10 +13,19 @@ LIBADD=
SRCS = \
assert.c \
backtrace.c \
+ condvar.c \
+ kmem.c \
+ libspl.c \
list.c \
mkdirp.c \
+ mutex.c \
os/freebsd/zone.c \
page.c \
+ procfs_list.c \
+ random.c \
+ rwlock.c \
+ sid.c \
+ taskq.c \
timestamp.c \
include/sys/list.h \
include/sys/list_impl.h
@@ -26,7 +35,10 @@ SRCS = \
.if !defined(BOOTSTRAPPING)
SRCS += \
atomic.c \
+ cred.c \
getexecname.c \
+ kstat.c \
+ thread.c \
tunables.c \
os/freebsd/getexecname.c \
os/freebsd/gethostid.c \
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 82ec0e890d56..031cc27fb431 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -36,7 +36,6 @@ LIB= zpool
USER_C = \
arc_os.c \
kernel.c \
- taskq.c \
util.c \
zfs_debug.c
@@ -181,6 +180,7 @@ KERNEL_C = \
zfs_debug_common.c \
zfs_fm.c \
zfs_fuid.c \
+ zfs_impl.c \
zfs_sa.c \
zfs_znode.c \
zfs_racct.c \
@@ -265,7 +265,6 @@ CFLAGS+= \
-I${ZFSTOP}/lib/libspl/include/os/freebsd \
-I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
-I${SRCTOP}/sys \
- -I${ZFSTOP}/include/os/freebsd/zfs \
-I${SRCTOP}/cddl/compat/opensolaris/include \
-I${ZFSTOP}/module/icp/include \
-I${SRCTOP}/compat/linuxkpi/common/include/linux \
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index 921d4df7a651..fd8437ed3f2c 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -23,6 +23,6 @@ CFLAGS+= \
-DHAVE_ISSETUGID \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool
+LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread
.include <bsd.prog.mk>
diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
index b131901cb6a9..7b753f79c4d7 100644
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@ -33,6 +33,6 @@ CFLAGS+= \
-DHAVE_ISSETUGID \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool
+LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread
.include <bsd.prog.mk>
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile
index 064ac9b23e4a..f91ce1a7a213 100644
--- a/cddl/usr.libexec/zpool_influxdb/Makefile
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile
@@ -22,6 +22,6 @@ CFLAGS+= \
-DSYSCONFDIR=\"/etc\" \
-DPKGDATADIR=\"/usr/share/zfs\"
-LIBADD= nvpair spl zfs
+LIBADD= nvpair spl zfs pthread
.include <bsd.prog.mk>
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index c72b55cc4903..cdfd8af8fe72 100644
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@@ -10,6 +10,7 @@ BINDIR?= /usr/sbin
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
@@ -33,7 +34,7 @@ CFLAGS+= -fsanitize=address -fsanitize=undefined
LDFLAGS+= -fsanitize=address -fsanitize=undefined
.endif
-LIBADD= dtrace ctf elf proc spl xo
+LIBADD= dtrace ctf elf proc spl xo pthread
.if ${MK_DTRACE_TESTS} != "no"
SUBDIR+= tests
diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
index c87a37ef1504..498e2a5857e0 100644
--- a/cddl/usr.sbin/lockstat/Makefile
+++ b/cddl/usr.sbin/lockstat/Makefile
@@ -10,6 +10,7 @@ BINDIR?= /usr/sbin
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile
index 3e35c5c5b8f7..2880c6aeafc7 100644
--- a/cddl/usr.sbin/plockstat/Makefile
+++ b/cddl/usr.sbin/plockstat/Makefile
@@ -10,6 +10,7 @@ BINDIR?= /usr/sbin
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 7d1e41e1690e..f8f7eea6050b 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -23,7 +23,7 @@ CFLAGS+= \
-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
-DHAVE_ISSETUGID
-LIBADD= nvpair umem uutil zdb zfs_core zfs spl avl zutil zpool crypto
+LIBADD= nvpair umem uutil zdb zfs_core zfs spl avl zutil zpool crypto pthread
CFLAGS.gcc+= -fms-extensions
# Since there are many asserts in this program, it makes no sense to compile
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
index 69d561b3407b..2b981919e17b 100644
--- a/cddl/usr.sbin/zhack/Makefile
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -24,7 +24,7 @@ CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-LIBADD= nvpair zfs spl zutil zpool
+LIBADD= nvpair zfs spl zutil zpool pthread
CFLAGS+= -DDEBUG=1
#DEBUG_FLAGS+= -g
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-24 06:31:42 +0000