From c2a7c3bedd9f6d0d97918c7253df31722c7d47fa Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Thu, 5 Sep 2019 14:07:49 +0000 Subject: [PATCH] pkgbase: Force zfs(8) and zpool(8) to be in the runtime package Those commands are needed to repair a FreeBSD installation so add them to the runtime package Reviewed by: bapt, gjb Differential Revision: https://reviews.freebsd.org/D21498 --- cddl/lib/libavl/Makefile | 1 + cddl/lib/libnvpair/Makefile | 1 + cddl/lib/libumem/Makefile | 1 + cddl/lib/libuutil/Makefile | 1 + cddl/lib/libzfs/Makefile | 1 + cddl/lib/libzfs_core/Makefile | 1 + cddl/sbin/zfs/Makefile | 1 + cddl/sbin/zpool/Makefile | 1 + 8 files changed, 8 insertions(+) diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index 5939a78c4e1..995e4d013e5 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl +PACKAGE= runtime LIB= avl SRCS= avl.c WARNS?= 3 diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 892568d579f..90c3295d504 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -5,6 +5,7 @@ LIB= nvpair +PACKAGE= runtime INCS= libnvpair.h SRCS= libnvpair.c \ nvpair_alloc_system.c \ diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index 39ed62f1cc4..ca8f5e66592 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem +PACKAGE= runtime LIB= umem SRCS= umem.c WARNS?= 3 diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index a5d9807b7a8..63997c70c23 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -3,6 +3,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl +PACKAGE= runtime LIB= uutil SRCS= avl.c \ uu_alloc.c \ diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 73013bdd887..b42365cf0d9 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -6,6 +6,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils/common +PACKAGE= runtime LIB= zfs LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core SRCS= deviceid.c \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index c5a275447e7..412a5d2be93 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -8,6 +8,7 @@ LIB= zfs_core LIBADD= nvpair +PACKAGE= runtime INCS= libzfs_core.h SRCS= libzfs_core.c \ diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index f07b7a33b41..e3645bd362b 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs +PACKAGE= runtime PROG= zfs MAN= zfs.8 zfs-program.8 SRCS= zfs_main.c zfs_iter.c diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index 0276258dcaf..f4a3b9b6f5c 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -4,6 +4,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +PACKAGE= runtime PROG= zpool MAN= zpool.8 zpool-features.7 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c