git: 379954d06c1d - main - src.conf.5: Regen after ZFS-related options changes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Mar 2023 00:07:14 UTC
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=379954d06c1d55276acb606a04f804924b94494a commit 379954d06c1d55276acb606a04f804924b94494a Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2023-03-15 00:06:52 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2023-03-15 00:06:52 +0000 src.conf.5: Regen after ZFS-related options changes Since 9503d2704ca6 LOADER_ZFS gets turned off when ZFS is, and since 63715498ac6b ZFS is no longer disabled on powerpc and powerpcspe. Reviewed by: emaste Fixes: 9503d2704ca6 ("opts: Minor cleanup of ZFS options") Fixes: 63715498ac6b ("powerpc: enable ZFS on 32 bit powerpc/powerpcspe") Differential Revision: https://reviews.freebsd.org/D39071 --- share/man/man5/src.conf.5 | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index a3f997e66e2c..04af879dbd02 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd March 9, 2023 +.Dd March 15, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -426,6 +426,8 @@ When set, it enforces these options: .It .Va WITHOUT_LDNS_UTILS .It +.Va WITHOUT_LOADER_ZFS +.It .Va WITHOUT_OPENSSH .It .Va WITHOUT_OPENSSL @@ -1318,6 +1320,8 @@ When set, it enforces these options: .It .Va WITHOUT_LDNS_UTILS .It +.Va WITHOUT_LOADER_ZFS +.It .Va WITHOUT_OPENSSH .It .Va WITHOUT_OPENSSL_KTLS @@ -1763,16 +1767,6 @@ or .Xr zfs 8 . Also disable ZFS support in utilities and libraries which implement ZFS-specific functionality. -.Pp -This is a default setting on -powerpc/powerpc. -.It Va WITH_ZFS -Build the ZFS file system kernel module, libraries, and user commands. -Also enable ZFS support in utilities and libraries which implement -ZFS-specific functionality. -.Pp -This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. .It Va WITHOUT_ZONEINFO Do not build the timezone database. When set, it enforces these options: