From owner-dev-commits-src-all@freebsd.org Wed Jan 6 16:58:10 2021 Return-Path: Delivered-To: dev-commits-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 B167E4D6AEF; Wed, 6 Jan 2021 16:58:10 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9wXy4fb8z4Z15; Wed, 6 Jan 2021 16:58:10 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 7A947BEE9; Wed, 6 Jan 2021 16:58:10 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 91CA111351; Wed, 6 Jan 2021 17:58:08 +0100 (CET) From: "Kristof Provost" To: "Kyle Evans" Cc: "Cy Schubert" , "Hartmann, O." , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel Date: Wed, 06 Jan 2021 17:58:06 +0100 X-Mailer: MailMate (1.13.2r5673) Message-ID: <0FF4FD8F-8E07-4CBE-B370-A7D8B722C892@FreeBSD.org> In-Reply-To: References: <202101052237.105MbsPa081440@gitrepo.freebsd.org> <20210106055051.51e28498@hermann.fritz.box> <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> <20210106102002.5af4db05@hermann.fritz.box> <202101061430.106EU2Og058101@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 16:58:10 -0000 On 6 Jan 2021, at 16:45, Kyle Evans wrote: > On Wed, Jan 6, 2021 at 8:30 AM Cy Schubert > wrote: >> In message >> > om> >> , Kyle Evans writes: >>> On Wed, Jan 6, 2021, 03:22 Kristof Provost wrote: >>> >>>> On 6 Jan 2021, at 10:20, Hartmann, O. wrote: >>>>> >>>>> amd64. >>>>> kernel config is custom, no debug, IPFW, MAC. pf is not used, we >>>>> use >>>> IPFW. >>>> Please share your kernel config as well. >>>> >>>> Best regards, >>>> Kristof >>>> >>> I note that the original report says buildkernel, but the log >>> exercpt is >>> from buildworld. Looks like pf_ruleset.c kept the name, so this >>> needs a >>> dependency cleanup rule in tools/build to build the right one on >>> WITHOUT_CLEAN builds. >>> >> >> Yes, this is the problem. >> > > This should do, I think: > > diff --git a/tools/build/depend-cleanup.sh > b/tools/build/depend-cleanup.sh > index 8b249ccf55f..7d078f52c84 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -56,3 +56,6 @@ if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \ > echo "Removing old rescue(8) tree" > rm -rf "$OBJTOP"/rescue/rescue > fi > + > +# 20210105 fda7daf06301 pfctl gained its own version of > pf_ruleset.c > +clean_dep sbin/pfctl pf_ruleset c That doesn’t appear to be working here. Possibly because clean_dep only removes if there’s a .pico file, and the dependency file is .depend.pf_ruleset.o Bes regards, Kristof