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

packages: Use LIB_PACKAGE for zfs and ufs packages

Browse source 
Commit f9513c334f moved the shared libraries for ZFS and UFS into
separate packages (libzfs and libufs), which resulted in a rather
large number of packages being created, e.g. for ZFS:

FreeBSD-libzfs
FreeBSD-libzfs-dbg
FreeBSD-libzfs-dbg-lib32
FreeBSD-libzfs-dev
FreeBSD-libzfs-dev-lib32
FreeBSD-libzfs-lib32
FreeBSD-zfs
FreeBSD-zfs-dbg
FreeBSD-zfs-dbg-lib32
FreeBSD-zfs-dev
FreeBSD-zfs-dev-lib32
FreeBSD-zfs-lib32
FreeBSD-zfs-man

Use LIB_PACKAGE instead, which significantly reduces the number of
packages:

FreeBSD-zfs
FreeBSD-zfs-dbg
FreeBSD-zfs-dbg-lib32
FreeBSD-zfs-dev
FreeBSD-zfs-dev-lib32
FreeBSD-zfs-lib
FreeBSD-zfs-lib32
FreeBSD-zfs-man

MFC after:	3 days
Reviewed by:	bapt
Differential Revision:	https://reviews.freebsd.org/D52416
This commit is contained in:
Lexi Winter 2025-09-11 20:46:26 +01:00
parent 66d8ffe304
commit 29185c9a26
17 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cddl/lib/libavl/Makefile
View file

@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
PACKAGE= libzfs
PACKAGE= zfs
LIB_PACKAGE=
LIB= avl
LIBADD= spl
SRCS= avl.c

2
cddl/lib/libicp/Makefile
View file

@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
PACKAGE= zfs
LIB_PACKAGE=
LIB= icp
LIBADD=

4
cddl/lib/libnvpair/Makefile
View file

@ -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 \

4
cddl/lib/libspl/Makefile
View file

@ -4,9 +4,11 @@
.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 \

7
cddl/lib/libtpool/Makefile
View file

@ -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

4
cddl/lib/libumem/Makefile
View file

@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
PACKAGE= libzfs
PACKAGE= zfs
LIB_PACKAGE=
LIB= umem
SRCS= umem.c
WARNS?= 3

4
cddl/lib/libuutil/Makefile
View file

@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
PACKAGE= libzfs
PACKAGE= zfs
LIB_PACKAGE=
LIB= uutil
SRCS=\
uu_alloc.c \

4
cddl/lib/libzdb/Makefile
View file

@ -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

4
cddl/lib/libzfs/Makefile
View file

@ -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 \

3
cddl/lib/libzfs_core/Makefile
View file

@ -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 \

2
cddl/lib/libzfsbootenv/Makefile
View file

@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
PACKAGE= zfs
LIB_PACKAGE=
LIB= zfsbootenv
SHLIB_MAJOR= 1

2
cddl/lib/libzpool/Makefile
View file

@ -29,6 +29,8 @@ PICFLAG= -fPIC
.endif
PACKAGE= zfs
LIB_PACKAGE=
LIB= zpool
USER_C = \

4
cddl/lib/libzutil/Makefile
View file

@ -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

1
lib/libbe/Makefile
View file

@ -3,6 +3,7 @@ SHLIBDIR?= /lib
.include <src.opts.mk>
PACKAGE= zfs
LIB_PACKAGE=
LIB= be
SHLIB_MAJOR= 1
SHLIB_MINOR= 0

4
lib/libufs/Makefile
View file

@ -1,4 +1,6 @@
PACKAGE= libufs
PACKAGE= ufs
LIB_PACKAGE=
LIB= ufs
SHLIBDIR?= /lib
SHLIB_MAJOR= 8

8
release/packages/ucl/libufs-all.ucl
View file

@ -1,8 +0,0 @@
comment = "Low-level access to UFS filesystems"
desc = <<EOD
The libufs library and the functions it provides are used for implementing
utilities which need to access a UFS file system at a low level from userland.
Facilities provided are used to implement utilities such as newfs(8) and
dumpfs(8). The libufs library is designed to be simple, and to provide
functions that are traditionally useful to have.
EOD

5
release/packages/ucl/libzfs-all.ucl
View file

@ -1,5 +0,0 @@
comment = "ZFS filesystem library"
desc = <<EOD
libzfs allows applications to manage ZFS pools and filesystems. Several
libraries which libzfs requires are also provided.
EOD