svn commit: r351850 - in head/cddl: lib/libavl lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core sbin/zfs sbin/zpool

[Emmanuel Vadot]

Author: manu
Date: Thu Sep  5 14:07:49 2019
New Revision: 351850
URL: https://svnweb.freebsd.org/changeset/base/351850

Log:
  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

Modified:
  head/cddl/lib/libavl/Makefile
  head/cddl/lib/libnvpair/Makefile
  head/cddl/lib/libumem/Makefile
  head/cddl/lib/libuutil/Makefile
  head/cddl/lib/libzfs/Makefile
  head/cddl/lib/libzfs_core/Makefile
  head/cddl/sbin/zfs/Makefile
  head/cddl/sbin/zpool/Makefile

Modified: head/cddl/lib/libavl/Makefile
==============================================================================
--- head/cddl/lib/libavl/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/lib/libavl/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl
 
+PACKAGE=	runtime
 LIB=	avl
 SRCS=	avl.c
 WARNS?=	3

Modified: head/cddl/lib/libnvpair/Makefile
==============================================================================
--- head/cddl/lib/libnvpair/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/lib/libnvpair/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -5,6 +5,7 @@
 
 LIB=	nvpair
 
+PACKAGE=	runtime
 INCS=	libnvpair.h
 SRCS=	libnvpair.c \
 	nvpair_alloc_system.c \

Modified: head/cddl/lib/libumem/Makefile
==============================================================================
--- head/cddl/lib/libumem/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/lib/libumem/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
 
+PACKAGE=	runtime
 LIB=	umem
 SRCS=	umem.c
 WARNS?=	3

Modified: head/cddl/lib/libuutil/Makefile
==============================================================================
--- head/cddl/lib/libuutil/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/lib/libuutil/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -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 \

Modified: head/cddl/lib/libzfs/Makefile
==============================================================================
--- head/cddl/lib/libzfs/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/lib/libzfs/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -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 \

Modified: head/cddl/lib/libzfs_core/Makefile
==============================================================================
--- head/cddl/lib/libzfs_core/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/lib/libzfs_core/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -8,6 +8,7 @@
 
 LIB=	zfs_core
 LIBADD=	nvpair
+PACKAGE=	runtime
 
 INCS=	libzfs_core.h
 SRCS=	libzfs_core.c \

Modified: head/cddl/sbin/zfs/Makefile
==============================================================================
--- head/cddl/sbin/zfs/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/sbin/zfs/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -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

Modified: head/cddl/sbin/zpool/Makefile
==============================================================================
--- head/cddl/sbin/zpool/Makefile	Thu Sep  5 14:06:48 2019	(r351849)
+++ head/cddl/sbin/zpool/Makefile	Thu Sep  5 14:07:49 2019	(r351850)
@@ -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