[Midnightbsd-cvs] src: tools/tinderbox: Sync man pages with the new versions.

Thu Mar 6 23:28:13 EST 2008

Log Message:
-----------
Sync man pages with the new versions.

Modified Files:
--------------
    src/tools/tools/tinderbox:
        tbmaster.1 (r1.1.1.1 -> r1.2)
        tinderbox.1 (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: tinderbox.1
===================================================================
RCS file: /home/cvs/src/tools/tools/tinderbox/tinderbox.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L tools/tools/tinderbox/tinderbox.1 -L tools/tools/tinderbox/tinderbox.1 -u -r1.1.1.1 -r1.2

--- tools/tools/tinderbox/tinderbox.1
+++ tools/tools/tinderbox/tinderbox.1
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2003 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2003-2008 Dag-Erling CoÃ¯dan SmÃ¸rgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -10,8 +10,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -25,9 +23,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/tools/tools/tinderbox/tinderbox.1,v 1.12 2004/06/21 14:49:22 des Exp $
+.\" $MidnightBSD$
+.\" $FreeBSD: projects/tinderbox/tinderbox.1,v 1.18 2008/01/26 19:34:31 des Exp $
 .\"
-.Dd June 21, 2004
+.Dd April 10, 2007
 .Dt TINDERBOX 1
 .Os
 .Sh NAME
@@ -64,7 +63,7 @@
 .Fl A
 instead, to get the head.
 Specifying
-.Va CURRENT
+.Va HEAD
 as the argument to
 .Fl -branch
 is equivalent to leaving it unspecified.
@@ -77,6 +76,14 @@
 The default is to use
 .Xr cvs 1
 instead.
+.It Fl D Ar DIR , Fl -destdir Ns = Ns Ar DIR
+The directory (aka
+.Dv DESTDIR )
+in which the results of the build will be installed if the
+.Cm install
+command is specified.
+The default is
+.Pa $SANDBOX/inst .
 .It Fl d Ar DATE , Fl -date Ns = Ns Ar DATE
 The date to specify to
 .Xr cvs 1
@@ -111,7 +118,9 @@
 Specifies the target machine.
 The default value is whatever the host system's
 .Xr uname 1
-reports.
+reports, unless a target architecture was specified with the
+.It Fl a
+option, in which case the target machine is set to the same value.
 .It Fl p Ar PATCH , Fl -patch Ns = Ns Ar PATCH
 The file name of a patch to apply to the source tree before building
 if the
@@ -172,13 +181,11 @@
 command will fail gracefully.
 .It Cm world
 Build the world.
-.It Cm generic
-Build a GENERIC kernel.
 .It Cm lint
 Build a LINT kernel if available.
 In
 .Fx
-5, the
+5 and newer, the
 .Pa LINT
 configuration file will first be generated from the corresponding
 .Pa NOTES
@@ -190,6 +197,24 @@
 exist in the kernel configuration directory, the
 .Cm lint
 command will fail gracefully.
+.It Cm kernel: Ns Ar CONF
+Build the
+.Ar CONF
+kernel.
+If a file named
+.Ar CONF
+does not exist in the kernel configuration directory, this command
+will fail gracefully.
+.It Cm generic
+Equivalent to
+.Cm kernel: Ns Ar GENERIC ,
+for backward compatibility.
+.It Cm install
+Install the result of the build into
+.Pa ${DESTDIR} .
+Each kernel that was built will be installed into a subdirectory of
+.Pa ${DESTDIR}/boot
+named after the corresponding kernel configuration file.
 .It Cm release
 Build a release by following the procedure described in
 .Xr release 7 .
Index: tbmaster.1
===================================================================
RCS file: /home/cvs/src/tools/tools/tinderbox/tbmaster.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L tools/tools/tinderbox/tbmaster.1 -L tools/tools/tinderbox/tbmaster.1 -u -r1.1.1.1 -r1.2
--- tools/tools/tinderbox/tbmaster.1
+++ tools/tools/tinderbox/tbmaster.1
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2003 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2003-2008 Dag-Erling CoÃ¯dan SmÃ¸rgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -10,8 +10,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -25,9 +23,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/tools/tools/tinderbox/tbmaster.1,v 1.18 2005/03/03 07:20:57 des Exp $
+.\" $MidnightBSD$
+.\" $FreeBSD: projects/tinderbox/tbmaster.1,v 1.25 2008/01/26 19:34:31 des Exp $
 .\"
-.Dd August 18, 2004
+.Dd October 18, 2006
 .Dt TBMASTER 1
 .Os
 .Sh NAME
@@ -61,6 +60,10 @@
 If the lock is already held by another process,
 .Nm
 will terminate immediately rather than block.
+.It Fl n Ar ncpu
+The number of concurrent jobs to run.
+The default is the number of CPUs in the machine, or 1 if that number
+could not be determined.
 .El
 .Ss Configuration
 The
@@ -78,14 +81,17 @@
 .Nm
 attempts to read
 .Pa default.rc
-before reading the actual configuration file; thus, that file may be
+and
+.Pa site.rc
+before reading the actual configuration file; thus, these files may be
 used to specify default values shared by multiple configurations.
 .Pp
 The configuration consists of a list of single- or multiple-value
 variable assignments:
 .Bl -tag
-.It Va variable = Ar value
-.It Va variable = Ar value1 , Ar value2, ...
+.It Va single_variable = Ar value
+.It Va multi_variable = Ar value1 , Ar value2, ...
+.It Va multi_variable += Ar value3 , ...
 .El
 .Pp
 Whitespace around the equal sign and around the commas separating
@@ -108,7 +114,7 @@
 .Pq Vt multiple
 A list of source branches to build.
 The default value is
-.Dq CURRENT .
+.Dq HEAD .
 .It CFLAGS
 .Pq Vt single
 The desired value for the
@@ -253,6 +259,11 @@
 script.
 The default value is
 .Dq %%HOME%%/bin/tinderbox .
+.It URLBASE
+If defined, a URL constructed by appending the file name of the full
+log file to the expanded value of this variable will be appended to
+failure reports.
+No default value.
 .El
 .Pp
 Fields which are left undefined are filled in from the
