Date: Wed, 6 Jan 2021 10:20:02 +0100 From: "Hartmann, O." <o.hartmann@walstatt.org> To: "Kristof Provost" <kp@FreeBSD.org> Cc: 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: <20210106102002.5af4db05@hermann.fritz.box> In-Reply-To: <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> References: <202101052237.105MbsPa081440@gitrepo.freebsd.org> <20210106055051.51e28498@hermann.fritz.box> <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/b7U+sqDA68er+geJHYt+r_A Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Wed, 06 Jan 2021 07:28:27 +0100 "Kristof Provost" <kp@FreeBSD.org> wrote: > On 6 Jan 2021, at 5:50, Hartmann, O. wrote: > > On Tue, 5 Jan 2021 22:37:54 GMT > > Kristof Provost <kp@FreeBSD.org> wrote: > > =20 > >> The branch main has been updated by kp: > >> > >> URL:=20 > >> https://cgit.FreeBSD.org/src/commit/?id=3Dfda7daf06301beef1bdad3989123= 2a12c6925b22 > >> > >> commit fda7daf06301beef1bdad39891232a12c6925b22 > >> Author: Kristof Provost <kp@FreeBSD.org> > >> AuthorDate: 2020-12-24 15:02:04 +0000 > >> Commit: Kristof Provost <kp@FreeBSD.org> > >> CommitDate: 2021-01-05 22:35:37 +0000 > >> > >> pfctl: Stop sharing pf_ruleset.c with the kernel > >> > >> Now that we've split up the datastructures used by the kernel and > >> userspace there's essentually no more overlap between the=20 > >> pf_ruleset.c > >> code used by userspace and kernelspace. > >> > >> Copy the userspace bits to the pfctl directory and stop using the= =20 > >> kernel > >> file. > >> > >> Reviewed by: philip > >> MFC after: 2 weeks > >> Sponsored by: Orange Business Services > >> Differential Revision: https://reviews.freebsd.org/D27764 > >> --- > >> sbin/pfctl/Makefile | 3 - > >> sbin/pfctl/pf_ruleset.c | 343=20 > >> ++++++++++++++++++++++++++++++++++++++++++++ > >> sys/netpfil/pf/pf_ruleset.c | 286=20 > >> +----------------------------------- > >> 3 files changed, 349 insertions(+), 283 deletions(-) > >> =20 > > > > It seems that now make buildkernel fails (at least for me): > > > > > > [...] =20 > > =3D=3D=3D> lib/libelftc (all) =20 > > --- all_subdir_sbin --- > > /usr/src/sys/netpfil/pf/pf_ruleset.c:62:2: error: "Kernel only file.=20 > > Please use > > sbin/pfctl/pf_ruleset.c instead." #error "Kernel only file. Please use > > sbin/pfctl/pf_ruleset.c instead." ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:39: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor_global, =20 > > pf_anchors); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:1: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor_global, =20 > > pf_anchors); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:33: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor, =20 > > pf_main_anchor); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:1: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor, =20 > > pf_main_anchor); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:1: error: conflicting types=20 > > for 'VNET_DEFINE' > > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:1: note: previous declaration=20 > > is here > > VNET_DEFINE(struct pf_kanchor_global, pf_anchors); > > > > =20 > What architecture are you building for? What kernel config? Do you have=20 > anything in src.conf or make.conf? >=20 > Regards, > Kristof amd64. kernel config is custom, no debug, IPFW, MAC. pf is not used, we use IPFW. = make.conf has only port related stuff. src.conf looks like this: # CPUTYPE?=3D native # CFLAGS+=3D -O3 # for the kernel COPTFLAGS+=3D -O3 # #CXXFLAGS+=3D -std=3Dc++17 # WITH_CLANG_EXTRAS=3D YES WITH_LLDB=3D YES # #WITH_BSD_GREP=3D YES # WITH_OFED_EXTRA=3D YES WITH_NAND=3D YES #WITH_CTF=3D YES # WITH_NVME=3D YES # WITH_BEARSSL=3D YES #Build dynamically linked binaries as Position-Independent Executable (PIE) WITH_PIE=3D YES # WITH_SVN=3D YES # WITH_SORT_THREADS=3D YES # WITH_ZONEINFO_LEAPSECONDS_SUPPORT=3D YES # WITH_MALLOC_PRODUCTION=3D YES # WITHOUT_ASSERT_DEBUG=3D YES WITHOUT_TESTS=3D YES WITHOUT_DEBUG_FILES=3D YES # WITHOUT_CLEAN=3D YES # WITHOUT_REPRODUCIBLE_BUILD=3D YES # # KERNCONF=3D THOR KERNCONFDIR=3D /etc/config/amd64/kernel_conf/ # PORTS_MODULES=3D PORTS_MODULES+=3D x11/nvidia-driver PORTS_MODULES+=3D emulators/virtualbox-ose-kmod Kind regards and thanks in advance, oh --Sig_/b7U+sqDA68er+geJHYt+r_A Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCX/WAwgAKCRA4N1ZZPba5 R1TAAP42LhMBeBlkZOsJWr53+yU4P/3uc+lYA8wSOTMzqpeuFQD/QKQBAh4Tu8Uh oNVpE7vInwlg+ZIGI735tspitYPfLw4= =qJbp -----END PGP SIGNATURE----- --Sig_/b7U+sqDA68er+geJHYt+r_A--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210106102002.5af4db05>