From cc61ab2f133566dca51970d44cc49a4355039b5d Mon Sep 17 00:00:00 2001
From: mm <mm@FreeBSD.org>
Date: Mon, 11 Jun 2012 11:35:22 +0000
Subject: Introduce "feature flags" for ZFS pools (bump SPA version to 5000).
 Add first feature "com.delphix:async_destroy" (asynchronous destroy of ZFS
 datasets). Implement features support in ZFS boot code.

Illumos revisions merged:
13700:2889e2596bd6
13701:1949b688d5fb
2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags

References:
https://www.illumos.org/issues/2619
https://www.illumos.org/issues/2747

Obtained from:	illumos (issue #2619, #2747)
MFC after:	1 month
---
 cddl/usr.sbin/Makefile       |  4 +++-
 cddl/usr.sbin/zhack/Makefile | 29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 cddl/usr.sbin/zhack/Makefile

(limited to 'cddl/usr.sbin')

diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index a84715b..42d124f 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -5,11 +5,13 @@
 SUBDIR=	${_dtrace} \
 	${_dtruss} \
 	${_lockstat} \
-	${_zdb}
+	${_zdb} \
+	${_zhack}
 
 .if ${MK_ZFS} != "no"
 .if ${MK_LIBTHR} != "no"
 _zdb=	zdb
+_zhack=	zhack
 .endif
 .endif
 
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
new file mode 100644
index 0000000..53d431e
--- /dev/null
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack
+
+PROG=	zhack
+NO_MAN=
+
+WARNS?=	0
+CSTD=	c99
+
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../lib/libumem
+
+DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
+	${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
+LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
+
+.include <bsd.prog.mk>
-- 
cgit v1.1