From owner-svn-src-stable@freebsd.org Thu Jun 1 08:25:47 2017 Return-Path: Delivered-To: svn-src-stable@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 0A952BF16BF; Thu, 1 Jun 2017 08:25:47 +0000 (UTC) (envelope-from tuexen@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 CC9586E8E3; Thu, 1 Jun 2017 08:25:46 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v518PkCB022801; Thu, 1 Jun 2017 08:25:46 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v518PjHl022799; Thu, 1 Jun 2017 08:25:45 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201706010825.v518PjHl022799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Thu, 1 Jun 2017 08:25:45 +0000 (UTC) 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 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2017 08:25:47 -0000 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