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
This commit is contained in:
parent
c13e414dc2
commit
f45b131296
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=361712
@ -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
|
||||
|
@ -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}
|
||||
_tcpmd5= tcpmd5
|
||||
.endif
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user