From nobody Wed Mar 15 00:07:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PbrLC19vVz3xhRd; Wed, 15 Mar 2023 00:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PbrLC0CDxz49h6; Wed, 15 Mar 2023 00:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678838835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfDeuynb3kbGKNXgfoGAUSqMFV7seFa7GFHkbIsjxxQ=; b=uAXH2/qHAvB00mOkKPBbkFPS1H0i2Rph8lu/JSfu08pW8yPGyfqaI6E+q2t7gKJljO6pMh rxPNJOLb36EAJI0De3FU1dbg9nMnRfesJDjvbyJCLMtAbxcBWI7Lv/4t/gvbj3c/+TvtB/ Tsnd2OFPve+WQ0wj2cctGXyQXvTF+71bTIha4zk2QUERD0F2QpLPvQzbtkEbAi0sMhi/D6 gjUV9ts5ZX84sVtjbAwf9q/Y3GYcrhDeZN5KozOI1oEf5dYtpSTYxBvODPJFaoM1yFOFXX BpSMJcF/KEuTWRY3J5cuRSHlzv5Q7w3x658TunwsLaLtvQE67heW4Npszg5y5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678838835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfDeuynb3kbGKNXgfoGAUSqMFV7seFa7GFHkbIsjxxQ=; b=as5Zbg4yGIJ6vxMEjlXSU47SjTJMgwVdaePkh/7V8ap86IV8+3qbRwCkXR9CYkmNSTdulX wY7dDamDT8oOrrFPr79NLnedP0fUlSK9Uy4bg0I2UkfAbSOuUK78QaZNeQDn18e3JzVTNW DJ3XbTo7Gh79SaGXstg/psihkOwfvg40d6Ck92jIsmR7at7OgCmx5XThnf7rrWOo/jO9Sx C/SvTNl41G717ixC/PFpKKbdsKb9th5KZky2imWV2A/so2zWDk3tLL/GIbw6ZMUZiFwDCg BqMCPh8Otpq/pvFKtRgn/JovEVQa6QrFlcV1Mvf/rzOxLNlD8Ckxf/U29JazoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678838835; a=rsa-sha256; cv=none; b=GOluGehc7m6TCKgqVoZKbdcjrtpVyYFeKNL1YBPbgr8Ra87GV70BvWsmxezp7pLmJvRS8K di2mPVF7c3qw9rVyTfrfgMNEnFu7kv9jxEkyxqrCnAHOgsds6hYP+VNi9I6LjJrL2p5Fsp 1scvzfzumupL4ETPu+1oC/5pkU1e6nrarrIyoX39UMNR/DpSXcA+kAl5LOv+23G7R2UkLT v3kp9wiNJE7hXCWwb+DlWLvHzBk6BPVPO49Glwj5U4Vua/VmeksLW9CWcliZlSYwsnx86B yfDhuNbpZvdP0qngpYpi+K2neRpcyO5kfwVModQzQ0Gvu4nRMohXevj004dlDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PbrLB6L4RzvSW; Wed, 15 Mar 2023 00:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32F07EgZ014551; Wed, 15 Mar 2023 00:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32F07Emn014550; Wed, 15 Mar 2023 00:07:14 GMT (envelope-from git) Date: Wed, 15 Mar 2023 00:07:14 GMT Message-Id: <202303150007.32F07Emn014550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 379954d06c1d - main - src.conf.5: Regen after ZFS-related options changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 379954d06c1d55276acb606a04f804924b94494a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=379954d06c1d55276acb606a04f804924b94494a commit 379954d06c1d55276acb606a04f804924b94494a Author: Jessica Clarke AuthorDate: 2023-03-15 00:06:52 +0000 Commit: Jessica Clarke 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: