aboutsummaryrefslogtreecommitdiff
path: root/cddl/lib
diff options
context:
space:
mode:
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/drti/Makefile1
-rw-r--r--cddl/lib/libavl/Makefile4
-rw-r--r--cddl/lib/libctf/Makefile2
-rw-r--r--cddl/lib/libdtrace/Makefile1
-rw-r--r--cddl/lib/libdtrace/io.d2
-rw-r--r--cddl/lib/libdtrace/psinfo.d2
-rw-r--r--cddl/lib/libicp/Makefile5
-rw-r--r--cddl/lib/libnvpair/Makefile4
-rw-r--r--cddl/lib/libspl/Makefile16
-rw-r--r--cddl/lib/libtpool/Makefile7
-rw-r--r--cddl/lib/libumem/Makefile4
-rw-r--r--cddl/lib/libuutil/Makefile4
-rw-r--r--cddl/lib/libzdb/Makefile4
-rw-r--r--cddl/lib/libzfs/Makefile4
-rw-r--r--cddl/lib/libzfs_core/Makefile3
-rw-r--r--cddl/lib/libzfsbootenv/Makefile2
-rw-r--r--cddl/lib/libzpool/Makefile5
-rw-r--r--cddl/lib/libzutil/Makefile4
18 files changed, 55 insertions, 19 deletions
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/libavl/Makefile b/cddl/lib/libavl/Makefile
index ce77012def9f..4ce1de20a3d9 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= avl
LIBADD= spl
SRCS= avl.c
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index 10854482cd21..1c605182bc1d 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
+PACKAGE= ctf
+LIB_PACKAGE=
LIB= ctf
SRCS= ctf_create.c \
ctf_decl.c \
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/libdtrace/io.d b/cddl/lib/libdtrace/io.d
index d576f57476ce..484e6416bac7 100644
--- a/cddl/lib/libdtrace/io.d
+++ b/cddl/lib/libdtrace/io.d
@@ -73,7 +73,7 @@ translator bufinfo_t < struct bio *B > {
b_lblkno = 0;
b_resid = B->bio_resid;
b_bufsize = 0; /* XXX gnn */
- b_error = B->bio_error;
+ b_error = B->bio_exterr.error;
};
/*
diff --git a/cddl/lib/libdtrace/psinfo.d b/cddl/lib/libdtrace/psinfo.d
index c0cd5b121064..8dc27e812965 100644
--- a/cddl/lib/libdtrace/psinfo.d
+++ b/cddl/lib/libdtrace/psinfo.d
@@ -55,7 +55,7 @@ translator psinfo_t < struct proc *T > {
pr_uid = T->p_ucred->cr_ruid;
pr_euid = T->p_ucred->cr_uid;
pr_gid = T->p_ucred->cr_rgid;
- pr_egid = T->p_ucred->cr_groups[0];
+ pr_egid = T->p_ucred->cr_gid;
pr_addr = 0;
pr_psargs = (T->p_args == 0) ? "" :
memstr(T->p_args->ar_args, ' ', T->p_args->ar_length);
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
index 8e801246215f..833ecbb1c7f7 100644
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= icp
LIBADD=
@@ -89,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/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 2d9ef1c7af1e..8245b324688b 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -2,10 +2,12 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= nvpair
LIBADD= spl
-PACKAGE= libzfs
# user
INCS= libnvpair.h
SRCS= libnvpair.c \
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index d8d997c6f377..173e9116e284 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -4,17 +4,28 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= spl
LIBADD=
-PACKAGE= libzfs
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
@@ -24,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/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 7acf34219a47..3a50a21bf62c 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -1,11 +1,12 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+PACKAGE= zfs
+LIB_PACKAGE=
-LIB= tpool
+LIB= tpool
SHLIBDIR?= /lib
-LIBADD= spl
-PACKAGE= libzfs
+LIBADD= spl
INCS= thread_pool_impl.h
SRCS= thread_pool.c
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index 9164ba771fe6..512332275fec 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= umem
SRCS= umem.c
WARNS?= 3
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 8c8a786ee039..947e755d4aae 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= uutil
SRCS=\
uu_alloc.c \
diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile
index 0eb30c55d107..040d7d2c63f9 100644
--- a/cddl/lib/libzdb/Makefile
+++ b/cddl/lib/libzdb/Makefile
@@ -1,8 +1,10 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
-LIB= zdb
PACKAGE= zfs
+LIB_PACKAGE=
+
+LIB= zdb
INCS = libzdb.h
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 40553aa68719..376e32fb893f 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,7 +7,9 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zfs
LIBADD= \
avl \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index bac81ca73497..10533c5de05b 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -3,10 +3,11 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
+PACKAGE= zfs
+LIB_PACKAGE=
LIB= zfs_core
LIBADD= nvpair spl zutil
-PACKAGE= libzfs
INCS= libzfs_core.h
SRCS= libzfs_core.c \
diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
index 15ee5bfaeaa4..22f5da1ee5b1 100644
--- a/cddl/lib/libzfsbootenv/Makefile
+++ b/cddl/lib/libzfsbootenv/Makefile
@@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zfsbootenv
SHLIB_MAJOR= 1
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 4da3840e59f0..031cc27fb431 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -29,12 +29,13 @@ PICFLAG= -fPIC
.endif
PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zpool
USER_C = \
arc_os.c \
kernel.c \
- taskq.c \
util.c \
zfs_debug.c
@@ -179,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 \
@@ -263,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/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index 07ca3b9bc156..37e9e8dd5e63 100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -2,9 +2,11 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zutil
LIBADD= avl geom m tpool
-PACKAGE= libzfs
INCS = zutil_import.h
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 07:35:50 +0000