diff options
author | pjd <pjd@FreeBSD.org> | 2011-02-27 19:41:40 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2011-02-27 19:41:40 +0000 |
commit | 1b03c5bf41222b723415638f03e00ed12cac076a (patch) | |
tree | ef515cadc08bf427e4d3f1360199ec9827b1596b /cddl/usr.bin | |
parent | c67d387baf03726323703774b1b320235fb1f24b (diff) | |
download | FreeBSD-src-1b03c5bf41222b723415638f03e00ed12cac076a.zip FreeBSD-src-1b03c5bf41222b723415638f03e00ed12cac076a.tar.gz |
Finally... Import the latest open-source ZFS version - (SPA) 28.
Few new things available from now on:
- Data deduplication.
- Triple parity RAIDZ (RAIDZ3).
- zfs diff.
- zpool split.
- Snapshot holds.
- zpool import -F. Allows to rewind corrupted pool to earlier
transaction group.
- Possibility to import pool in read-only mode.
MFC after: 1 month
Diffstat (limited to 'cddl/usr.bin')
-rw-r--r-- | cddl/usr.bin/Makefile | 4 | ||||
-rw-r--r-- | cddl/usr.bin/zlook/Makefile | 25 | ||||
-rw-r--r-- | cddl/usr.bin/zstreamdump/Makefile | 27 | ||||
-rw-r--r-- | cddl/usr.bin/ztest/Makefile | 1 |
4 files changed, 57 insertions, 0 deletions
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index c6b1341..13d3a86 100644 --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -8,12 +8,16 @@ SUBDIR= \ ctfmerge \ sgsmsg \ ${_zinject} \ + ${_zlook} \ + ${_zstreamdump} \ ${_ztest} .if ${MK_ZFS} != "no" _zinject= zinject +#_zlook= zlook .if ${MK_LIBTHR} != "no" _ztest= ztest +_zstreamdump = zstreamdump .endif .endif diff --git a/cddl/usr.bin/zlook/Makefile b/cddl/usr.bin/zlook/Makefile new file mode 100644 index 0000000..0251f57 --- /dev/null +++ b/cddl/usr.bin/zlook/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook + +PROG= zlook +NO_MAN= + +WARNS?= 0 +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include +#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem +#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common +#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common +#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair +#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head +#CFLAGS+= -I${.CURDIR}/../../lib/libumem +# +#DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ +# ${LIBZFS} ${LIBZPOOL} +#LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool + +.include <bsd.prog.mk> diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile new file mode 100644 index 0000000..304ff7c --- /dev/null +++ b/cddl/usr.bin/zstreamdump/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump + +PROG= zstreamdump +MAN= zstreamdump.1 + +WARNS?= 0 +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../lib/libumem + +DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl + +CSTD= c99 + +.include <bsd.prog.mk> diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 8bb69b1..979880c 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -10,6 +10,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |