kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zfs: world changes after 89f729dcc merge
Some checks are pending
Cross-build Kernel / amd64 ubuntu-22.04 (clang-15) (push) Waiting to run
Details
Cross-build Kernel / aarch64 ubuntu-22.04 (clang-15) (push) Waiting to run
Details
Cross-build Kernel / amd64 ubuntu-24.04 (clang-18) (push) Waiting to run
Details
Cross-build Kernel / aarch64 ubuntu-24.04 (clang-18) (push) Waiting to run
Details
Cross-build Kernel / amd64 macos-latest (clang-18) (push) Waiting to run
Details
Cross-build Kernel / aarch64 macos-latest (clang-18) (push) Waiting to run
Details

Browse source 
Remove, unbind and obsolete libuutil and libtpool
Update zfs_configh and zfs_gitrev.h
This commit is contained in:
Martin Matuska 2025-12-07 23:09:12 +01:00
parent 66e8575559
commit 8b78d412ae
33 changed files with 24 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.inc1
View file

@ -3316,12 +3316,10 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
lib/libgeom \
${_lib_librt} \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
${_cddl_lib_libuutil} \
${_cddl_lib_libavl} \
${_cddl_lib_libicp} \
${_cddl_lib_libicp_rescue} \
${_cddl_lib_libspl} \
${_cddl_lib_libtpool} \
${_cddl_lib_libzfs_core} ${_cddl_lib_libzfs} \
${_cddl_lib_libzutil} \
${_cddl_lib_libctf} ${_cddl_lib_libzfsbootenv} \
@ -3394,32 +3392,27 @@ lib/libxo__L: lib/libutil__L
_cddl_lib_libumem= cddl/lib/libumem
_cddl_lib_libnvpair= cddl/lib/libnvpair
_cddl_lib_libavl= cddl/lib/libavl
_cddl_lib_libuutil= cddl/lib/libuutil
_cddl_lib_libspl= cddl/lib/libspl
cddl/lib/libavl__L: cddl/lib/libspl__L
cddl/lib/libnvpair__L: cddl/lib/libspl__L
cddl/lib/libuutil__L: cddl/lib/libavl__L cddl/lib/libspl__L
.if ${MK_ZFS} != "no"
_lib_librt= lib/librt
_cddl_lib_libicp= cddl/lib/libicp
_cddl_lib_libicp_rescue= cddl/lib/libicp_rescue
_cddl_lib_libtpool= cddl/lib/libtpool
_cddl_lib_libzutil= cddl/lib/libzutil
_cddl_lib_libzfs_core= cddl/lib/libzfs_core
_cddl_lib_libzfs= cddl/lib/libzfs
_cddl_lib_libzfsbootenv= cddl/lib/libzfsbootenv
cddl/lib/libtpool__L: cddl/lib/libspl__L
cddl/lib/libzutil__L: cddl/lib/libavl__L lib/libgeom__L lib/msun__L cddl/lib/libtpool__L
cddl/lib/libzutil__L: cddl/lib/libavl__L lib/libgeom__L lib/msun__L
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libspl__L cddl/lib/libzutil__L
cddl/lib/libzfs__L: cddl/lib/libzfs_core__L lib/msun__L lib/libutil__L lib/librt__L
cddl/lib/libzfs__L: lib/libthr__L lib/libmd__L lib/libz__L cddl/lib/libumem__L
cddl/lib/libzfs__L: cddl/lib/libuutil__L cddl/lib/libavl__L lib/libgeom__L
cddl/lib/libzfs__L: cddl/lib/libavl__L lib/libgeom__L
cddl/lib/libzfs__L: cddl/lib/libnvpair__L cddl/lib/libzutil__L
cddl/lib/libzfs__L: secure/lib/libcrypto__L

4
ObsoleteFiles.inc
View file

@ -51,6 +51,10 @@
# xargs -n1 | sort | uniq -d;
# done
# 20251207: removed libuutil and libtpool
OLD_LIBS+= lib/libuutil.so.2
OLD_LIBS+= lib/libtpool.so.2
# 20251204: zpfind.9 alias to pfind.9 removed
OLD_FILES+=usr/share/man/man9/zpfind.9

10
cddl/lib/Makefile
View file

