svn commit: r301814 - in head/sys: conf modules

[Jonathan T. Looney]

Author: jtl
Date: Fri Jun 10 19:06:11 2016
New Revision: 301814
URL: https://svnweb.freebsd.org/changeset/base/301814

Log:
  Change the default build behavior so we don't compile extra TCP modules by
  default. At least initially, the feature to support multiple TCP stacks is
  aimed at supporting advanced use cases and TCP development, but it is not
  necessarily aimed at a wide audience. Therefore, there is no need to build
  and install the extra TCP stacks by default. Instead, the people who are
  using or developing this functionality can add the extra option to build/
  install the extra TCP stacks.
  
  However, we do want to build the extra TCP stacks as part of test builds
  (e.g. LINT or tinderbox) to ensure that developers who are testing their
  changes will know that their changes do not break the additional TCP
  stack modules.
  
  After this change, a user will need to add WITH_EXTRA_TCP_STACKS=1 to
  make.conf or the kernel config in order to build the extra TCP modules.
  
  Differential Revision:	https://reviews.freebsd.org/D6795
  Reviewed by:	sjg
  Approved by:	re (kib)

Modified:
  head/sys/conf/kern.opts.mk
  head/sys/conf/kern.post.mk
  head/sys/modules/Makefile

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk	Fri Jun 10 18:47:11 2016	(r301813)
+++ head/sys/conf/kern.opts.mk	Fri Jun 10 19:06:11 2016	(r301814)
@@ -45,6 +45,7 @@ __DEFAULT_YES_OPTIONS = \
 
 __DEFAULT_NO_OPTIONS = \
     EISA \
+    EXTRA_TCP_STACKS \
     NAND \
     OFED
 

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Fri Jun 10 18:47:11 2016	(r301813)
+++ head/sys/conf/kern.post.mk	Fri Jun 10 19:06:11 2016	(r301814)
@@ -23,6 +23,10 @@ MKMODULESENV+=	CONF_CFLAGS="${CONF_CFLAG
 MKMODULESENV+=	WITH_CTF="${WITH_CTF}"
 .endif
 
+.if defined(WITH_EXTRA_TCP_STACKS)
+MKMODULESENV+=	WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}"
+.endif
+
 # Allow overriding the kernel debug directory, so kernel and user debug may be
 # installed in different directories. Setting it to "" restores the historical
 # behavior of installing debug files in the kernel directory.

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri Jun 10 18:47:11 2016	(r301813)
+++ head/sys/modules/Makefile	Fri Jun 10 19:06:11 2016	(r301814)
@@ -353,7 +353,7 @@ SUBDIR=	\
 	${_syscons} \
 	sysvipc \
 	${_ti} \
-	tcp/fastpath \
+	${_tcp_fastpath} \
 	tests/framework \
 	tests/callout_test \
 	tl \
@@ -436,6 +436,10 @@ _random_other=	random_other
 SUBDIR+=	cuse
 .endif
 
+.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES)
+_tcp_fastpath=	tcp/fastpath
+.endif
+
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=		carp