Date: Wed, 6 Jan 2021 20:34:59 +0100 From: Florian Smeets <flo@smeets.xyz> To: Kristof Provost <kp@FreeBSD.org>, Kyle Evans <kevans@freebsd.org> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, "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: <65d8ccf2-8852-c213-a7b1-c12d5742a3b7@smeets.xyz> In-Reply-To: <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> 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> <0FF4FD8F-8E07-4CBE-B370-A7D8B722C892@FreeBSD.org> <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --algA4P4ldKajvFrGnr91UIR6z0103Ve0w Content-Type: multipart/mixed; boundary="Gkwdnw31itBexB3mOeKaEmvcQ10GcCibX"; protected-headers="v1" From: Florian Smeets <flo@smeets.xyz> To: Kristof Provost <kp@FreeBSD.org>, Kyle Evans <kevans@freebsd.org> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, "Hartmann, O." <o.hartmann@walstatt.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <65d8ccf2-8852-c213-a7b1-c12d5742a3b7@smeets.xyz> Subject: Re: git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel 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> <0FF4FD8F-8E07-4CBE-B370-A7D8B722C892@FreeBSD.org> <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> In-Reply-To: <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> --Gkwdnw31itBexB3mOeKaEmvcQ10GcCibX Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 06.01.21 18:38, Kristof Provost wrote: > I think clean_dep is intended for kernel use. This seems to work for me= : >=20 > =C2=A0=C2=A0=C2=A0=C2=A0diff --git a/tools/build/depend-cleanup.sh > b/tools/build/depend-cleanup.sh > =C2=A0=C2=A0=C2=A0=C2=A0index 8b249ccf55fa..0b3ff9bcc635 100755 > =C2=A0=C2=A0=C2=A0=C2=A0--- a/tools/build/depend-cleanup.sh > =C2=A0=C2=A0=C2=A0=C2=A0+++ b/tools/build/depend-cleanup.sh > =C2=A0=C2=A0=C2=A0=C2=A0@@ -56,3 +56,11 @@ if [ -e "$OBJTOP"/rescue/res= cue/rescue.c ] && \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo= "Removing old rescue(8) tree" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm -= rf "$OBJTOP"/rescue/rescue > =C2=A0=C2=A0=C2=A0=C2=A0 fi > =C2=A0=C2=A0=C2=A0=C2=A0+ > =C2=A0=C2=A0=C2=A0=C2=A0+# 20210105=C2=A0 fda7daf06301=C2=A0=C2=A0 pfct= l gained its own version of > pf_ruleset.c > =C2=A0=C2=A0=C2=A0=C2=A0+if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_rulese= t.o ] && \ > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0 egrep -qw "sys/netpfil/pf/p= f_ruleset.c" \ > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0 "$OBJTOP"/sbin/pfctl/.depen= d.pf_ruleset.o; then > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo "Rem= oving old pf_ruleset dependecy file" > =C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm -rf "$= OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o > =C2=A0=C2=A0=C2=A0=C2=A0+fi >=20 Yeah, that works for me, on a system where it failed with the previously mentioned error message. Thansk, Florian --Gkwdnw31itBexB3mOeKaEmvcQ10GcCibX-- --algA4P4ldKajvFrGnr91UIR6z0103Ve0w Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEE7LNouHkIv7aRTXJp71uk3NWp88AFAl/2EOMFAwAAAAAACgkQ71uk3NWp88A1 HBAAoJvOuFN3JZpX83A1KiG/mSA6E9dbqNGuUkwpEyTjSTc7YJC8qzgSDbCF1XFvFoDf1Lo1iYBW UVfJU2bbKaALmO9dwr+G3ye1vTYXCetTUfMckIBH9oMKzYvfIGus5PrG6IT79Rh6v4aSHoNZzIGs dDJjDNm2Q2AxIM9J7jGAwkjFuIgFvl6IRP/UbdGGKXzrAv9UPvEnSaSM6QMmQdvTIaF4lF3jTZVX dqEKoPympsiCqec6fuMRVP6306U42S58iJImI8PAPy+aNJtQ3jOfKF8a0iY+8MZSsaDFeqjFo6A/ tI3ih2kvChQZMPaigq2ZiSoUKz2lyPj+s4JxKcgR0aIzD3BbyNEauILYDtgZHe7joMXM8Rn7tXFw earfJdEli5lNHsFpvkuHzZGRHVDkEYoiiRXQHw5K7eTg4LTUJsHcNj5NV7/en1WOCv14AvJ+vDiO 4zjr3tJQgNAy8jTpLx8Eepjhpn2Ov6cRVL/zGvMfODiwI96P42uavwrjGhWdnZB3ppC641Y0LID1 NHQuveE48FY7vJiHN5uzp/2vKR0MYrqJwe2DFzwr4wrq96/6vUmcDFqJqf1va8vRbfZc1dwCmJ13 jAovt3YBO8pjldqmw+8wagkGexF65t7ecYgb4hnhbIhQyzQbM389N925+2uu0fWaLf6dLJkk8vZU Vw8= =CIyy -----END PGP SIGNATURE----- --algA4P4ldKajvFrGnr91UIR6z0103Ve0w--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?65d8ccf2-8852-c213-a7b1-c12d5742a3b7>