Date: Wed, 2 Sep 2020 14:47:06 -0700 From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: Re: svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp Message-ID: <dfcf21e8-eb24-ec14-9b62-40eeaaf4a3bd@FreeBSD.org> In-Reply-To: <202009022136.082LatjO029946@repo.freebsd.org> References: <202009022136.082LatjO029946@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 9/2/20 2:36 PM, John Baldwin wrote: > Author: jhb > Date: Wed Sep 2 21:36:55 2020 > New Revision: 365281 > URL: https://svnweb.freebsd.org/changeset/base/365281 > > Log: > MFC 361638,361712: Only build ipsec modules for kernels with IPSEC_SUPPORT. > > 361638: > Only build ipsec modules if the kernel includes IPSEC_SUPPORT. > > Honoring the kernel-supplied opt_ipsec.h in r361632 causes builds of > ipsec modules to fail if the kernel doesn't include IPSEC_SUPPORT. > However, the module can never be loaded into such a kernel, so only > build the modules if the kernel includes IPSEC_SUPPORT. > > 361712: (kevans) > modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC > > IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, > not both. Refrain from building if IPSEC is set, as the resulting module > won't be able to load anyways if it's built into the kernel. > > KERN_OPTS is safe here; for tied modules, it will reflect the kernel > configuration. For untied modules, it will defer to whatever is set in > ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter > situation has some risk to it for uncommon scenarios, but such is the life > of untied kernel modules. This should fix the build breakage from r365270 (sorry). -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?dfcf21e8-eb24-ec14-9b62-40eeaaf4a3bd>