Module Name: src
Committed By: tron
Date: Wed Mar 3 16:13:42 UTC 2010
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/modules: mi
Log Message:
"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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/sets.subr
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/modules/mi
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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.1 src/distrib/sets/mkvars.mk:1.2
--- src/distrib/sets/mkvars.mk:1.1 Thu Dec 10 15:51:24 2009
+++ src/distrib/sets/mkvars.mk Wed Mar 3 16:13:42 2010
@@ -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
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.121 src/distrib/sets/sets.subr:1.122
--- src/distrib/sets/sets.subr:1.121 Sun Feb 21 03:18:45 2010
+++ src/distrib/sets/sets.subr Wed Mar 3 16:13:42 2010
@@ -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
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.10 src/distrib/sets/lists/modules/mi:1.11
--- src/distrib/sets/lists/modules/mi:1.10 Wed Mar 3 14:43:41 2010
+++ src/distrib/sets/lists/modules/mi Wed Mar 3 16:13:42 2010
@@ -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
