Date: Fri, 4 Sep 2020 01:16:02 +0700 From: Eugene Grosbein <eugen@grosbein.net> To: John Baldwin <jhb@FreeBSD.org>, 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: <edac74ab-2210-e0f7-1026-0ed07f0ef54e@grosbein.net> In-Reply-To: <dfcf21e8-eb24-ec14-9b62-40eeaaf4a3bd@FreeBSD.org> References: <202009022136.082LatjO029946@repo.freebsd.org> <dfcf21e8-eb24-ec14-9b62-40eeaaf4a3bd@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
03.09.2020 4:47, John Baldwin wrote: > 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). buildworld is still broken for me at stable/11 amd64 r365304. Specifically, I build stable/11 for my PPPoE servers that use no IPSec as module nor have it in the kernel in any way. /etc/make.conf contains: MODULES_WITH_WORLD= KERNCONF?= PPPOE WITHOUT_LLVM_TARGET_ALL= WITH_LLVM_TARGET_X86= WITHOUT_CLANG_FULL= WITHOUT_LLDB= WITHOUT_KERNEL_SYMBOLS= WITHOUT_DEBUG_FILES= WITHOUT_TESTS= WITHOUT_INET6= It fails early: ... -------------------------------------------------------------- >>> stage 2.2: rebuilding the object tree -------------------------------------------------------------- ... ===> sys/modules/sysvipc/sysvmsg (obj) --- obj_subdir_sys/modules/tcp --- make[6]: "/home/src/sys/modules/tcp/Makefile" line 18: Malformed conditional (${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC}) make[6]: Fatal errors encountered -- cannot continue Rollback for both of r365270 and r365281 fixes this.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?edac74ab-2210-e0f7-1026-0ed07f0ef54e>