From 3ef02db0840ea9041de299f5b007363602c569b8 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Sat, 17 May 2003 14:12:48 +0000
Subject: Constrain the chekout date to ISO format (yyyy-mm-dd) and add a
 special 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/)
---
 tools/tools/tinderbox/tinderbox.1  |  9 +++------
 tools/tools/tinderbox/tinderbox.pl | 12 +++++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/tools/tinderbox/tinderbox.1 b/tools/tools/tinderbox/tinderbox.1
index bb57ce2..c90217d 100644
--- a/tools/tools/tinderbox/tinderbox.1
+++ b/tools/tools/tinderbox/tinderbox.1
@@ -74,6 +74,9 @@ The date to specify to
 using the
 .Fl D
 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.
 .It Fl -jobs Ns = Ns Ar NUM
 The maximum number of paralell jobs, as specified to
@@ -220,8 +223,6 @@ The following variables are set for all builds:
 .Va /dev/null
 .It CFLAGS
 .Va -O -pipe
-.It NO_CPU_CFLAGS
-.Va YES
 .El
 .Pp
 In addition, if one or more of the
@@ -234,14 +235,10 @@ builds, are set:
 .Bl -tag -width 18n
 .It COPTFLAGS
 .Va -O -pipe
-.It NO_CPU_COPTFLAGS
-.Va YES
 .El
 .Pp
 Finally, the following variables are set for release builds:
 .Bl -tag -width 18n
-.It BUILDNAME
-.Va ${BRANCH}_TINDERBOX
 .It CHROOTDIR
 .Va $SANDBOX/root
 .It CVSROOT
diff --git a/tools/tools/tinderbox/tinderbox.pl b/tools/tools/tinderbox/tinderbox.pl
index c8b80d3..be2d6a1 100644
--- a/tools/tools/tinderbox/tinderbox.pl
+++ b/tools/tools/tinderbox/tinderbox.pl
@@ -317,6 +317,15 @@ MAIN:{
 	error("invalid target machine");
     }
     $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) {
 	usage();
@@ -435,18 +444,15 @@ MAIN:{
 	'TARGET_ARCH'		=> $arch,
 
 	'CFLAGS'		=> "-O -pipe",
-	'NO_CPU_CFLAGS'		=> "YES",
     );
 
     # Kernel-specific variables
     if ($cmds{'generic'} || $cmds{'lint'} || $cmds{'release'}) {
 	$ENV{'COPTFLAGS'} = "-O -pipe";
-	$ENV{'NO_CPU_COPTFLAGS'} = "YES";
     }
 
     # Release-specific variables
     if ($cmds{'release'}) {
-	$ENV{'BUILDNAME'} = "${branch}_TINDERBOX";
 	$ENV{'CHROOTDIR'} = "$sandbox/root";
 	$ENV{'CVSROOT'} = $repository;
 	$ENV{'RELEASETAG'} = $branch
-- 
cgit v1.1