On 6/1/20 5:32 PM, Kyle Evans wrote: > Author: kevans > Date: Tue Jun 2 00:32:36 2020 > New Revision: 361712 > URL: https://svnweb.freebsd.org/changeset/base/361712 > > Log: > 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. > > Reported by: jenkins (a lot), O. Hartmann (once) > Generally discussed with: imp, jhb > > Modified: > head/sys/modules/Makefile > head/sys/modules/tcp/Makefile > > Modified: head/sys/modules/Makefile > ============================================================================== > --- head/sys/modules/Makefile Tue Jun 2 00:03:26 2020 (r361711) > +++ head/sys/modules/Makefile Tue Jun 2 00:32:36 2020 (r361712) > @@ -427,7 +427,7 @@ _if_enc= if_enc > _if_gif= if_gif > _if_gre= if_gre > _ipfw_pmod= ipfw_pmod > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} > _ipsec= ipsec > .endif > .endif > > Modified: head/sys/modules/tcp/Makefile > ============================================================================== > --- head/sys/modules/tcp/Makefile Tue Jun 2 00:03:26 2020 > (r361711) > +++ head/sys/modules/tcp/Makefile Tue Jun 2 00:32:36 2020 > (r361712) > @@ -16,7 +16,7 @@ _tcp_rack= rack > > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > defined(ALL_MODULES) > -.if ${KERN_OPTS:MIPSEC_SUPPORT} > +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC}
Thanks. Was finally getting back to this this morning. This one should be TCP_SIGNATURE, not IPSEC. (This would break for a kernel which doesn't have IPSEC but does have TCP_SIGNATURE.) -- John Baldwin _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
