From 4f171e58698cb3372b617c77e6795e9cd4981546 Mon Sep 17 00:00:00 2001 From: des Date: Fri, 14 Mar 2003 00:55:41 +0000 Subject: Allow the configuration to specify environment variables (passed on the command line to tinderbox.pl) Build Kerberos V in all setups (this was previously taken care of by tinderbox.pl). Tweak the 9ball configuration to make powerpc builds work (with a little help from a toolchain patch provided by grehan) --- tools/tools/tinderbox/tbmaster.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl index 4282d0d..905594a 100644 --- a/tools/tools/tinderbox/tbmaster.pl +++ b/tools/tools/tinderbox/tbmaster.pl @@ -50,6 +50,7 @@ my %CONFIGS = ( 'ia64' => [ 'ia64' ], 'sparc64' => [ 'sparc64' ], }, + 'ENV' => [ 'MAKE_KERBEROS5=YES', 'BOOT2_UFS=UFS1_ONLY' ], }, # 4-STABLE tinderbox 'triangle' => { @@ -60,15 +61,17 @@ my %CONFIGS = ( 'alpha' => [ 'alpha' ], 'i386' => [ 'i386', 'pc98' ], }, + 'ENV' => [ 'MAKE_KERBEROS5=YES' ], }, # Test setup '9ball' => { 'BRANCHES' => [ 'CURRENT' ], - 'TARGETS' => [ 'world', 'generic', 'lint' ], + 'TARGETS' => [ 'world', 'generic' ], 'ARCHES' => { 'powerpc' => [ 'powerpc' ], }, - 'EMAIL' => 'des@ofug.org', + 'ENV' => [ 'MAKE_KERBEROS5=YES', + 'NOLIBC_R=YES', 'NOFORTH=YES' ], }, ); my %CONFIG = (); @@ -130,6 +133,7 @@ sub tinderbox($$$) { push(@args, "--arch=$arch"); push(@args, "--machine=$machine"); push(@args, @{$CONFIG{'TARGETS'}}); + push(@args, @{$CONFIG{'ENV'}}); my $pid = fork(); if (!defined($pid)) { warn("fork(): $!\n"); -- cgit v1.1