svn commit: r256725 - in head/sys/modules: . cxgb cxgbe

[Edward Tomasz Napierala]

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 <bsd.own.mk>
+
 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 <bsd.subdir.mk>

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 <bsd.own.mk>
+
 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 <bsd.subdir.mk>