From owner-svn-src-all@FreeBSD.ORG Fri Mar 27 17:36:23 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD55717E; Fri, 27 Mar 2015 17:36:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EDF3972; Fri, 27 Mar 2015 17:36:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2RHaNUF077091; Fri, 27 Mar 2015 17:36:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2RHaNL8077090; Fri, 27 Mar 2015 17:36:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201503271736.t2RHaNL8077090@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 27 Mar 2015 17:36:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280766 - head/sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2015 17:36:23 -0000 Author: imp Date: Fri Mar 27 17:36:22 2015 New Revision: 280766 URL: https://svnweb.freebsd.org/changeset/base/280766 Log: Add a note of clarification. MK_* variables only control what modules are built by default. You can still override that with MODULES_EXTRA for experimental features like ZFS and dtrace on some architectures. Also note that kernel config files are not affected by MK_ options listed, though some targets might be. Modified: head/sys/conf/kern.opts.mk Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Fri Mar 27 17:15:17 2015 (r280765) +++ head/sys/conf/kern.opts.mk Fri Mar 27 17:36:22 2015 (r280766) @@ -51,6 +51,10 @@ __DEFAULT_NO_OPTIONS = \ # Some options are totally broken on some architectures. We disable # them. If you need to enable them on an experimental basis, you # must change this code. +# Note: These only apply to the list of modules we build by default +# and sometimes what is in the opt_*.h files by default. +# Kernel config files are unaffected, though some targets can be +# affected by KERNEL_SYMBOLS, FORMAT_EXTENSIONS, CTF and SSP. # Things that don't work based on the CPU .if ${MACHINE_CPUARCH} == "arm" @@ -75,34 +79,6 @@ BROKEN_OPTIONS+= EISA BROKEN_OPTIONS+= OFED .endif -# Options that cannot be turned on this architecture, usually because -# of compilation or other issues so severe it cannot be used even -# on an experimental basis -__ALWAYS_NO_OPTIONS= - -# Things that don't work based on the CPU -.if ${MACHINE_CPUARCH} == "arm" -__ALWAYS_NO_OPTIONS+= CDDL ZFS -.endif - -.if ${MACHINE_CPUARCH} == "mips" -__ALWAYS_NO_OPTIONS+= CDDL ZFS -.endif - -.if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpc64" -__ALWAYS_NO_OPTIONS+= ZFS -.endif - -# Things that don't work because the kernel doesn't have the support -# for them. -.if ${MACHINE} != "i386" -__ALWAYS_NO_OPTIONS+= EISA -.endif - -.if ${MACHINE} != "i386" && ${MACHINE} != "amd64" -__ALWAYS_NO_OPTIONS+= OFED -.endif - # expanded inline from bsd.mkopt.mk to avoid share/mk dependency # Those that default to yes @@ -148,16 +124,6 @@ MK_${var}:= no #end of bsd.mkopt.mk expanded inline. # -# MK_* options which are always no, usually because they are -# unsupported/badly broken on this architecture. -# -.for var in ${__ALWAYS_NO_OPTIONS} -MK_${var}:= no -.endfor -.undef __ALWAYS_NO_OPTIONS -#end of bsd.mkopt.mk expanded inline. - -# # MK_*_SUPPORT options which default to "yes" unless their corresponding # MK_* variable is set to "no". #