Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 06 Jan 2021 08:11:56 -0800
From:      Cy Schubert <Cy.Schubert@cschubert.com>
To:        Kyle Evans <kevans@freebsd.org>
Cc:        Cy Schubert <Cy.Schubert@cschubert.com>, Kristof Provost <kp@freebsd.org>,  "Hartmann, O." <o.hartmann@walstatt.org>, src-committers <src-committers@freebsd.org>, 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
Message-ID:  <202101061611.106GBuf8085541@slippy.cwsent.com>
In-Reply-To: <CACNAnaFCKMW-szmEQWzTcGaHoTm_JL=fH0T6MyJOi3M6PvVDgA@mail.gmail.com>
References:  <202101052237.105MbsPa081440@gitrepo.freebsd.org>  <20210106055051.51e28498@hermann.fritz.box> <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> <20210106102002.5af4db05@hermann.fritz.box> <B3EE0BA5-33F9-410A-8957-DD8DF7A5B1B6@FreeBSD.org> <CACNAnaGFZOWCBeuK4wiY7ztSFu2y5cAw8JrT6O7ad56yh=n9Yw@mail.gmail.com> <202101061430.106EU2Og058101@slippy.cwsent.com> <CACNAnaFCKMW-szmEQWzTcGaHoTm_JL=fH0T6MyJOi3M6PvVDgA@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
In message <CACNAnaFCKMW-szmEQWzTcGaHoTm_JL=fH0T6MyJOi3M6PvVDgA@mail.gmail.c
om>
, Kyle Evans writes:
> On Wed, Jan 6, 2021 at 8:30 AM Cy Schubert <Cy.Schubert@cschubert.com> wrote:
> > In message <CACNAnaGFZOWCBeuK4wiY7ztSFu2y5cAw8JrT6O7ad56yh=n9Yw@mail.gmail.
> c
> > om>
> > , Kyle Evans writes:
> > > On Wed, Jan 6, 2021, 03:22 Kristof Provost <kp@freebsd.org> 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

We should add ncurses (for 821aa63a09402935da0a73abf20ba0441562aa07) here 
as well.


-- 
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy@nwtime.org>    Web:  https://nwtime.org

	The need of the many outweighs the greed of the few.





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101061611.106GBuf8085541>