svn commit: r365270 - in stable: 11/sys/conf 11/sys/modules/ipsec 11/sys/modules/tcp/tcpmd5 12/sys/conf 12/sys/modules/ipsec 12/sys/modules/tcp/tcpmd5

[John Baldwin]

Author: jhb
Date: Wed Sep  2 19:02:48 2020
New Revision: 365270
URL: https://svnweb.freebsd.org/changeset/base/365270

Log:
  MFC 361632: Honor opt_ipsec.h from kernel builds.
  
  To make this simpler, set the default contents of opt_ipsec.h
  for standalone modules in sys/conf/config.mk.

Modified:
  stable/12/sys/conf/config.mk
  stable/12/sys/modules/ipsec/Makefile
  stable/12/sys/modules/tcp/tcpmd5/Makefile
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/conf/config.mk
  stable/11/sys/modules/ipsec/Makefile
  stable/11/sys/modules/tcp/tcpmd5/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/conf/config.mk
==============================================================================
--- stable/12/sys/conf/config.mk	Wed Sep  2 18:44:01 2020	(r365269)
+++ stable/12/sys/conf/config.mk	Wed Sep  2 19:02:48 2020	(r365270)
@@ -19,6 +19,8 @@ opt_inet.h:
 opt_inet6.h:
 	@echo "#define INET6 1" > ${.TARGET}
 .endif
+opt_ipsec.h:
+	@echo "#define IPSEC_SUPPORT 1" > ${.TARGET}
 .if ${MK_RATELIMIT} != "no"
 opt_ratelimit.h:
 	@echo "#define RATELIMIT 1" > ${.TARGET}

Modified: stable/12/sys/modules/ipsec/Makefile
==============================================================================
--- stable/12/sys/modules/ipsec/Makefile	Wed Sep  2 18:44:01 2020	(r365269)
+++ stable/12/sys/modules/ipsec/Makefile	Wed Sep  2 19:02:48 2020	(r365270)
@@ -8,7 +8,4 @@ SRCS=	if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ip
 	opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h 
 SRCS.INET=	udpencap.c
 
-opt_ipsec.h:
-	@echo "#define IPSEC_SUPPORT 1" > ${.TARGET}
-
 .include <bsd.kmod.mk>

Modified: stable/12/sys/modules/tcp/tcpmd5/Makefile
==============================================================================
--- stable/12/sys/modules/tcp/tcpmd5/Makefile	Wed Sep  2 18:44:01 2020	(r365269)
+++ stable/12/sys/modules/tcp/tcpmd5/Makefile	Wed Sep  2 19:02:48 2020	(r365270)
@@ -5,7 +5,4 @@
 KMOD=   tcpmd5
 SRCS=   xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h
 
-opt_ipsec.h:
-	@echo "#define IPSEC_SUPPORT 1" > ${.TARGET}
-
 .include <bsd.kmod.mk>