From owner-dev-commits-src-main@freebsd.org Wed Jan 6 15:45:48 2021 Return-Path: Delivered-To: dev-commits-src-main@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 F04FF4D47E5; Wed, 6 Jan 2021 15:45:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9txS6L1dz4TDj; Wed, 6 Jan 2021 15:45:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id C7695B6AF; Wed, 6 Jan 2021 15:45:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f182.google.com with SMTP id 143so2743675qke.10; Wed, 06 Jan 2021 07:45:48 -0800 (PST) X-Gm-Message-State: AOAM532Tzc7XSi9uEQTZz05/CRTjGXX/xdBvlKJxclf/15gwbKHRcBQ+ ysCFB8ULjFyygof9ru72FhVUFMJOvtf2cN21nQY= X-Google-Smtp-Source: ABdhPJw005AlOOEX0bU+Au8zbJki7B1ivxhpAXVM0y3KLnlhltxd9L/sPFyb0v5ao0TlbdtgAVGREXhMydHpCrBTfIo= X-Received: by 2002:a05:620a:14a:: with SMTP id e10mr4704953qkn.103.1609947948494; Wed, 06 Jan 2021 07:45:48 -0800 (PST) MIME-Version: 1.0 References: <202101052237.105MbsPa081440@gitrepo.freebsd.org> <20210106055051.51e28498@hermann.fritz.box> <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> <20210106102002.5af4db05@hermann.fritz.box> <202101061430.106EU2Og058101@slippy.cwsent.com> In-Reply-To: <202101061430.106EU2Og058101@slippy.cwsent.com> From: Kyle Evans Date: Wed, 6 Jan 2021 09:45:34 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel To: Cy Schubert Cc: Kyle Evans , Kristof Provost , "Hartmann, O." , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 15:45:49 -0000 On Wed, Jan 6, 2021 at 8:30 AM Cy Schubert wrote: > In message om> > , Kyle Evans writes: > > On Wed, Jan 6, 2021, 03:22 Kristof Provost 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