Module Name: src
Committed By: martin
Date: Sat Jul 20 16:03:23 UTC 2024
Modified Files:
src/distrib/sets/lists/debug [netbsd-10]: module.mi
src/distrib/sets/lists/modules [netbsd-10]: mi
src/sys/modules [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by rin in ticket #765):
sys/modules/Makefile: revision 1.291
distrib/sets/lists/modules/mi: revision 1.160
distrib/sets/lists/debug/module.mi: revision 1.27
modules: Build `ipl` module only if MKIPFILTER is enabled
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.157 -r1.157.2.1 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.274.2.3 -r1.274.2.4 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.23 src/distrib/sets/lists/debug/module.mi:1.23.2.1
--- src/distrib/sets/lists/debug/module.mi:1.23 Sat Dec 3 01:04:43 2022
+++ src/distrib/sets/lists/debug/module.mi Sat Jul 20 16:03:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.23 2022/12/03 01:04:43 brad Exp $
+# $NetBSD: module.mi,v 1.23.2.1 2024/07/20 16:03:23 martin Exp $
./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug
@@ -244,8 +244,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.157 src/distrib/sets/lists/modules/mi:1.157.2.1
--- src/distrib/sets/lists/modules/mi:1.157 Sat Dec 3 01:04:43 2022
+++ src/distrib/sets/lists/modules/mi Sat Jul 20 16:03:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.157 2022/12/03 01:04:43 brad Exp $
+# $NetBSD: mi,v 1.157.2.1 2024/07/20 16:03:23 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -271,8 +271,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.274.2.3 src/sys/modules/Makefile:1.274.2.4
--- src/sys/modules/Makefile:1.274.2.3 Thu Apr 18 15:21:55 2024
+++ src/sys/modules/Makefile Sat Jul 20 16:03:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.274.2.3 2024/04/18 15:21:55 martin Exp $
+# $NetBSD: Makefile,v 1.274.2.4 2024/07/20 16:03:23 martin Exp $
.include <bsd.own.mk>
@@ -109,7 +109,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
