aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristof Provost <kp@FreeBSD.org>2021-01-06 21:07:25 +0000
committerKristof Provost <kp@FreeBSD.org>2021-01-06 21:07:46 +0000
commitc38e59ce1b0a6c030a942d0814d581dbd7f67e3c (patch)
tree2d798072f5efd03c6417834a0a29779993ab3f3c
parentca71c7e3bb0a1589a3100a2f7a90d463ae7694c8 (diff)
downloadsrc-c38e59ce1b0a6c030a942d0814d581dbd7f67e3c.tar.gz
src-c38e59ce1b0a6c030a942d0814d581dbd7f67e3c.zip
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
-rwxr-xr-xtools/build/depend-cleanup.sh8
1 files changed, 8 insertions, 0 deletions
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