Module Name: src
Committed By: jmmv
Date: Fri Feb 15 19:49:49 UTC 2013
Modified Files:
src/distrib/sets: sets.subr
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
Log Message:
Add the MKKYUA knob.
MKKYUA defaults to no and will remain as such until the import is complete
and validated.
This knob does not currently have any effects on the build as nothing relies
on it yet. Upcoming imports and changes in this area will all be guarded by
this flag.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/sets.subr
cvs rdiff -u -r1.64 -r1.65 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.311 -r1.312 src/share/mk/bsd.README
cvs rdiff -u -r1.723 -r1.724 src/share/mk/bsd.own.mk
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.143 src/distrib/sets/sets.subr:1.144
--- src/distrib/sets/sets.subr:1.143 Mon Jan 28 13:46:47 2013
+++ src/distrib/sets/sets.subr Fri Feb 15 19:49:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.143 2013/01/28 13:46:47 nakayama Exp $
+# $NetBSD: sets.subr,v 1.144 2013/02/15 19:49:48 jmmv 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.143 2013/01/28 13:46:47 nakayama Exp $
+# # $NetBSD: sets.subr,v 1.144 2013/02/15 19:49:48 jmmv Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -225,6 +225,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# iscsi ${MKISCSI} != no
# kerberos ${MKKERBEROS} != no
# kmod ${MKKMOD} != no
+# kyua ${MKKYUA} != no
# ldap ${MKLDAP} != no
# lint ${MKLINT} != no
# llvm ${MKLLVM} != no
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.64 src/share/man/man5/mk.conf.5:1.65
--- src/share/man/man5/mk.conf.5:1.64 Sun Sep 30 06:00:26 2012
+++ src/share/man/man5/mk.conf.5 Fri Feb 15 19:49:48 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.64 2012/09/30 06:00:26 jkoshy Exp $
+.\" $NetBSD: mk.conf.5,v 1.65 2013/02/15 19:49:48 jmmv Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 30, 2012
+.Dd Feburary 15, 2013
.Dt MK.CONF 5
.Os
.\" turn off hyphenation
@@ -222,6 +222,8 @@ flag.
.It Sy MKATF
.YorN
Indicates whether the Automated Testing Framework is built and installed.
+This also controls whether the NetBSD test suite is built and installed,
+as the tests rely on ATF and cannot be built without it.
.DFLTy
.
.It Sy MKBINUTILS
@@ -504,6 +506,19 @@ Otherwise all logins will fail.
Indicates whether kernel modules are built and installed.
.DFLTy
.
+.It Sy MKKYUA
+.YorN
+Indicates whether Kyua (the testing infrastructure used by NetBSD) is built
+and installed.
+Note that
+.Em this does not control the installation of the tests themselves .
+The tests rely on the ATF libraries and therefore their build is controlled
+by the
+.Sy MKATF
+knob.
+.DFLTn
+until the import of Kyua is done and validated.
+.
.It Sy MKLDAP
.YorN
Indicates whether the Lightweight Directory Access Protocol (LDAP)
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.311 src/share/mk/bsd.README:1.312
--- src/share/mk/bsd.README:1.311 Sun Feb 10 22:05:51 2013
+++ src/share/mk/bsd.README Fri Feb 15 19:49:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.311 2013/02/10 22:05:51 jmcneill Exp $
+# $NetBSD: bsd.README,v 1.312 2013/02/15 19:49:48 jmmv Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -113,8 +113,11 @@ MAKEVERBOSE Control how "verbose" the st
3 Ignore the effect of the "@" prefix in make commands
4 Trace shell commands using the shell's -x flag
-MKATF If "no", don't build libatf-c, libatf-c++ libraries associated
- with the Automated Testing Framework (ATF).
+MKATF If "no", don't build the Automated Testing Framework (ATF),
+ which includes the libatf-c, libatf-c++ and libatf-sh libraries
+ and the various command line tools. Also, because the build of
+ the libraries is disabled, don't build the NetBSD test suite
+ either.
Default: yes
MKBFD Obsolete, use MKBINUTILS
@@ -226,6 +229,12 @@ MKKERBEROS If "no", disables building of
MKKMOD If "no", disables building of kernel modules.
Default: yes
+MKKYUA If "no", don't build Kyua nor its dependent library Lutok.
+ Note that setting this to "no" does not disable the build of
+ the NetBSD test suite itself; the build of the tests is
+ controlled by the MKATF knob.
+ Default: no (until the import is done and validated)
+
MKLDAP If "no", disables building of LDAP infrastructure
(libraries and support programs).
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.723 src/share/mk/bsd.own.mk:1.724
--- src/share/mk/bsd.own.mk:1.723 Sun Feb 10 22:05:51 2013
+++ src/share/mk/bsd.own.mk Fri Feb 15 19:49:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.723 2013/02/10 22:05:51 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.724 2013/02/15 19:49:49 jmmv Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -890,6 +890,7 @@ _MKVARS.no= \
MKBSDGREP MKBSDTAR \
MKCATPAGES MKCRYPTO_RC5 MKDEBUG \
MKDEBUGLIB MKDTRACE MKEXTSRC \
+ MKKYUA \
MKMANZ MKOBJDIRS \
MKLLVM MKPCC \
MKPIGZGZIP \
@@ -925,6 +926,7 @@ X11FLAVOUR?= Xorg
.if ${MKCXX} == "no"
MKATF:= no
MKGROFF:= no
+MKKYUA:= no
.endif
.if ${MKCRYPTO} == "no"
