d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constrain the chekout date to ISO format (yyyy-mm-dd) and add a special

Browse Source 
case, "today", which corresponds to 00:00 on the day the run starts.

Remove NO_CPU_CFLAGS and NO_CPU_COPTFLAGS.  This should be safe since we
clear the environment and set __MAKE_CONF to /dev/null.  NO_CPU_CFLAGS
actually breaks the Alpha release by preventing the inclusion of -mieee
in CFLAGS.

Do not set BUILDNAME as the release/Makefile already constructs a better
one than we do (though I wish there was a way to s/-SNAP/-TINDERBOX/)
This commit is contained in:
Dag-Erling Smørgrav 2003-05-17 14:12:48 +00:00
parent a393c385c4
commit d9bc08dd81
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/tools/tinderbox/tinderbox.1
View File

@ -74,6 +74,9 @@ The date to specify to
using the using the
.Fl D .Fl D
option, when checking out sources. option, when checking out sources.
As a special case, the value
.Dq today
corresponds to midnight GMT the day the run starts.
The default is to use the top of whichever branch was specified. The default is to use the top of whichever branch was specified.
.It Fl -jobs Ns = Ns Ar NUM .It Fl -jobs Ns = Ns Ar NUM
The maximum number of paralell jobs, as specified to The maximum number of paralell jobs, as specified to
@ -220,8 +223,6 @@ The following variables are set for all builds:
.Va /dev/null .Va /dev/null
.It CFLAGS .It CFLAGS
.Va -O -pipe .Va -O -pipe
.It NO_CPU_CFLAGS
.Va YES
.El .El
.Pp .Pp
In addition, if one or more of the In addition, if one or more of the
@ -234,14 +235,10 @@ builds, are set:
.Bl -tag -width 18n .Bl -tag -width 18n
.It COPTFLAGS .It COPTFLAGS
.Va -O -pipe .Va -O -pipe
.It NO_CPU_COPTFLAGS
.Va YES
.El .El
.Pp .Pp
Finally, the following variables are set for release builds: Finally, the following variables are set for release builds:
.Bl -tag -width 18n .Bl -tag -width 18n
.It BUILDNAME
.Va ${BRANCH}_TINDERBOX
.It CHROOTDIR .It CHROOTDIR
.Va $SANDBOX/root .Va $SANDBOX/root
.It CVSROOT .It CVSROOT

12
tools/tools/tinderbox/tinderbox.pl
View File

@ -317,6 +317,15 @@ MAIN:{
error("invalid target machine"); error("invalid target machine");
} }
$machine = $1; $machine = $1;
if (defined($date)) {
if ($date eq 'today') {
$date = strftime("%Y-%m-%d", localtime());
} elsif ($date !~ m/^(\d{4}-\d{2}-\d{2})$/) {
error("invalid checkout date");
} else {
$date = $1;
}
}
if (!@ARGV) { if (!@ARGV) {
usage(); usage();
@ -435,18 +444,15 @@ MAIN:{
'TARGET_ARCH' => $arch, 'TARGET_ARCH' => $arch,
'CFLAGS' => "-O -pipe", 'CFLAGS' => "-O -pipe",
'NO_CPU_CFLAGS' => "YES",
); );
# Kernel-specific variables # Kernel-specific variables
if ($cmds{'generic'} || $cmds{'lint'} || $cmds{'release'}) { if ($cmds{'generic'} || $cmds{'lint'} || $cmds{'release'}) {
$ENV{'COPTFLAGS'} = "-O -pipe"; $ENV{'COPTFLAGS'} = "-O -pipe";
$ENV{'NO_CPU_COPTFLAGS'} = "YES";
} }
# Release-specific variables # Release-specific variables
if ($cmds{'release'}) { if ($cmds{'release'}) {
$ENV{'BUILDNAME'} = "${branch}_TINDERBOX";
$ENV{'CHROOTDIR'} = "$sandbox/root"; $ENV{'CHROOTDIR'} = "$sandbox/root";
$ENV{'CVSROOT'} = $repository; $ENV{'CVSROOT'} = $repository;
$ENV{'RELEASETAG'} = $branch $ENV{'RELEASETAG'} = $branch