From d64596d40b758af5ed43e05f3c8c9e7afcfa9a6f Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Mon, 5 May 2003 17:21:18 +0000
Subject: Remove BOOT2_UFS=UFS1_ONLY from the -CURRENT tinderbox environment;
 it should no longer be necessary.

Re-enable Kerberos 5 in the -STABLE tinderbox (incorrectly disabled in
the previous commit)

Prepare for, but do not actually enable, mailing reports to
appropriate FreeBSD mailing lists.
---
 tools/tools/tinderbox/tbmaster.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 073a993..9a12f93 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -37,7 +37,7 @@ my %CONFIGS	= (
     'global' => {
 	'LOGDIR'	=> '/home/des/public_html',
 	'OPTIONS'	=> [ '--update', '--verbose' ],
-	'EMAIL'		=> 'des',
+	'EMAIL'		=> 'des+%%arch%%-%%branch%%@freebsd.org',
     },
     # 5-CURRENT tinderbox
     'cueball' => {
@@ -50,7 +50,8 @@ my %CONFIGS	= (
 	    'ia64'	=> [ 'ia64' ],
 	    'sparc64'	=> [ 'sparc64' ],
 	},
-	'ENV'		=> [ 'BOOT2_UFS=UFS1_ONLY' ],
+	'ENV'		=> [ ],
+#	'EMAIL'		=> 'current@freebsd.org,%%arch%%@freebsd.org',
     },
     # 4-STABLE tinderbox
     'triangle' => {
@@ -61,7 +62,8 @@ my %CONFIGS	= (
 	    'alpha'	=> [ 'alpha' ],
 	    'i386'	=> [ 'i386', 'pc98' ],
 	},
-	'ENV'		=> [ ],
+	'ENV'		=> [ 'MAKE_KERBEROS5=YES' ],
+#	'EMAIL'		=> 'stable@freebsd.org,%%arch%%@freebsd.org',
     },
     # Test setup
     '9ball' => {
@@ -204,7 +206,7 @@ sub tinderbox($$$) {
 	$recipient =~ s/\%\%branch\%\%/$branch/gi;
 	$recipient =~ s/\%\%arch\%\%/$arch/gi;
 	$recipient =~ s/\%\%machine\%\%/$machine/gi;
-	report($recipient,
+	report(lc($recipient),
 	    "$branch tinderbox failure on $arch/$machine",
 	    $summary);
     }
-- 
cgit v1.1