Date: Wed, 06 Jan 2021 18:38:38 +0100 From: "Kristof Provost" <kp@FreeBSD.org> To: "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: <56DF787E-3BE8-473E-8B35-50DC594B682A@FreeBSD.org> In-Reply-To: <0FF4FD8F-8E07-4CBE-B370-A7D8B722C892@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>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6 Jan 2021, at 17:58, Kristof Provost wrote: > On 6 Jan 2021, at 16:45, Kyle Evans wrote: >> 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 > > 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 > I think clean_dep is intended for kernel use. This seems to work for me: diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 8b249ccf55fa..0b3ff9bcc635 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -56,3 +56,11 @@ 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 +if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o ] && \ + egrep -qw "sys/netpfil/pf/pf_ruleset.c" \ + "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o; then + echo "Removing old pf_ruleset dependecy file" + rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o +fi Best regards, Kristof From owner-dev-commits-src-all@freebsd.org Wed Jan 6 17:42:44 2021 Return-Path: <owner-dev-commits-src-all@freebsd.org> 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 284474D83CB; Wed, 6 Jan 2021 17:42:44 +0000 (UTC) (envelope-from mack@macktronics.com) Received: from mail.macktronics.com (coco.macktronics.com [209.181.253.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9xXM2vsgz4cwj; Wed, 6 Jan 2021 17:42:43 +0000 (UTC) (envelope-from mack@macktronics.com) Received: from olive.macktronics.com (unknown [209.181.253.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.macktronics.com (Postfix) with ESMTPS id 4027F1841; Wed, 6 Jan 2021 11:42:03 -0600 (CST) Date: Wed, 6 Jan 2021 11:42:03 -0600 (CST) From: Dan Mack <mack@macktronics.com> X-X-Sender: mack@localhost.local To: Cy Schubert <Cy.Schubert@cschubert.com> cc: Toomas Soome <tsoome@me.com>, Peter Jeremy <peter@rulingia.com>, Toomas Soome <tsoome@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3630506b9dae - main - loader: implement framebuffer console In-Reply-To: <alpine.GSO.2.20.2101061127460.66723@localhost.local> Message-ID: <alpine.GSO.2.20.2101061138230.66723@localhost.local> References: <202101022009.102K9PRl075016@gitrepo.freebsd.org> <X/WSFQ8jPbgto4jQ@server.rulingia.com> <51035B54-FF30-41EE-BC4A-3D4E0ABD1B13@me.com> <202101061724.106HOdv0002673@slippy.cwsent.com> <alpine.GSO.2.20.2101061127460.66723@localhost.local> User-Agent: Alpine 2.20 (GSO 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Rspamd-Queue-Id: 4D9xXM2vsgz4cwj X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=macktronics.com; spf=pass (mx1.freebsd.org: domain of mack@macktronics.com designates 209.181.253.65 as permitted sender) smtp.mailfrom=mack@macktronics.com X-Spamd-Result: default: False [-3.80 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.181.253.65:from]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.181.253.64/29:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SPAMHAUS_ZRD(0.00)[209.181.253.65:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[macktronics.com,none]; RCPT_COUNT_SEVEN(0.00)[7]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:209, ipnet:209.181.252.0/23, country:US]; FREEMAIL_CC(0.00)[me.com,rulingia.com,freebsd.org]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; RCVD_COUNT_TWO(0.00)[2] 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 <dev-commits-src-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>, <mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>; List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>, <mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 06 Jan 2021 17:42:44 -0000 On Wed, 6 Jan 2021, Dan Mack wrote: > On Wed, 6 Jan 2021, Cy Schubert wrote: > >> In message <51035B54-FF30-41EE-BC4A-3D4E0ABD1B13@me.com>, Toomas Soome >> writes: >>> >>> >>>> On 6. Jan 2021, at 12:33, Peter Jeremy <peter@rulingia.com> wrote: >>>> >>>> On 2021-Jan-02 20:09:25 +0000, Toomas Soome <tsoome@FreeBSD.org> wrote: >>>>> The branch main has been updated by tsoome: >>>>> >>>>> URL: >>>>> https://cgit.FreeBSD.org/src/commit/?id=3630506b9daec9167a89bc4525638 >>> ea45a00769e >>>> >>>> Note that this commit adds a hard build dependency on vtfontcvt(8) >>>> but that tool is depends on the WITH_VT build option. I suspect >>>> that stand/fonts should be likewise dependent on WITH_VT >>>> >>>> -- >>>> Peter Jeremy >>> >>> >>> Thanks for pointing this out. We actually need to build vtfontcvt >>> uncondition >>> ally, in addition to font files, we also need it to generate C code for >>> built >>> in font (used when there are no /boot/fonts). >> >> Is this why my consoles are blank during boot? My laptop is blank during >> boot until X starts. My three machines downstairs don't run X and remain >> blank. There is no way to enable the display. >> Sorry my reply got garbled ... My console is an hdmi connected monitor. The display works until FreeBSD boots and then it's just blank. Something is broke; I am doing full buildworld / buildkernel (GENERIC builds) from the tip of main. Dan > I noticed this as well. My test machine's HDMI connected console running > broken for a sec :-) > > I'm running FreeBSD 13.0-CURRENT (GENERIC) #6 main-c255603-g225afb6cad9: Tue > Jan 5 11:20:42 CST 2021 > > and still experiencing the issue. > > Dan > > > _______________________________________________ > dev-commits-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all > To unsubscribe, send any mail to > "dev-commits-src-all-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?56DF787E-3BE8-473E-8B35-50DC594B682A>