Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Jun 2017 08:25:45 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r319398 - in stable/11/sys/modules: . tcp
Message-ID:  <201706010825.v518PjHl022799@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Thu Jun  1 08:25:45 2017
New Revision: 319398
URL: https://svnweb.freebsd.org/changeset/base/319398

Log:
  MFC r316038:
  
  Tweak the Makefiles a bit to allow using "tcp" in MODULES_OVERRIDE
  to build the tcp modules.

Added:
  stable/11/sys/modules/tcp/Makefile
     - copied unchanged from r316038, head/sys/modules/tcp/Makefile
Modified:
  stable/11/sys/modules/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/modules/Makefile
==============================================================================
--- stable/11/sys/modules/Makefile	Thu Jun  1 08:19:45 2017	(r319397)
+++ stable/11/sys/modules/Makefile	Thu Jun  1 08:25:45 2017	(r319398)
@@ -365,9 +365,8 @@ SUBDIR=	\
 	${_sym} \
 	${_syscons} \
 	sysvipc \
+	tcp \
 	${_ti} \
-	${_tcp_fastpath} \
-	${_tcpmd5} \
 	tl \
 	tmpfs \
 	${_toecore} \
@@ -449,10 +448,6 @@ _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
@@ -463,7 +458,6 @@ _if_gre=	if_gre
 _ipfw_pmod=	ipfw_pmod
 .if ${MK_IPSEC_SUPPORT} != "no"
 _ipsec=		ipsec
-_tcpmd5=	tcp/tcpmd5
 .endif
 .endif
 

Copied: stable/11/sys/modules/tcp/Makefile (from r316038, head/sys/modules/tcp/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/sys/modules/tcp/Makefile	Thu Jun  1 08:25:45 2017	(r319398, copy of r316038, head/sys/modules/tcp/Makefile)
@@ -0,0 +1,23 @@
+#
+# $FreeBSD$
+#
+
+SYSDIR?=${SRCTOP}/sys
+.include "${SYSDIR}/conf/kern.opts.mk"
+
+SUBDIR=	\
+	${_tcp_fastpath} \
+	${_tcpmd5} \
+
+.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES)
+_tcp_fastpath=	fastpath
+.endif
+
+.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
+	defined(ALL_MODULES)
+.if ${MK_IPSEC_SUPPORT} != "no"
+_tcpmd5=	tcpmd5
+.endif
+.endif
+
+.include <bsd.subdir.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706010825.v518PjHl022799>