From 9503d2704ca62293aca96642caa7922ec036e9ed Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 10 Mar 2023 06:55:11 -0700 Subject: [PATCH] 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