git: c38e59ce1b0a - main - pfctl: Fix NOCLEAN build
Kristof Provost
kp at FreeBSD.org
Wed Jan 6 22:08:11 UTC 2021
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c38e59ce1b0a6c030a942d0814d581dbd7f67e3c
commit c38e59ce1b0a6c030a942d0814d581dbd7f67e3c
Author: Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-01-06 21:07:25 +0000
Commit: Kristof Provost <kp at FreeBSD.org>
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
More information about the dev-commits-src-main
mailing list