git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel

[Cy Schubert]

In message <CACNAnaFCKMW-szmEQWzTcGaHoTm_JL=fH0T6MyJOi3M6PvVDgA at mail.gmail.c
om>
, Kyle Evans writes:
> On Wed, Jan 6, 2021 at 8:30 AM Cy Schubert <Cy.Schubert at cschubert.com> wrote:
> > In message <CACNAnaGFZOWCBeuK4wiY7ztSFu2y5cAw8JrT6O7ad56yh=n9Yw at mail.gmail.
> c
> > om>
> > , Kyle Evans writes:
> > > On Wed, Jan 6, 2021, 03:22 Kristof Provost <kp at 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 at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy at nwtime.org>    Web:  https://nwtime.org

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