From owner-svn-src-all@freebsd.org Fri Oct 23 12:59:56 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 018C9A1D71A; Fri, 23 Oct 2015 12:59:56 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B2BAF9BA; Fri, 23 Oct 2015 12:59:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9NCxsmA071456; Fri, 23 Oct 2015 12:59:54 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NCxsC3071455; Fri, 23 Oct 2015 12:59:54 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201510231259.t9NCxsC3071455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 23 Oct 2015 12:59:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289828 - head/sys/modules 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.20 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, 23 Oct 2015 12:59:56 -0000 Author: emaste Date: Fri Oct 23 12:59:54 2015 New Revision: 289828 URL: https://svnweb.freebsd.org/changeset/base/289828 Log: Move dtrace/opensolaris/zfs module option to common section These are not target-specific modules, so the logic to build them should be common. This also enables them for arm64. Sponsored by: The FreeBSD Foundation Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Fri Oct 23 12:20:35 2015 (r289827) +++ head/sys/modules/Makefile Fri Oct 23 12:59:54 2015 (r289828) @@ -98,7 +98,6 @@ SUBDIR= \ ${_dpt} \ ${_drm} \ ${_drm2} \ - ${_dtrace} \ dummynet \ ${_ed} \ ${_elink} \ @@ -268,7 +267,6 @@ SUBDIR= \ ${_nvme} \ ${_nvram} \ ${_nxge} \ - ${_opensolaris} \ oce \ otus \ otusfw \ @@ -394,13 +392,20 @@ SUBDIR= \ ${_x86bios} \ ${_xe} \ xl \ - ${_zfs} \ zlib .if ${MK_AUTOFS} != "no" || defined(ALL_MODULES) _autofs= autofs .endif +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \ + ${MACHINE_CPUARCH} != "sparc64" +SUBDIR+= dtrace +.endif +SUBDIR+= opensolaris +.endif + .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto @@ -479,6 +484,10 @@ _txp= txp _cxgbe= cxgbe .endif +.if ${MK_ZFS} != "no" || defined(ALL_MODULES) +SUBDIR+= zfs +.endif + .if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \ ${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc" _syscons= syscons @@ -509,9 +518,6 @@ _cs= cs _dpms= dpms _drm= drm _drm2= drm2 -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_dtrace= dtrace -.endif _ed= ed _em= em _ep= ep @@ -537,9 +543,6 @@ _linux= linux _linuxkpi= linuxkpi .endif _ndis= ndis -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_opensolaris= opensolaris -.endif _pccard= pccard .if ${MK_OFED} != "no" || defined(ALL_MODULES) _rdma= rdma @@ -555,9 +558,6 @@ _vxge= vxge _wbwd= wbwd _wi= wi _xe= xe -.if ${MK_ZFS} != "no" || defined(ALL_MODULES) -_zfs= zfs -.endif .if ${MACHINE} != "pc98" _aac= aac _aacraid= aacraid @@ -716,23 +716,14 @@ _cbb= cbb _cfi= cfi _cpufreq= cpufreq _drm= drm -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_dtrace= dtrace -.endif _exca= exca _nvram= powermac_nvram -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_opensolaris= opensolaris -.endif _pccard= pccard _wi= wi .endif .if ${MACHINE_ARCH} == "powerpc64" _drm2= drm2 -.if ${MK_ZFS} != "no" || defined(ALL_MODULES) -_zfs= zfs -.endif .endif .if ${MACHINE_CPUARCH} == "sparc64" @@ -740,12 +731,6 @@ _auxio= auxio _em= em _epic= epic _igb= igb -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_opensolaris= opensolaris -.endif -.if ${MK_ZFS} != "no" || defined(ALL_MODULES) -_zfs= zfs -.endif .endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"