[src/trunk]: src/distrib/sets "dtrace, zfs" means "MKDTRACE=yes" *and* "MKZFS=...

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

details:   https://anonhg.NetBSD.org/src/rev/0ee0a977e772
branches:  trunk
changeset: 752688:0ee0a977e772
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Mar 03 16:13:42 2010 +0000

description:
"dtrace,zfs" means "MKDTRACE=yes" *and* "MKZFS=yes" which is not what
we want. Invent a flag "solaris" which is the or of those two flags.

diffstat:

 distrib/sets/lists/modules/mi |   6 +++---
 distrib/sets/mkvars.mk        |  11 +++++++++--
 distrib/sets/sets.subr        |   5 +++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diffs (75 lines):

diff -r 7f67f0d2283f -r 0ee0a977e772 distrib/sets/lists/modules/mi
--- a/distrib/sets/lists/modules/mi     Wed Mar 03 14:43:41 2010 +0000
+++ b/distrib/sets/lists/modules/mi     Wed Mar 03 16:13:42 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.10 2010/03/03 14:43:41 tron Exp $
+# $NetBSD: mi,v 1.11 2010/03/03 16:13:42 tron Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -102,8 +102,8 @@
 ./@MODULEDIR@/securelevel/securelevel.kmod     base-kernel-modules     kmod
 ./@MODULEDIR@/smbfs                            base-kernel-modules     kmod
 ./@MODULEDIR@/smbfs/smbfs.kmod                 base-kernel-modules     kmod
-./@MODULEDIR@/solaris                          base-kernel-modules     kmod,dtrace,zfs
-./@MODULEDIR@/solaris/solaris.kmod             base-kernel-modules     kmod,dtrace,zfs
+./@MODULEDIR@/solaris                          base-kernel-modules     kmod,solaris
+./@MODULEDIR@/solaris/solaris.kmod             base-kernel-modules     kmod,solaris
 ./@MODULEDIR@/suser                            base-kernel-modules     kmod
 ./@MODULEDIR@/suser/suser.kmod                 base-kernel-modules     kmod
 ./@MODULEDIR@/sysvbfs                          base-kernel-modules     kmod
diff -r 7f67f0d2283f -r 0ee0a977e772 distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk    Wed Mar 03 14:43:41 2010 +0000
+++ b/distrib/sets/mkvars.mk    Wed Mar 03 16:13:42 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.1 2009/12/10 15:51:24 uebayasi Exp $
+# $NetBSD: mkvars.mk,v 1.2 2010/03/03 16:13:42 tron Exp $
 
 MKEXTRAVARS= \
        MACHINE \
@@ -45,7 +45,7 @@
 
 #####
 
-mkvars: mkvarsyesno mkextravars .PHONY
+mkvars: mkvarsyesno mkextravars mksolaris .PHONY
 
 mkvarsyesno: .PHONY
 .for i in ${_MKVARS.yes}
@@ -59,3 +59,10 @@
 .for i in ${MKEXTRAVARS}
        @echo $i="${$i}"
 .endfor
+
+mksolaris: .PHONY
+.if (${MKDTRACE} != "no" || ${MKZFS} != "no")
+       @echo "MKSOLARIS=yes"
+.else
+       @echo "MKSOLARIS=no"
+.endif
diff -r 7f67f0d2283f -r 0ee0a977e772 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Wed Mar 03 14:43:41 2010 +0000
+++ b/distrib/sets/sets.subr    Wed Mar 03 16:13:42 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.121 2010/02/21 03:18:45 darran Exp $
+#      $NetBSD: sets.subr,v 1.122 2010/03/03 16:13:42 tron Exp $
 #
 
 #
@@ -168,7 +168,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.121 2010/02/21 03:18:45 darran Exp $
+#      # $NetBSD: sets.subr,v 1.122 2010/03/03 16:13:42 tron Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -232,6 +232,7 @@
 #      profile                 ${MKPROFILE} != no
 #      share                   ${MKSHARE} != no
 #      skey                    ${MKSKEY} != no
+#      solaris                 ${MKDTRACE} != no or ${MKZFS} != no
 #      x11                     ${MKX11} != no && ${X11FLAVOUR} != "Xorg"
 #      xorg                    ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
 #      yp                      ${MKYP} != no