Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"dtrace,zfs" means "MKDTRACE=yes" *and* "MKZFS=yes" which is not what

Browse Source 
we want. Invent a flag "solaris" which is the or of those two flags.
This commit is contained in:
tron 2010-03-03 16:13:42 +00:00
parent 404aaa2973
commit 11300caff5
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/sets/lists/modules/mi
View File

@ -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

11
distrib/sets/mkvars.mk
View File

@ -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 @@ MKXORG:=no
#####
mkvars: mkvarsyesno mkextravars .PHONY
mkvars: mkvarsyesno mkextravars mksolaris .PHONY
mkvarsyesno: .PHONY
.for i in ${_MKVARS.yes}
@ -59,3 +59,10 @@ mkextravars: .PHONY
.for i in ${MKEXTRAVARS}
@echo $i="${$i}"
.endfor
mksolaris: .PHONY
.if (${MKDTRACE} != "no" || ${MKZFS} != "no")
@echo "MKSOLARIS=yes"
.else
@echo "MKSOLARIS=no"
.endif

5
distrib/sets/sets.subr
View File

@ -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 @@ 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.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 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
# 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