Module Name: src
Committed By: rin
Date: Thu Jul 18 04:28:55 UTC 2024
Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/modules: Makefile
Log Message:
modules: Build `ipl` module only if MKIPFILTER is enabled
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.290 -r1.291 src/sys/modules/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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.26 src/distrib/sets/lists/debug/module.mi:1.27
--- src/distrib/sets/lists/debug/module.mi:1.26 Thu Jul 11 20:41:08 2024
+++ src/distrib/sets/lists/debug/module.mi Thu Jul 18 04:28:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.26 2024/07/11 20:41:08 riastradh Exp $
+# $NetBSD: module.mi,v 1.27 2024/07/18 04:28:54 rin Exp $
#
./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug
@@ -247,8 +247,8 @@
./usr/libdata/debug/@MODULEDIR@/iic/iic.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ip_ecn modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ip_ecn/ip_ecn.kmod.debug modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/ipl modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/ipl/ipl.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/ipl modules-base-kernel kmod,debug,ipfilter
+./usr/libdata/debug/@MODULEDIR@/ipl/ipl.kmod.debug modules-base-kernel kmod,debug,ipfilter
./usr/libdata/debug/@MODULEDIR@/iscsi modules-base-kernel kmod,iscsi,debug
./usr/libdata/debug/@MODULEDIR@/iscsi/iscsi.kmod.debug modules-base-kernel kmod,iscsi,debug
./usr/libdata/debug/@MODULEDIR@/kernfs modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.159 src/distrib/sets/lists/modules/mi:1.160
--- src/distrib/sets/lists/modules/mi:1.159 Sun Aug 27 13:20:09 2023
+++ src/distrib/sets/lists/modules/mi Thu Jul 18 04:28:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.159 2023/08/27 13:20:09 kardel Exp $
+# $NetBSD: mi,v 1.160 2024/07/18 04:28:54 rin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -273,8 +273,8 @@
./@MODULEDIR@/iic/iic.kmod modules-base-kernel kmod
./@MODULEDIR@/ip_ecn modules-base-kernel kmod
./@MODULEDIR@/ip_ecn/ip_ecn.kmod modules-base-kernel kmod
-./@MODULEDIR@/ipl modules-base-kernel kmod
-./@MODULEDIR@/ipl/ipl.kmod modules-base-kernel kmod
+./@MODULEDIR@/ipl modules-base-kernel kmod,ipfilter
+./@MODULEDIR@/ipl/ipl.kmod modules-base-kernel kmod,ipfilter
./@MODULEDIR@/iscsi modules-base-kernel kmod,iscsi
./@MODULEDIR@/iscsi/iscsi.kmod modules-base-kernel kmod,iscsi
./@MODULEDIR@/kernfs modules-base-kernel kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.290 src/sys/modules/Makefile:1.291
--- src/sys/modules/Makefile:1.290 Mon May 20 18:14:38 2024
+++ src/sys/modules/Makefile Thu Jul 18 04:28:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.290 2024/05/20 18:14:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.291 2024/07/18 04:28:55 rin Exp $
.include <bsd.own.mk>
@@ -114,7 +114,9 @@ SUBDIR+= if_vlan
SUBDIR+= if_wg
SUBDIR+= iic
SUBDIR+= ip_ecn
+.if ${MKIPFILTER:Uno} != no
SUBDIR+= ipl
+.endif
SUBDIR+= kernfs
SUBDIR+= layerfs
SUBDIR+= lfs