@ -16,9 +16,7 @@ SUBDIR.${MK_ZFS}+= \
libicp \
libicp_rescue \
libnvpair \
libtpool \
libumem \
libuutil \
libzdb \
libzfs \
libzfs_core \
@ -32,14 +30,12 @@ SUBDIR_DEPEND_libavl= libspl
SUBDIR_DEPEND_libctf= libspl
SUBDIR_DEPEND_libdtrace= libctf
SUBDIR_DEPEND_libnvpair= libspl
SUBDIR_DEPEND_libtpool= libspl
SUBDIR_DEPEND_libuutil= libavl libspl
SUBDIR_DEPEND_libzfs_core= libnvpair libspl libzutil
SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core libzutil
SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libzfs_core libzutil
SUBDIR_DEPEND_libzpool= libavl libnvpair libumem libicp
SUBDIR_DEPEND_libzutil= libavl libtpool
SUBDIR_DEPEND_libzutil= libavl
SUBDIR_DEPEND_libzfsbootenv= libzfs libnvpair
SUBDIR_DEPEND_pam_zfs_key= libnvpair libuutil libzfs libzfs_core
SUBDIR_DEPEND_pam_zfs_key= libnvpair libzfs libzfs_core
SUBDIR_PARALLEL=

32
cddl/lib/libtpool/Makefile
View file

@ -1,32 +0,0 @@
.PATH: ${ZFSTOP}/lib/libtpool
.PATH: ${ZFSTOP}/include
PACKAGE= zfs
LIB_PACKAGE=
LIB= tpool
SHLIBDIR?= /lib
LIBADD= spl
INCS= thread_pool_impl.h
SRCS= thread_pool.c
WARNS?= 2
CSTD= c99
CFLAGS+= -DIN_BASE
CFLAGS+= -I${ZFSTOP}/include
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
CFLAGS+= -I${ZFSTOP}/module/icp/include
CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
.include <src.opts.mk>
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

16
cddl/lib/libtpool/Makefile.depend
View file

@ -1,16 +0,0 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif

11
cddl/lib/libtpool/tests/Makefile
View file

@ -1,11 +0,0 @@
ATF_TESTS_C+= libtpool_test
TEST_METADATA+= timeout="10"
CFLAGS+= -I${ZFSTOP}/include \
-I${ZFSTOP}/lib/libspl/include
LIBADD+= pthread tpool
.include "${SRCTOP}/cddl/Makefile.inc"
.include <bsd.test.mk>

82
cddl/lib/libtpool/tests/libtpool_test.c
View file

@ -1,82 +0,0 @@
#include <sys/stdtypes.h>
#include <sys/sysctl.h>
#include <errno.h>
#include <pthread.h>
#include <thread_pool.h>
#include <atf-c.h>
static void
tp_delay(void *arg)
{
pthread_barrier_t *barrier = arg;
int r;
/* Block this task until all thread pool workers have been created. */
r = pthread_barrier_wait(barrier);
ATF_REQUIRE_MSG(r == 0 || r == PTHREAD_BARRIER_SERIAL_THREAD,
"pthread_barrier_wait failed: %s", strerror(r));
}
/*
* NB: we could reduce the test's resource cost by using rctl(4). But that
* isn't enabled by default. And even with a thread limit of 1500, it takes <
* 0.1s to run on my machine. So I don't think it's worth optimizing for the
* case where rctl is available.
*/
ATF_TC(complete_exhaustion);
ATF_TC_HEAD(complete_exhaustion, tc)
{
atf_tc_set_md_var(tc, "descr",
"A thread pool should fail to schedule tasks if it is completely impossible to spawn any threads.");
}
ATF_TC_BODY(complete_exhaustion, tc)
{
pthread_barrier_t barrier;
tpool_t *tp0, *tp1;
size_t len;
int max_threads_per_proc = 0;
int nworkers;
int r, i;
len = sizeof(max_threads_per_proc);
r = sysctlbyname("kern.threads.max_threads_per_proc",
&max_threads_per_proc, &len, NULL, 0);
ATF_REQUIRE_EQ_MSG(r, 0, "sysctlbyname: %s", strerror(errno));
nworkers = max_threads_per_proc - 1;
pthread_barrier_init(&barrier, NULL, max_threads_per_proc);
/*
* Create the first thread pool and spawn the maximum allowed number of
* processes.
*/
tp0 = tpool_create(nworkers, nworkers, 1, NULL);
ATF_REQUIRE(tp0 != NULL);
for (i = 0; i < nworkers; i++) {
ATF_REQUIRE_EQ(tpool_dispatch(tp0, tp_delay, &barrier), 0);
}
/*
* Now create a second thread pool. Unable to create new threads, the
* dispatch function should return an error.
*/
tp1 = tpool_create(nworkers, 2 * nworkers, 1, NULL);
ATF_REQUIRE(tp1 != NULL);
ATF_REQUIRE_EQ(tpool_dispatch(tp1, tp_delay, NULL), -1);
/* Cleanup */
r = pthread_barrier_wait(&barrier);
ATF_REQUIRE_MSG(r == 0 || r == PTHREAD_BARRIER_SERIAL_THREAD,
"pthread_barrier_wait failed: %s", strerror(r));
tpool_wait(tp1);
tpool_wait(tp0);
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, complete_exhaustion);
return (atf_no_error());
}

