add packages for libufs, libzfs
currently FreeBSD-utilities depends on both FreeBSD-ufs and FreeBSD-zfs. this is not desirable, because those are both relatively large packages and the user may want to remove one or the other – or perhaps both, e.g. in a jail or embedded system. the reason for this dependency is that fstyp(8), which is in FreeBSD-utilities, links both libufs and libzfs. FreeBSD-utilities is the correct place for fstyp, so we don't want to move that. instead, add two new packages: libufs contains libufs, and libzfs contains libzfs plus the ZFS libraries it depends on: libavl, libnvpair, libspl, libtpool, libumem, libuutil, libzfs_core and libzutil. with this change, it is possible to remove FreeBSD-ufs and/or FreeBSD-zfs while leaving FreeBSD-libufs, FreeBSD-libzfs and FreeBSD-utilities installed. Reviewed by: manu, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50148
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
LIB= avl
|
LIB= avl
|
||||||
LIBADD= spl
|
LIBADD= spl
|
||||||
SRCS= avl.c
|
SRCS= avl.c
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
LIB= nvpair
|
LIB= nvpair
|
||||||
LIBADD= spl
|
LIBADD= spl
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
# user
|
# user
|
||||||
INCS= libnvpair.h
|
INCS= libnvpair.h
|
||||||
SRCS= libnvpair.c \
|
SRCS= libnvpair.c \
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
LIB= spl
|
LIB= spl
|
||||||
LIBADD=
|
LIBADD=
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
|
|
||||||
SRCS = \
|
SRCS = \
|
||||||
assert.c \
|
assert.c \
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
LIB= tpool
|
LIB= tpool
|
||||||
LIBADD= spl
|
LIBADD= spl
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
|
|
||||||
INCS= thread_pool_impl.h
|
INCS= thread_pool_impl.h
|
||||||
SRCS= thread_pool.c
|
SRCS= thread_pool.c
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
|
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
LIB= umem
|
LIB= umem
|
||||||
SRCS= umem.c
|
SRCS= umem.c
|
||||||
WARNS?= 3
|
WARNS?= 3
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
LIB= uutil
|
LIB= uutil
|
||||||
SRCS=\
|
SRCS=\
|
||||||
uu_alloc.c \
|
uu_alloc.c \
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
|
||||||
|
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
LIB= zfs
|
LIB= zfs
|
||||||
LIBADD= \
|
LIBADD= \
|
||||||
avl \
|
avl \
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
LIB= zfs_core
|
LIB= zfs_core
|
||||||
LIBADD= nvpair spl zutil
|
LIBADD= nvpair spl zutil
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
|
|
||||||
INCS= libzfs_core.h
|
INCS= libzfs_core.h
|
||||||
SRCS= libzfs_core.c \
|
SRCS= libzfs_core.c \
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
LIB= zutil
|
LIB= zutil
|
||||||
LIBADD= avl geom m tpool
|
LIBADD= avl geom m tpool
|
||||||
PACKAGE= zfs
|
PACKAGE= libzfs
|
||||||
|
|
||||||
INCS = zutil_import.h
|
INCS = zutil_import.h
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
PACKAGE= ufs
|
PACKAGE= libufs
|
||||||
LIB= ufs
|
LIB= ufs
|
||||||
SHLIBDIR?= /lib
|
SHLIBDIR?= /lib
|
||||||
SHLIB_MAJOR= 8
|
SHLIB_MAJOR= 8
|
||||||
|
|||||||
Reference in New Issue
Block a user