[src/trunk]: src/distrib/sets Add nocompatmodules keyword to stop the expandi...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/07c4f4133d79
branches:  trunk
changeset: 339283:07c4f4133d79
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jul 09 18:19:34 2015 +0000

description:
Add nocompatmodules keyword to stop the expanding of a kmod to compatmodules.
Use for compat_netbsd32 on mips

diffstat:

 distrib/sets/lists/modules/ad.mips |   6 +++---
 distrib/sets/sets.subr             |  10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 38f490d78d78 -r 07c4f4133d79 distrib/sets/lists/modules/ad.mips
--- a/distrib/sets/lists/modules/ad.mips        Thu Jul 09 15:58:51 2015 +0000
+++ b/distrib/sets/lists/modules/ad.mips        Thu Jul 09 18:19:34 2015 +0000
@@ -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
diff -r 38f490d78d78 -r 07c4f4133d79 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Thu Jul 09 15:58:51 2015 +0000
+++ b/distrib/sets/sets.subr    Thu Jul 09 18:19:34 2015 +0000
@@ -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 @@
 # 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 @@
                                        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 @@
                                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)