zfs: merge openzfs/zfs@229b9f4ed
Notable upstream pull request merges: #15769082338875Add 'zpool status -e' flag to see unhealthy vdevs #15804a0d3fe72blibzdb: Initial breakout of libzdb #15847229b9f4edLUA: Backport CVE-2020-24370's patch Obtained from: OpenZFS OpenZFS commit:229b9f4ed0
This commit is contained in:
@@ -167,6 +167,7 @@ LIBXPG4?= ${LIBDESTDIR}${LIBDIR_BASE}/libxpg4.a
|
||||
LIBY?= ${LIBDESTDIR}${LIBDIR_BASE}/liby.a
|
||||
LIBYPCLNT?= ${LIBDESTDIR}${LIBDIR_BASE}/libypclnt.a
|
||||
LIBZ?= ${LIBDESTDIR}${LIBDIR_BASE}/libz.a
|
||||
LIBZDB?= ${LIBDESTDIR}${LIBDIR_BASE}/libzdb.a
|
||||
LIBZFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libzfs.a
|
||||
LIBZFS_CORE?= ${LIBDESTDIR}${LIBDIR_BASE}/libzfs_core.a
|
||||
LIBZFSBOOTENV?= ${LIBDESTDIR}${LIBDIR_BASE}/libzfsbootenv.a
|
||||
|
||||
@@ -223,6 +223,7 @@ _LIBRARIES= \
|
||||
y \
|
||||
ypclnt \
|
||||
z \
|
||||
zdb \
|
||||
zfs_core \
|
||||
zfs \
|
||||
zfsbootenv \
|
||||
@@ -683,6 +684,8 @@ 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
|
||||
LIBZFS?= ${LIBZFSDIR}/libzfs${PIE_SUFFIX}.a
|
||||
LIBZFS_COREDIR= ${_LIB_OBJTOP}/cddl/lib/libzfs_core
|
||||
|
||||
Reference in New Issue
Block a user