From owner-dev-commits-src-main@freebsd.org Wed Jan 6 22:08:11 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 54F064E08EE; Wed, 6 Jan 2021 22:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DB3Qg21gBz3N08; Wed, 6 Jan 2021 22:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 386CE25C4F; Wed, 6 Jan 2021 22:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 106M8Bma004130; Wed, 6 Jan 2021 22:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 106M8B9W004129; Wed, 6 Jan 2021 22:08:11 GMT (envelope-from git) Date: Wed, 6 Jan 2021 22:08:11 GMT Message-Id: <202101062208.106M8B9W004129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c38e59ce1b0a - main - pfctl: Fix NOCLEAN build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c38e59ce1b0a6c030a942d0814d581dbd7f67e3c Auto-Submitted: auto-generated 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 22:08:11 -0000 The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c38e59ce1b0a6c030a942d0814d581dbd7f67e3c commit c38e59ce1b0a6c030a942d0814d581dbd7f67e3c Author: Kristof Provost AuthorDate: 2021-01-06 21:07:25 +0000 Commit: Kristof Provost CommitDate: 2021-01-06 21:07:46 +0000 pfctl: Fix NOCLEAN build We've created a new pf_ruleset.c file for pfctl and no longer use the kernel vrsion, but the build system doesn't handle this dependency change correctly. Delete the dependency file if it contains the kernel version of the file. MFC after: 2 weeks --- tools/build/depend-cleanup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) 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