13 files changed, 13 insertions, 12 deletions

diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index b5e3b458f982..6a39e342bafc 100644
--- 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
index 58ebb292c946..4fc17916d1df 100644
--- 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
index d436b9b1df27..8a7dd0093cf1 100644
--- 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
index 6a918c59e27e..a06eef0b796c 100644
--- 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
index 637385bc842e..d6a1d9fcfb7c 100644
--- 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
index ca8f5e665920..4e4ef2e69461 100644
--- 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
index fdbac6de2748..b67b88037246 100644
--- 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
index 63bfcb39d4d8..2551b9ebdd57 100644
--- 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
index 5a7475f55428..f34494f1cc0a 100644
--- 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
index be39af96124a..6c1643039514 100644
--- 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
index 13671752fe88..aeb2b4175a3b 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -32,6 +32,7 @@ ATOMIC_SRCS=	opensolaris_atomic.c
 PICFLAG=	-fPIC
 .endif
 
+PACKAGE=	zfs
 LIB=		zpool
 
 USER_C = \
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index 2e6b53658b22..3c3855898a77 100644
--- 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
index cf43802090dd..c35a8a6bd615 100644
--- 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