From nobody Fri Mar 10 14:14:23 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 4PY7N01fpBz3xZLX; Fri, 10 Mar 2023 14:14:24 +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 4PY7N015BHz3nQY; Fri, 10 Mar 2023 14:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678457664; 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=JuOAAZVVdU7ZccQtvgKlZQrjbAt06DKngPFmThOJMLw=; b=hlaUQISmOluDzofYI691XUI86/PHLNcybs/prfETgSXDSlu1F4a1N7OG14lxu8MOmyLw7r YC4byy9+oDx7p6EcPLaLs8LOP57gGUxMWTX6PuCcTHEk/QRdDrkfjimlJJ9kHaJbBWc0SJ d45eqnrebXyQd1nAwpDiNjRXgHf7gK854M0n2TfefEYz1jYOBVOmCWJzUjnMjSn3WnTJo8 UAjvTTB9Kq6716MGMbMOE6mR19HZnPQSBjJFgIUYCs8iumUJqZe+o84hK0KdrMxpcsYEqT Yk0Fwp/+8vf5h3DVIYh3rhy29mOqw6EqWn/WhWQ9MuxedSkDC1JRtCQYnkCfmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678457664; 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=JuOAAZVVdU7ZccQtvgKlZQrjbAt06DKngPFmThOJMLw=; b=boHexNTsXQVxSoHGSqB45ccYnRVSbGynvqYvrK/NPJyDpv6e61IjkJdjtXEJsRzgPQuCoO kB6wvtWX+0klS/x83IYGhVaZz4hCaF/WfLbue3hctKu5vit7CWmAnpwsTRUrsIfzT2Mp7F dm2Gn94//BsPxlH4b1cwRFUtnHfX5VhzKeG4CinwlxN5tZIdmCNrpke34WDt3/ML6patU2 2GbHjuWCNMR9ct1AWrDE8cZeWNxH45Uo7HJfGAjeLpryDyOV1bC1MfNVMbP7uVt2V8HpiT gADnQI6AlgdTGXqBofQjPpNnuT7+o7RvBrVf0OjCYaFcm85MaqkT7jcLv9Fg7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678457664; a=rsa-sha256; cv=none; b=xvnNHaHiBxtSaDb+KMem6/hkd/xihZYH9/bM4rgnY9ej2SbrlLAPOLnxyl3ofCRNUwEQgV zfim9VZRSxCTcnBQrxo65++dCr5hoaabdibzeSUReS+Q2BAA1C6A7y11ptxJS7Om8rqGOK YVOLBBdE/liR4enb1TrRiKk8e7YP3JHK65s6nKhPc/TMXi+TSLLdVv7W1Wd83+NYLWZ2Jm iYTaSfZFXkUlb93KaNeSFgcJsGmF0uqSl6g3IhGHhHdDou+kJ6buZsb50HmOEC44a6CK0K 5XkD2V0hgsIdw9YKQxmD3kDG5ehKx5AssdlTtZpf20aZo9olwcJGaFA3UHsCKA== 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 4PY7N0074bzrdp; Fri, 10 Mar 2023 14:14:24 +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 32AEEN5c072506; Fri, 10 Mar 2023 14:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AEENtt072505; Fri, 10 Mar 2023 14:14:23 GMT (envelope-from git) Date: Fri, 10 Mar 2023 14:14:23 GMT Message-Id: <202303101414.32AEENtt072505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9503d2704ca6 - main - opts: Minor cleanup of ZFS options 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9503d2704ca62293aca96642caa7922ec036e9ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9503d2704ca62293aca96642caa7922ec036e9ed commit 9503d2704ca62293aca96642caa7922ec036e9ed Author: Warner Losh AuthorDate: 2023-03-10 13:55:11 +0000 Commit: Warner Losh CommitDate: 2023-03-10 14:14:04 +0000 opts: Minor cleanup of ZFS options Remove redundant CPUARCH test: we really just want a plain MACHINE_ARCH here. Second, always turn off LOADER_ZFS when we turn off ZFS. Not 100% required, but we did it some places and not others. There's no current mechanism to say that if X is disabled then X_Y must be too. Sponsored by: Netflix --- share/mk/src.opts.mk | 5 +++-- sys/conf/kern.opts.mk | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7e477a24c61b..d9030f982f16 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -355,9 +355,9 @@ __DEFAULT_NO_OPTIONS+=OPENMP BROKEN_OPTIONS+= OFED .endif - +# ZFS is broken on 32-bit powerpc, but works on 64-bit .if ${__T} == "powerpc" -BROKEN_OPTIONS+= ZFS +BROKEN_OPTIONS+= ZFS LOADER_ZFS .endif .include @@ -419,6 +419,7 @@ MK_KERBEROS:= no MK_KERBEROS_SUPPORT:= no MK_LDNS:= no MK_PKGBOOTSTRAP:= no +MK_LOADER_ZFS:= no MK_ZFS:= no .endif diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index c7587b7728d7..dee19a346bec 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -78,7 +78,8 @@ __DEFAULT_NO_OPTIONS = \ BROKEN_OPTIONS+= INIT_ALL_ZERO .endif -.if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} == "powerpc" +# ZFS is broken on 32-bit powerpc +.if ${MACHINE_ARCH} == "powerpc" BROKEN_OPTIONS+= ZFS .endif