26
cddl/lib/libuutil/Makefile
View file

@ -1,26 +0,0 @@
.PATH: ${ZFSTOP}/lib/libuutil
PACKAGE= zfs
LIB_PACKAGE=
LIB= uutil
SRCS=\
uu_alloc.c \
uu_avl.c \
uu_ident.c \
uu_list.c \
uu_misc.c \
uu_string.c
WARNS?= 2
CFLAGS+= -DIN_BASE
CFLAGS+= -I${ZFSTOP}/include
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
LIBADD= avl spl
.include <bsd.lib.mk>

17
cddl/lib/libuutil/Makefile.depend
View file

@ -1,17 +0,0 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif

1
cddl/lib/libzfs/Makefile
View file

@ -23,7 +23,6 @@ LIBADD= \
rt \
umem \
util \
uutil \
z \
zfs_core \
zutil

1
cddl/lib/libzfs/Makefile.depend
View file

@ -4,7 +4,6 @@ DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs_core \
cddl/lib/libzutil \
include \

2
cddl/lib/libzutil/Makefile
View file

@ -6,7 +6,7 @@ PACKAGE= zfs
LIB_PACKAGE=
LIB= zutil
LIBADD= avl geom m tpool
LIBADD= avl geom m
INCS = zutil_import.h

1
cddl/lib/libzutil/Makefile.depend
View file

@ -2,7 +2,6 @@
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libtpool \
include \
include/xlocale \
lib/${CSU_DIR} \

2
cddl/lib/pam_zfs_key/Makefile
View file

@ -6,7 +6,7 @@ LIB= pam_zfs_key
SHLIBDIR?= /usr/lib
LIBADD= zfs zfs_core nvpair uutil crypto
LIBADD= zfs zfs_core nvpair crypto
SRCS= pam_zfs_key.c

2
cddl/sbin/zfs/Makefile
View file

@ -71,7 +71,7 @@ CFLAGS+= \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
-I${SRCTOP}/sys/modules/zfs
LIBADD= jail avl nvpair geom uutil zfs_core spl tpool zutil zfs m crypto
LIBADD= jail avl nvpair geom zfs_core spl zutil zfs m crypto
LDADD+= -pthread
.include <bsd.prog.mk>

2
cddl/sbin/zfs/Makefile.depend
View file

@ -4,8 +4,6 @@ DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
cddl/lib/libspl \
cddl/lib/libtpool \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzutil \

2
cddl/sbin/zpool/Makefile
View file

@ -75,6 +75,6 @@ CFLAGS+= \
-DSYSCONFDIR=\"/etc\" \
-DPKGDATADIR=\"/usr/share/zfs\"
LIBADD= geom nvpair uutil zfs zutil avl spl tpool zfs_core m
LIBADD= geom nvpair zfs zutil avl spl zfs_core m
LDADD+= -pthread
.include <bsd.prog.mk>

2
cddl/sbin/zpool/Makefile.depend
View file

@ -4,8 +4,6 @@ DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
cddl/lib/libspl \
cddl/lib/libtpool \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzutil \

2
cddl/usr.bin/zinject/Makefile
View file

@ -21,6 +21,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 pthread
LIBADD= geom m nvpair umem avl spl zfs_core zfs zutil zpool pthread
.include <bsd.prog.mk>

1
cddl/usr.bin/zinject/Makefile.depend
View file

@ -5,7 +5,6 @@ DIRDEPS = \
cddl/lib/libnvpair \
cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \

2
cddl/usr.bin/zstream/Makefile
View file

@ -31,6 +31,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 pthread
LIBADD= geom m nvpair umem avl spl zfs_core zfs zutil zpool pthread
.include <bsd.prog.mk>

2
cddl/usr.bin/ztest/Makefile
View file

@ -20,7 +20,7 @@ CFLAGS+= \
-DHAVE_ISSETUGID \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h
LIBADD= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp
LIBADD= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs icp
CSTD= c99

1
cddl/usr.bin/ztest/Makefile.depend
View file

@ -6,7 +6,6 @@ DIRDEPS = \
cddl/lib/libnvpair \
cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \

1
cddl/usr.libexec/zpool_influxdb/Makefile.depend
View file

@ -4,7 +4,6 @@ DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
gnu/lib/csu \

2
cddl/usr.sbin/zdb/Makefile
View file

@ -21,7 +21,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 pthread
LIBADD= nvpair umem 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

1
cddl/usr.sbin/zdb/Makefile.depend
View file

@ -5,7 +5,6 @@ DIRDEPS = \
cddl/lib/libnvpair \
cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzpool \
cddl/lib/libzutil \

2
cddl/usr.sbin/zfsd/Makefile.common
View file

@ -25,7 +25,7 @@ CFLAGS+= -I${SRCTOP}/cddl/usr.sbin
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -DHAVE_EXECVPE
LIBADD+= devdctl zfs util geom bsdxml sbuf nvpair avl uutil zutil
LIBADD+= devdctl zfs util geom bsdxml sbuf nvpair avl zutil
cscope:
find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \

1
cddl/usr.sbin/zfsd/Makefile.depend
View file

@ -3,7 +3,6 @@
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzutil \
include \

2
rescue/rescue/Makefile
View file

@ -145,7 +145,7 @@ CRUNCH_PROGS_usr.sbin+= zdb
CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma
CRUNCH_LIBS_camcontrol+= ${LIBNVMF} ${LIBNV}
.if ${MK_ZFS} != "no"
CRUNCH_LIBS+= -lavl -lpthread -luutil -lumem -ltpool -lspl -lrt
CRUNCH_LIBS+= -lavl -lpthread -lumem -lspl -lrt
CRUNCH_LIBS_zfs+= ${LIBBE} \
${LIBZPOOL} \
${LIBZFS} \

2
share/mk/bsd.libnames.mk
View file

@ -163,7 +163,6 @@ LIBTERMCAP?= ${LIBDESTDIR}${LIBDIR_BASE}/libtermcap.a
LIBTERMCAPW?= ${LIBDESTDIR}${LIBDIR_BASE}/libtermcapw.a
LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
LIBTINFOW= ${LIBDESTDIR}${LIBDIR_BASE}/libtinfow.a
LIBTPOOL?= ${LIBDESTDIR}${LIBDIR_BASE}/libtpool.a
LIBUFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libufs.a
LIBUGIDFW?= ${LIBDESTDIR}${LIBDIR_BASE}/libugidfw.a
LIBULOG?= ${LIBDESTDIR}${LIBDIR_BASE}/libulog.a
@ -171,7 +170,6 @@ LIBUMEM?= ${LIBDESTDIR}${LIBDIR_BASE}/libumem.a
LIBUSB?= ${LIBDESTDIR}${LIBDIR_BASE}/libusb.a
LIBUSBHID?= ${LIBDESTDIR}${LIBDIR_BASE}/libusbhid.a
LIBUTIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libutil.a
LIBUUTIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libuutil.a
LIBUVMEM?= ${LIBDESTDIR}${LIBDIR_BASE}/libuvmem.a
LIBVERTO?= ${LIBDESTDIR}${LIBDIR_BASE}/libverto.a
LIBVGL?= ${LIBDESTDIR}${LIBDIR_BASE}/libvgl.a

12
share/mk/src.libnames.mk
View file

@ -229,7 +229,6 @@ _LIBRARIES= \
tacplus \
termcapw \
tinfow \
tpool \
ufs \
ugidfw \
ulog \
@ -238,7 +237,6 @@ _LIBRARIES= \
usbhid \
util \
uvmem \
uutil \
verto \
vmmapi \
wind \
@ -454,7 +452,7 @@ _DP_opencsd= cxxrt
_DP_ctf= spl z
_DP_dtrace= ctf elf proc pthread rtld_db xo
_DP_xo= util
_DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp
_DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs icp
# The libc dependencies are not strictly needed but are defined to make the
# assert happy.
_DP_c= compiler_rt sys
@ -491,15 +489,13 @@ _DP_smb= kiconv
_DP_ulog= md
_DP_fifolog= z
_DP_ipf= kvm
_DP_tpool= spl
_DP_uutil= avl spl
_DP_uvmem= pthread
_DP_zfs= md pthread rt umem util uutil m avl bsdxml crypto geom nvpair \
_DP_zfs= md pthread rt umem util m avl bsdxml crypto geom nvpair \
z zfs_core zutil
_DP_zfsbootenv= zfs nvpair
_DP_zfs_core= nvpair spl zutil
_DP_zpool= md pthread z icp spl nvpair avl umem
_DP_zutil= avl geom m tpool
_DP_zutil= avl geom m
_DP_be= zfs spl nvpair zfsbootenv
_DP_netmap=
_DP_ifconfig= m
@ -787,7 +783,6 @@ LIBICP_RESCUE?= ${LIBICP_RESCUEDIR}/libicp_rescue${PIE_SUFFIX}.a
LIBNVPAIRDIR= ${_LIB_OBJTOP}/cddl/lib/libnvpair
LIBNVPAIR?= ${LIBNVPAIRDIR}/libnvpair${PIE_SUFFIX}.a
LIBUMEMDIR= ${_LIB_OBJTOP}/cddl/lib/libumem
LIBUUTILDIR= ${_LIB_OBJTOP}/cddl/lib/libuutil
LIBZDBDIR= ${_LIB_OBJTOP}/cddl/lib/libzdb
LIBZDB?= ${LIBZDBDIR}/libzdb${PIE_SUFFIX}.a
LIBZFSDIR= ${_LIB_OBJTOP}/cddl/lib/libzfs
@ -800,7 +795,6 @@ LIBZPOOLDIR= ${_LIB_OBJTOP}/cddl/lib/libzpool
LIBZPOOL?= ${LIBZPOOLDIR}/libzpool${PIE_SUFFIX}.a
LIBZUTILDIR= ${_LIB_OBJTOP}/cddl/lib/libzutil
LIBZUTIL?= ${LIBZUTILDIR}/libzutil${PIE_SUFFIX}.a
LIBTPOOLDIR= ${_LIB_OBJTOP}/cddl/lib/libtpool
# OFED support
LIBCXGB4DIR= ${_LIB_OBJTOP}/lib/ofed/libcxgb4

4
sys/modules/zfs/zfs_config.h
View file

@ -856,7 +856,7 @@
/* #undef ZFS_DEVICE_MINOR */
/* Define the project alias string. */
#define ZFS_META_ALIAS "zfs-2.4.99-220-FreeBSD_ge63d026b9"
#define ZFS_META_ALIAS "zfs-2.4.99-248-FreeBSD_g89f729dcc"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@ -886,7 +886,7 @@
#define ZFS_META_NAME "zfs"
/* Define the project release. */
#define ZFS_META_RELEASE "220-FreeBSD_ge63d026b9"
#define ZFS_META_RELEASE "248-FreeBSD_g89f729dcc"
/* Define the project version. */
#define ZFS_META_VERSION "2.4.99"

1
targets/pseudo/userland/cddl/Makefile.depend
View file

@ -12,7 +12,6 @@ DIRDEPS = \
cddl/lib/libdtrace \
cddl/lib/libnvpair \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/usr.bin/ctfconvert \
cddl/usr.bin/ctfdump \
cddl/usr.bin/ctfmerge \