svn commit: r266617 - user/des/tinderbox

[Dag-Erling Smørgrav]

Author: des
Date: Sat May 24 13:34:41 2014
New Revision: 266617
URL: http://svnweb.freebsd.org/changeset/base/266617

Log:
  Set MAKESYSPATH before building to ensure we use the correct set of .mk
  files right from the start.
  
  Document MAKESYSPATH and a number of other envars we set.

Modified:
  user/des/tinderbox/tinderbox.1
  user/des/tinderbox/tinderbox.pl

Modified: user/des/tinderbox/tinderbox.1
==============================================================================
--- user/des/tinderbox/tinderbox.1	Sat May 24 13:25:06 2014	(r266616)
+++ user/des/tinderbox/tinderbox.1	Sat May 24 13:34:41 2014	(r266617)
@@ -48,14 +48,16 @@ arbitrary target platform.
 The following options are recognized:
 .Bl -tag -width 12n
 .It Fl -arch Ns = Ns Ar ARCH
-Specifies the target architecture.
+Specifies the target architecture
+.Pq Va $arch .
 The default value is whatever the host system's
 .Xr uname 1
 reports.
 .It Fl -branch Ns = Ns Ar BRANCH
 The branch to check out from
 .Xr svn 1
-when updating the source tree.
+when updating the source tree
+.Pq Va $branch .
 The default is to check out HEAD.
 For historical compatibility,
 .Xr cvs 1 Ns -style
@@ -85,7 +87,9 @@ option of the
 .Xr uname 1
 command, and is only used for cosmetic purposes.
 .It Fl -jobs Ns = Ns Ar NUM
-The maximum number of paralell jobs, as specified to
+The maximum number of paralell jobs
+.Pq Va $jobs ,
+as specified to
 .Xr make 1
 using the
 .Fl j
@@ -98,14 +102,16 @@ Note that this file can grow quite large
 The default is to redirect all output to
 .Pa /dev/stdout .
 .It Fl -machine Ns = Ns Ar MACHINE
-Specifies the target machine.
+Specifies the target machine
+.Pq Va $machine .
 The default value is whatever the host system's
 .Xr uname 1
 reports, unless a target architecture was specified with the
 .Fl -arch
 option, in which case the target machine is set to the same value.
 .It Fl -objdir Ns = Ns Ar DIR
-Specifies the object directory prefix.
+Specifies the object directory prefix
+.Pq Va $objdir .
 .It Fl -patch Ns = Ns Ar PATCH
 The file name of a patch to apply to the source tree before building
 if the
@@ -126,7 +132,8 @@ The location of the sandbox in which the
 This directory should reside on a reasonably fast disk with at least
 1.5 GB available (3 GB if building a release).
 .It Fl -srcdir Ns = Ns Ar DIR
-Specifies the source directory.
+Specifies the source directory
+.Pq Va $srcdir .
 Normally, the
 .Nm
 script creates a separate source directory within the sandbox for each
@@ -302,31 +309,43 @@ processes with a tailored environment.
 The following variables are set for all builds:
 .Bl -tag -width 18n
 .It PATH
-.Va /usr/bin:/usr/sbin:/bin:/sbin
+.Ar /usr/bin:/usr/sbin:/bin:/sbin
 .It TZ
-.Va UTC
+.Ar UTC
 .It __MAKE_CONF
-.Va /dev/null
+.Ar /dev/null
+.It SRCCONF
+.Ar /dev/null
+.It MAKESYSPATH
+.Ar $srcdir/share/mk
+.It MAKEOBJDIRPREFIX
+.Ar $objdir
+.It TARGET
+.Ar $machine
+.It TARGET_ARCH
+.Ar $arch
+.It CROSS_BUILD_TESTING
+.Ar YES
 .El
 .Pp
 The following additional variables are set for release builds:
 .Bl -tag -width 18n
 .It CHROOTDIR
-.Va $SANDBOX/root
+.Ar $SANDBOX/root
 .It RELEASETAG
-.Va -rBRANCH
-if
-.Fl -branch Ns = Ns Ar BRANCH
-was specified, or
-.Va -A
+.Ar -r$branch
+if specified using the
+.Fl -branch
+option, or
+.Ar -A
 otherwise.
 .It WORLD_FLAGS , KERNEL_FLAGS
 Both of these are set to
-.Va -jN
-if
-.Fl -jobs Ns = Ns Ar N
-was specified, or
-.Va -B
+.Ar -j$jobs
+if specified using the
+.Fl -jobs
+option, or
+.Ar -B
 otherwise.
 .It LOCAL_PATCHES
 Set to the path of the patch that was specified with the
@@ -334,14 +353,14 @@ Set to the path of the patch that was sp
 option, if any.
 .It PATCH_FLAGS
 Set to
-.Va -fs
+.Ar -fs
 if a patch was specified.
 .It NOCDROM
-.Va YES
+.Ar YES
 .It NODOC
-.Va YES
+.Ar YES
 .It NOPORTS
-.Va YES
+.Ar YES
 .El
 .Pp
 None of these variables may be overridden by command-line arguments.

Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl	Sat May 24 13:25:06 2014	(r266616)
+++ user/des/tinderbox/tinderbox.pl	Sat May 24 13:34:41 2014	(r266617)
@@ -736,6 +736,7 @@ MAIN:{
 
 	'__MAKE_CONF'		=> "/dev/null",
 	'SRCCONF'		=> "/dev/null",
+	'MAKESYSPATH'		=> "$srcdir/share/mk",
 	'MAKEOBJDIRPREFIX'	=> $objdir,
 
 	'TARGET'		=> $machine,