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/sbin | |
| 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/sbin')
| -rw-r--r-- | cddl/sbin/zfs/Makefile | 8 | ||||
| -rw-r--r-- | cddl/sbin/zpool/Makefile | 15 |
2 files changed, 13 insertions, 10 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 591ef06..11f6a0f 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -19,10 +19,10 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common 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/common/zfs -DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ - ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} -LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ - -lm -lnvpair -luutil -lutil +DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ + ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} +LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs .include <bsd.prog.mk> diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index 06fd238..f810ee1 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -1,11 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool \ - ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs PROG= zpool MAN= zpool.8 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c +SRCS+= timestamp.c WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common @@ -21,10 +23,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common -DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ - ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} -LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ - -lm -lnvpair -luutil -lutil +DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ + ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} +LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs .include <bsd.prog.mk> |
