From owner-svn-src-all@FreeBSD.ORG Fri Oct 18 09:17:36 2013 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DBC20F9; Fri, 18 Oct 2013 09:17:36 +0000 (UTC) (envelope-from trasz@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AEE7A2E81; Fri, 18 Oct 2013 09:17:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9I9HaLe033300; Fri, 18 Oct 2013 09:17:36 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9I9HaUS033287; Fri, 18 Oct 2013 09:17:36 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201310180917.r9I9HaUS033287@svn.freebsd.org> From: Edward Tomasz Napierala Date: Fri, 18 Oct 2013 09:17:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256725 - in head/sys/modules: . cxgb cxgbe 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.14 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, 18 Oct 2013 09:17:36 -0000 Author: trasz Date: Fri Oct 18 09:17:35 2013 New Revision: 256725 URL: http://svnweb.freebsd.org/changeset/base/256725 Log: Don't build krping.ko, iw_cxgb.ko, and iw_cxgbe.ko, if MK_OFED=no (the default). They build, but are unloadable, due to missing ibcore.ko. Sponsored by: FreeBSD Foundation Modified: head/sys/modules/Makefile head/sys/modules/cxgb/Makefile head/sys/modules/cxgbe/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Fri Oct 18 09:14:19 2013 (r256724) +++ head/sys/modules/Makefile Fri Oct 18 09:17:35 2013 (r256725) @@ -532,7 +532,9 @@ _opensolaris= opensolaris _pccard= pccard _pcfclock= pcfclock _pst= pst +.if ${MK_OFED} != "no" || defined(ALL_MODULES) _rdma= rdma +.endif _safe= safe _sbni= sbni _scsi_low= scsi_low @@ -743,7 +745,9 @@ _pccard= pccard _qlxge= qlxge _qlxgb= qlxgb _qlxgbe= qlxgbe +.if ${MK_OFED} != "no" || defined(ALL_MODULES) _rdma= rdma +.endif _s3= s3 _safe= safe _scsi_low= scsi_low Modified: head/sys/modules/cxgb/Makefile ============================================================================== --- head/sys/modules/cxgb/Makefile Fri Oct 18 09:14:19 2013 (r256724) +++ head/sys/modules/cxgb/Makefile Fri Oct 18 09:17:35 2013 (r256725) @@ -1,4 +1,7 @@ # $FreeBSD$ + +.include + SUBDIR= cxgb SUBDIR+= cxgb_t3fw SUBDIR+= ${_tom} @@ -6,7 +9,9 @@ SUBDIR+= ${_iw_cxgb} .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _tom= tom +.if ${MK_OFED} != "no" || defined(ALL_MODULES) _iw_cxgb= iw_cxgb .endif +.endif .include Modified: head/sys/modules/cxgbe/Makefile ============================================================================== --- head/sys/modules/cxgbe/Makefile Fri Oct 18 09:14:19 2013 (r256724) +++ head/sys/modules/cxgbe/Makefile Fri Oct 18 09:17:35 2013 (r256725) @@ -2,6 +2,8 @@ # $FreeBSD$ # +.include + SUBDIR = if_cxgbe SUBDIR+= t4_firmware SUBDIR+= t5_firmware @@ -10,12 +12,13 @@ SUBDIR+= ${_iw_cxgbe} .if ${MACHINE_CPUARCH} == "amd64" _tom= tom +.if ${MK_OFED} != "no" || defined(ALL_MODULES) _iw_cxgbe= iw_cxgbe .endif +.endif .if ${MACHINE_CPUARCH} == "i386" _tom= tom .endif - .include