Module Name: src
Committed By: rjs
Date: Wed Sep 12 19:20:38 UTC 2012
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/tests: mi
src/usr.sbin/npf: Makefile
Log Message:
Allow build with MKRUMP=no.
To generate a diff of this commit:
cvs rdiff -u -r1.1004 -r1.1005 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.492 -r1.493 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1004 src/distrib/sets/lists/base/mi:1.1005
--- src/distrib/sets/lists/base/mi:1.1004 Wed Sep 12 14:07:51 2012
+++ src/distrib/sets/lists/base/mi Wed Sep 12 19:20:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1004 2012/09/12 14:07:51 martin Exp $
+# $NetBSD: mi,v 1.1005 2012/09/12 19:20:37 rjs Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1352,7 +1352,7 @@
./usr/sbin/nfsd base-nfsserver-bin
./usr/sbin/nfsiod base-obsolete obsolete
./usr/sbin/npfctl base-npf-bin npf
-./usr/sbin/npftest base-npf-bin npf
+./usr/sbin/npftest base-npf-bin npf,rump
./usr/sbin/nsec3hash base-bind-bin
./usr/sbin/nslookup base-obsolete obsolete
./usr/sbin/nsquery base-obsolete obsolete
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.492 src/distrib/sets/lists/tests/mi:1.493
--- src/distrib/sets/lists/tests/mi:1.492 Wed Sep 12 14:07:52 2012
+++ src/distrib/sets/lists/tests/mi Wed Sep 12 19:20:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.492 2012/09/12 14:07:52 martin Exp $
+# $NetBSD: mi,v 1.493 2012/09/12 19:20:38 rjs Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2861,7 +2861,7 @@
./usr/tests/net/net/Atffile tests-net-tests atf,rump
./usr/tests/net/net/t_raw tests-net-tests atf,rump
./usr/tests/net/net/t_unix tests-net-tests atf,rump
-./usr/tests/net/npf tests-net-tests atf,rump
+./usr/tests/net/npf tests-net-tests
./usr/tests/net/npf/Atffile tests-net-tests atf,rump
./usr/tests/net/npf/npftest.conf tests-net-tests atf,rump
./usr/tests/net/npf/t_npf tests-net-tests atf,rump
Index: src/usr.sbin/npf/Makefile
diff -u src/usr.sbin/npf/Makefile:1.2 src/usr.sbin/npf/Makefile:1.3
--- src/usr.sbin/npf/Makefile:1.2 Wed Sep 12 14:06:02 2012
+++ src/usr.sbin/npf/Makefile Wed Sep 12 19:20:37 2012
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/09/12 14:06:02 martin Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/12 19:20:37 rjs Exp $
-SUBDIR= npfctl npftest
+.include <bsd.own.mk>
+
+SUBDIR= npfctl
+
+.if (${MKRUMP} != "no")
+SUBDIR+= npftest
+.endif
.include <bsd.subdir.mk>
