aboutsummaryrefslogtreecommitdiff
path: root/cddl/sbin
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-06-13 02:03:58 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-06-13 02:38:47 +0000
commit3ff01b231dfa83d518854c63e7c9cd1debd1139e (patch)
treed760bee3bdd8c4b94fb9962c9e43577a92c1cd2c /cddl/sbin
parent345077ccd52193591a1bad91fef3583f7129345d (diff)
parentafa7b3484556d3ae610a34582ce5ebd2c3e27bba (diff)
downloadsrc-3ff01b231dfa83d518854c63e7c9cd1debd1139e.tar.gz
src-3ff01b231dfa83d518854c63e7c9cd1debd1139e.zip
zfs: merge openzfs/zfs@afa7b3484 (master) into main
Notable upstream pull request merges: #12149: Multiple man-pages: Move to appropriate section #12158: Re-embed multilist_t storage #12191: Convert non-libzpool libraries to -fvisibility=hidden #12196: Unify manpage makefiles, move pages to better sexions, ... #12210: libzutil: import filtering optimisation #12212: Remove pool io kstats Obtained from: OpenZFS OpenZFS commit: afa7b3484556d3ae610a34582ce5ebd2c3e27bba
Diffstat (limited to 'cddl/sbin')
-rw-r--r--cddl/sbin/zfs/Makefile5
-rw-r--r--cddl/sbin/zpool/Makefile13
2 files changed, 10 insertions, 8 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 5ea237eecaa4..6a6ef62e4fce 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -3,6 +3,7 @@
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd/zfs
+.PATH: ${ZFSTOP}/man/man7
.PATH: ${ZFSTOP}/man/man8
.PATH: ${ZFSTOP}/module/os/freebsd/spl
@@ -34,8 +35,8 @@ MAN= \
zfs-upgrade.8 \
zfs-userspace.8 \
zfs-wait.8 \
- zfsconcepts.8 \
- zfsprops.8
+ zfsconcepts.7 \
+ zfsprops.7
MLINKS= \
zfs-allow.8 zfs-unallow.8 \
zfs-hold.8 zfs-release.8 \
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 43cc8f2997b7..4c2a8b94de19 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -2,7 +2,9 @@
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
+.PATH: ${ZFSTOP}/man/man4
.PATH: ${ZFSTOP}/man/man5
+.PATH: ${ZFSTOP}/man/man7
.PATH: ${ZFSTOP}/man/man8
.PATH: ${ZFSTOP}/cmd/zpool
.PATH: ${ZFSTOP}/cmd/zpool/os/freebsd
@@ -11,9 +13,8 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
PACKAGE= runtime
PROG= zpool
MAN= \
- spl-module-parameters.5 \
- zfs-events.5 \
- zfs-module-parameters.5 \
+ spl.4 \
+ zfs.4 \
zpool.8 \
zpool-add.8 \
zpool-attach.8 \
@@ -24,7 +25,7 @@ MAN= \
zpool-detach.8 \
zpool-events.8 \
zpool-export.8 \
- zpool-features.5 \
+ zpool-features.7 \
zpool-get.8 \
zpool-history.8 \
zpool-import.8 \
@@ -45,8 +46,8 @@ MAN= \
zpool-trim.8 \
zpool-upgrade.8 \
zpool-wait.8 \
- zpoolconcepts.8 \
- zpoolprops.8
+ zpoolconcepts.7 \
+ zpoolprops.7
MLINKS= \
zpool-offline.8 zpool-online.8 \
zpool-get.8 zpool-set.8