Module Name: src
Committed By: matt
Date: Thu Jul 9 18:19:34 UTC 2015
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/modules: ad.mips
Log Message:
Add nocompatmodules keyword to stop the expanding of a kmod to compatmodules.
Use for compat_netbsd32 on mips
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/distrib/sets/sets.subr
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/ad.mips
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.171 src/distrib/sets/sets.subr:1.172
--- src/distrib/sets/sets.subr:1.171 Sun Jun 28 23:49:33 2015
+++ src/distrib/sets/sets.subr Thu Jul 9 18:19:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.171 2015/06/28 23:49:33 matt Exp $
+# $NetBSD: sets.subr,v 1.172 2015/07/09 18:19:34 matt Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.171 2015/06/28 23:49:33 matt Exp $
+# # $NetBSD: sets.subr,v 1.172 2015/07/09 18:19:34 matt Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -395,11 +395,13 @@ list_set_files()
iscompatdir = 1
} else if (kw in compatfilekeywords) {
iscompatfile = 1
+ } else if (kw == "nocompatmodules") {
+ havekmod = -1
} else if (kw in ignoredkeywords) {
# ignore
} else if (! (kw in wanted)) {
show = 0
- } else if (kw == "kmod") {
+ } else if (kw == "kmod" && havekmod == 0) {
havekmod = 1
}
if (kw == "obsolete")
@@ -411,7 +413,7 @@ list_set_files()
next
list[$1] = $0
- if (havekmod && substr($1,1,l_kmodpat) == kmodpat) {
+ if (havekmod > 0 && substr($1,1,l_kmodpat) == kmodpat) {
for (d in kmodarchdirs) {
xd = "./stand/" kmodarchdirs[d]
xfile = xd substr($1, l_kmodpat+1)
Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.4 src/distrib/sets/lists/modules/ad.mips:1.5
--- src/distrib/sets/lists/modules/ad.mips:1.4 Sat May 9 14:22:34 2015
+++ src/distrib/sets/lists/modules/ad.mips Thu Jul 9 18:19:34 2015
@@ -1,5 +1,5 @@
-# $NetBSD: ad.mips,v 1.4 2015/05/09 14:22:34 matt Exp $
-./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod,arch64
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod,arch64
+# $NetBSD: ad.mips,v 1.5 2015/07/09 18:19:34 matt Exp $
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod,arch64,nocompatmodules
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
