diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl -PACKAGE= runtime +PACKAGE= zfs LIB= avl LIBADD= spl SRCS= avl.c diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp -PACKAGE= utilities +PACKAGE= zfs LIB= icp LIBADD= diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -7,7 +7,7 @@ LIB= nvpair LIBADD= spl -PACKAGE= runtime +PACKAGE= zfs # user INCS= libnvpair.h SRCS= libnvpair.c \ diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -8,7 +8,7 @@ LIB= spl LIBADD= -PACKAGE= runtime +PACKAGE= zfs SRCS = \ assert.c \ diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -6,7 +6,7 @@ LIB= tpool LIBADD= spl -PACKAGE= runtime +PACKAGE= zfs INCS= thread_pool_impl.h SRCS= thread_pool.c diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem -PACKAGE= runtime +PACKAGE= zfs LIB= umem SRCS= umem.c WARNS?= 3 diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil -PACKAGE= runtime +PACKAGE= zfs LIB= uutil SRCS=\ uu_alloc.c \ diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -9,7 +9,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib -PACKAGE= runtime +PACKAGE= zfs LIB= zfs LIBADD= \ avl \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -8,7 +8,7 @@ LIB= zfs_core LIBADD= nvpair spl zutil -PACKAGE= runtime +PACKAGE= zfs INCS= libzfs_core.h SRCS= libzfs_core.c \ diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -3,7 +3,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv .PATH: ${SRCTOP}/sys/contrib/openzfs/include -PACKAGE= runtime +PACKAGE= zfs LIB= zfsbootenv SHLIB_MAJOR= 1 diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -32,6 +32,7 @@ PICFLAG= -fPIC .endif +PACKAGE= zfs LIB= zpool USER_C = \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -6,7 +6,7 @@ LIB= zutil LIBADD= avl geom m tpool -PACKAGE= runtime +PACKAGE= zfs INCS = zutil_import.h diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile --- a/cddl/lib/pam_zfs_key/Makefile +++ b/cddl/lib/pam_zfs_key/Makefile @@ -1,7 +1,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/contrib/pam_zfs_key .PATH: ${SRCTOP}/sys/contrib/openzfs/include -PACKAGE= utilities +PACKAGE= zfs LIB= pam_zfs_key SHLIBDIR?= /usr/lib diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -7,7 +7,7 @@ .PATH: ${ZFSTOP}/man/man8 .PATH: ${ZFSTOP}/module/os/freebsd/spl -PACKAGE= runtime +PACKAGE= zfs PROG= zfs MAN= \ zfs.8 \ diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -10,7 +10,7 @@ .PATH: ${ZFSTOP}/cmd/zpool/os/freebsd -PACKAGE= runtime +PACKAGE= zfs PROG= zpool MAN= \ spl.4 \ diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -4,6 +4,8 @@ .PATH: ${ZFSTOP}/cmd/zpool/compatibility.d +PACKAGE= zfs + FILES= \ compat-2018 \ compat-2019 \ diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -5,6 +5,7 @@ .PATH: ${ZFSTOP}/cmd/zinject .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zinject INCS= zinject.h SRCS= zinject.c translate.c diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -5,6 +5,7 @@ .PATH: ${ZFSTOP}/cmd/zstream .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zstream MAN= zstream.8 MLINKS= zstream.8 zstreamdump.8 diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -7,6 +7,7 @@ .PATH: ${ZFSTOP}/cmd .PATH: ${ZFSTOP}/man/man1 +PACKAGE= zfs PROG= ztest MAN= ztest.1 diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -5,6 +5,7 @@ .PATH: ${ZFSTOP}/cmd/zdb .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zdb MAN= zdb.8 INCS= zdb.h diff --git a/cddl/usr.sbin/zfsd/Makefile b/cddl/usr.sbin/zfsd/Makefile --- a/cddl/usr.sbin/zfsd/Makefile +++ b/cddl/usr.sbin/zfsd/Makefile @@ -4,6 +4,7 @@ .include "Makefile.common" +PACKAGE= zfs PROG_CXX= zfsd MAN= zfsd.8 diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/cmd +PACKAGE= zfs PROG= zhack MAN= diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -4,7 +4,7 @@ .include -PACKAGE= runtime +PACKAGE= zfs LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -148,3 +148,5 @@ wpa_DESC= 802.11 Supplicant yp_COMMENT= Yellow Pages programs yp_DESC= Yellow Pages programs +zfs_COMMENT= ZFS Libraries and Utilities +zfs_DESC= ZFS Libraries and Utilities diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -2,7 +2,7 @@ .include -PACKAGE=runtime +PACKAGE=zfs PROG= bectl MAN= bectl.8