From owner-svn-src-all@freebsd.org Thu Sep 3 18:16:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F41713C6470; Thu, 3 Sep 2020 18:16:32 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:c2c:26d8::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8C36vjYz3YDh; Thu, 3 Sep 2020 18:16:30 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id 083IG8wK030393 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 3 Sep 2020 18:16:11 GMT (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: jhb@FreeBSD.org Received: from [10.58.0.10] (dadvw [10.58.0.10]) by eg.sd.rdtc.ru (8.16.1/8.16.1) with ESMTPS id 083IGBnt008373 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 4 Sep 2020 01:16:12 +0700 (+07) (envelope-from eugen@grosbein.net) 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 To: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org References: <202009022136.082LatjO029946@repo.freebsd.org> From: Eugene Grosbein Message-ID: Date: Fri, 4 Sep 2020 01:16:02 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_00,LOCAL_FROM, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record * -0.0 SPF_PASS SPF: sender matches SPF record * 2.6 LOCAL_FROM From my domains * -0.3 NICE_REPLY_A Looks like a legit reply (A) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 4Bj8C36vjYz3YDh X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=permerror (mx1.freebsd.org: domain of eugen@grosbein.net uses mechanism not recognized by this client) smtp.mailfrom=eugen@grosbein.net X-Spamd-Result: default: False [-1.74 / 15.00]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[eugen]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.87)[-0.868]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[grosbein.net]; NEURAL_HAM_MEDIUM(-0.91)[-0.911]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(0.14)[0.138]; R_SPF_PERMFAIL(0.00)[empty SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-stable-12,svn-src-stable,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:16:33 -0000 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.