From owner-svn-src-user@FreeBSD.ORG Tue Dec 18 10:44:48 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id CFF417BF;
Tue, 18 Dec 2012 10:44:48 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id B47ED8FC0A;
Tue, 18 Dec 2012 10:44:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBIAimnt020859;
Tue, 18 Dec 2012 10:44:48 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBIAim13020857;
Tue, 18 Dec 2012 10:44:48 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201212181044.qBIAim13020857@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 18 Dec 2012 10:44:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244394 - user/des/tinderbox/etc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 10:44:48 -0000
Author: andrew
Date: Tue Dec 18 10:44:47 2012
New Revision: 244394
URL: http://svnweb.freebsd.org/changeset/base/244394
Log:
Add armv6 to the tinderbox
Approved by: des
Modified:
user/des/tinderbox/etc/head.rc
user/des/tinderbox/etc/update_head.rc
Modified: user/des/tinderbox/etc/head.rc
==============================================================================
--- user/des/tinderbox/etc/head.rc Tue Dec 18 10:34:18 2012 (r244393)
+++ user/des/tinderbox/etc/head.rc Tue Dec 18 10:44:47 2012 (r244394)
@@ -5,5 +5,5 @@
#
branches = HEAD
-platforms = amd64, arm, i386, i386/pc98, ia64, mips, mips64/mips, powerpc, powerpc64/powerpc, sparc64
+platforms = amd64, arm, armv6/arm, i386, i386/pc98, ia64, mips, mips64/mips, powerpc, powerpc64/powerpc, sparc64
recipient = %%SENDER%%,<current@freebsd.org>,<%%arch%%@freebsd.org>
Modified: user/des/tinderbox/etc/update_head.rc
==============================================================================
--- user/des/tinderbox/etc/update_head.rc Tue Dec 18 10:34:18 2012 (r244393)
+++ user/des/tinderbox/etc/update_head.rc Tue Dec 18 10:44:47 2012 (r244394)
@@ -1,4 +1,4 @@
# $FreeBSD$
branches = HEAD
-platforms = amd64, arm, i386, i386/pc98, ia64, mips, mips64/mips, powerpc, powerpc64/powerpc, sparc64
+platforms = amd64, arm, armv6/arm, i386, i386/pc98, ia64, mips, mips64/mips, powerpc, powerpc64/powerpc, sparc64
targets = update
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 10:48:39 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id EA5F4F20;
Wed, 19 Dec 2012 10:48:39 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id CF25E8FC12;
Wed, 19 Dec 2012 10:48:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJAmdow074440;
Wed, 19 Dec 2012 10:48:39 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJAmds6074438;
Wed, 19 Dec 2012 10:48:39 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191048.qBJAmds6074438@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 10:48:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244419 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 10:48:40 -0000
Author: des
Date: Wed Dec 19 10:48:39 2012
New Revision: 244419
URL: http://svnweb.freebsd.org/changeset/base/244419
Log:
Greatly improve the handling, and particularly expansion, of multiple-value
configuration variables.
Switch RECIPIENT from single-value to multiple-value. Add code that strips
@freebsd.org addresses from the list unless the user has jumped through the
required hoops, since the stock configuration mails failure reports to the
mailing lists.
Revise and update the documentation.
Bump $VERSION from 2.6 to 2.9 to match tinderbox(1).
Modified:
user/des/tinderbox/tbmaster.1
user/des/tinderbox/tbmaster.pl
Modified: user/des/tinderbox/tbmaster.1
==============================================================================
--- user/des/tinderbox/tbmaster.1 Wed Dec 19 09:55:13 2012 (r244418)
+++ user/des/tinderbox/tbmaster.1 Wed Dec 19 10:48:39 2012 (r244419)
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2003-2011 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2003-2012 Dag-Erling Coïdan Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 12, 2008
+.Dd December 18, 2012
.Dt TBMASTER 1
.Os
.Sh NAME
@@ -59,12 +59,12 @@ respectively.
The name of the configuration to use.
If specified multiple times, all listed configurations will be run in
sequence.
-The default is the hostname minus the domain part.
+The default value is the hostname minus the domain part.
.It Fl d , Fl -dump
Dumps the configuration and exits without running the tinderbox.
.It Fl e Ar DIR , Fl -etcdir Ns = Ns Ar DIR
The directory where configuration files are located.
-The default is
+The default value is
.Pa $HOME/etc .
.It Fl l Ar FILE
The name of a file to lock upon startup.
@@ -73,8 +73,8 @@ If the lock is already held by another p
will terminate immediately rather than block.
.It Fl n Ar ncpu
The number of concurrent jobs to run.
-The default is the number of CPUs in the machine, or 1 if that number
-could not be determined.
+The default value is the number of CPUs in the machine, or 1 if that
+number could not be determined.
.El
.Ss Configuration
The
@@ -197,6 +197,14 @@ The default value is
.Pq Vt single
The machine currently being built for.
Read-only.
+.It OBJDIR
+.Pq Vt single
+The object directory.
+There is no default value; see the
+.Xr tinderbox 1
+script's
+.Fl -objdir
+option for details.
.It OPTIONS
.Pq Vt multiple
A list of additional options to pass to the
@@ -222,9 +230,16 @@ the architecture name.
The default value is
.Dq i386 .
.It RECIPIENT
-.Pq Vt single
-The address to which failure reports should be mailed.
-No default value.
+.Pq Vt multiple
+The addresses to which failure reports should be mailed.
+The default value is
+.Dq %%SENDER%% .
+.Pp
+To avoid unintentional spamming,
+.Nm
+will strip recipients in the
+.Li freebsd.org
+domain from this list unless the correct magic sauce is used.
.It REPOSITORY
.Pq Vt single
The location of the
@@ -244,6 +259,12 @@ No default value.
.It SRCDIR
.Pq Vt single
The source directory.
+There is no default value; see the
+.Xr tinderbox 1
+script's
+.Fl -srcdir
+option for details.
+.Pp
Normally, a separate directory within the sandbox will be used for
each build.
Using a shared source directory for all builds reduces disk space
@@ -261,45 +282,47 @@ The subject to use on failure reports.
The default value is
.Dq Tinderbox failure on %%arch%%/%%machine%% .
.It SVNBASE
+.Pq Vt single
The URL to the base of the Subversion repository.
.It TARGETS
.Pq Vt multiple
-A list of targets (commands) to specify to the
+A list of targets (commands) to pass to the
.Xr tinderbox 1
script.
-The default is
+The default value is
.Dq world .
.It TIMEOUT
+.Pq Vt single
The number of seconds after which each tinderbox invocation will time
out.
No default value.
.It TINDERBOX
+.Pq Vt single
The location of the
.Xr tinderbox 1
script.
The default value is
.Dq %%HOME%%/bin/tinderbox .
.It URLBASE
+.Pq Vt single
If defined, a URL constructed by appending the file name of the full
-log file to the expanded value of this variable will be appended to
+log file to the expanded value of this variable will be included in
failure reports.
-No default value.
+There is no default value.
.El
-.Pp
-Fields which are left undefined are filled in from the
-.Dq global
-setup.
.Ss Variable Substitution
-All single-valued configuration variables are subject to variable
-substitution immediately before use.
-If a variable's value contains strings of the form
+All configuration variables are subject to variable substitution
+immediately before use:
+.Bl -bullet
+.It
+If a single-value variable contains substrings of the form
.Va %%VAR%%
or
.Va %%var%% ,
-those strings are replaced with the values of the corresponding
-variables.
+those substrings are replaced with the values of the corresponding
+variables, after recursive substitution.
The difference between the first and the second form is that the
-latter expands to lower-case.
+latter is converted to lower-case before use.
For instance,
.Dq %%BRANCH%%
might expand to
@@ -308,6 +331,18 @@ while
.Dq %%branch%%
would expand to
.Dq releng_4 .
+.It
+If an element of a multiple-value variable is of the form
+.Va %%VAR%%
+or
+.Va %%var%%
+and the corresponding variable is a multiple-value variable, recursive
+substitution is first performed on that variable, and the resulting
+values are included individually in the result.
+.It
+Otherwise, elements of multiple-value variables are expanded
+individually according to the same rules as single-value variables.
+.El
.Sh SEE ALSO
.Xr perl 1 ,
.Xr tinderbox 1
Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl Wed Dec 19 09:55:13 2012 (r244418)
+++ user/des/tinderbox/tbmaster.pl Wed Dec 19 10:48:39 2012 (r244419)
@@ -33,8 +33,8 @@ use Fcntl qw(:DEFAULT :flock);
use POSIX;
use Getopt::Long;
-my $VERSION = "2.6";
-my $COPYRIGHT = "Copyright (c) 2003-2011 Dag-Erling Coïdan Smørgrav. " .
+my $VERSION = "2.9";
+my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Coïdan Smørgrav. " .
"All rights reserved.";
my $abbreviate; # Abbreviate path names in log file
@@ -52,15 +52,15 @@ my %INITIAL_CONFIG = (
'COPTFLAGS' => '',
'COMMENT' => '',
'CVSUP' => '',
- 'ENV' => [],
+ 'ENV' => [ ],
'HOSTNAME' => '',
'JOBS' => '',
'LOGDIR' => '%%SANDBOX%%/logs',
'OBJDIR' => '',
- 'OPTIONS' => [],
+ 'OPTIONS' => [ ],
'PATCH' => '',
'PLATFORMS' => [ 'i386' ],
- 'RECIPIENT' => '',
+ 'RECIPIENT' => [ '%%SENDER%%' ],
'REPOSITORY'=> '',
'SANDBOX' => '/tmp/tinderbox',
'SENDER' => '',
@@ -111,13 +111,33 @@ sub expand($) {
return "??$key??"
unless exists($CONFIG{uc($key)});
- return $CONFIG{uc($key)}
- if (ref($CONFIG{uc($key)}));
- my $str = $CONFIG{uc($key)};
- while ($str =~ s/\%\%(\w+)\%\%/expand($1)/eg) {
- # nothing
+ my $value = $CONFIG{uc($key)};
+ my @elements = ref($value) ? @{$value} : $value;
+ my @expanded;
+ while (@elements) {
+ my $elem = shift(@elements);
+ if (ref($elem)) {
+ # prepend to queue for further processing
+ unshift(@elements, @{$elem});
+ } elsif ($elem =~ m/^\%\%(\w+)\%\%$/) {
+ # prepend to queue for further processing
+ # note - can expand to a list
+ unshift(@elements, expand($1));
+ } else {
+ $elem =~ s/\%\%(\w+)\%\%/expand($1)/eg;
+ push(@expanded, $elem);
+ }
+ }
+ if ($key !~ m/[A-Z]/) {
+ @expanded = map { lc($_) } @expanded;
+ }
+ if (ref($value)) {
+ return @expanded;
+ } elsif (@expanded != 1) {
+ die("expand($key): expected one value, got ", int(@expanded), "\n");
+ } else {
+ return $expanded[0];
}
- return ($key =~ m/[A-Z]/) ? $str : lc($str);
}
#
@@ -289,7 +309,7 @@ sub tinderbox($$$) {
}
# Fork and start the tinderbox
- my @args = @{$CONFIG{'OPTIONS'}};
+ my @args = expand('OPTIONS');
push(@args, "--hostname=" . expand('HOSTNAME'));
push(@args, "--sandbox=" . realpath(expand('SANDBOX')));
push(@args, "--srcdir=" . realpath(expand('SRCDIR')))
@@ -311,8 +331,8 @@ sub tinderbox($$$) {
if ($CONFIG{'SVNBASE'});
push(@args, "--timeout=" . expand('TIMEOUT'))
if ($CONFIG{'TIMEOUT'});
- push(@args, @{$CONFIG{'TARGETS'}});
- push(@args, @{$CONFIG{'ENV'}});
+ push(@args, expand('TARGETS'));
+ push(@args, expand('ENV'));
push(@args, "CFLAGS=" . expand('CFLAGS'))
if ($CONFIG{'CFLAGS'});
push(@args, "COPTFLAGS=" . expand('COPTFLAGS'))
@@ -397,10 +417,17 @@ sub tinderbox($$$) {
# Record result in history file
history($start, $end, !$error);
+ # Filter recipients
+ my @recipients = expand('RECIPIENT');
+ if (!$ENV{'MAGIC_SAUCE'} ||
+ $ENV{'MAGIC_SAUCE'} ne 'FREEBSD_TINDERBOX') {
+ @recipients = grep { ! m/\@freebsd\.org/i } @recipients;
+ }
+
# Mail out error reports
- if ($error && $CONFIG{'RECIPIENT'}) {
+ if ($error && @recipients) {
my $sender = expand('SENDER');
- my $recipient = expand('RECIPIENT');
+ my $recipient = join(', ', @recipients);
my $subject = expand('SUBJECT');
if ($CONFIG{'URLBASE'}) {
$summary .= "\n\n" . expand('URLBASE') . "$logfile.full";
@@ -512,8 +539,8 @@ sub tbmaster($) {
my $stopfile = expand('SANDBOX') . "/stop";
my @jobs;
- foreach my $branch (@{$CONFIG{'BRANCHES'}}) {
- foreach my $platform (@{$CONFIG{'PLATFORMS'}}) {
+ foreach my $branch (expand('BRANCHES')) {
+ foreach my $platform (expand('PLATFORMS')) {
next if (%platforms && !$platforms{$platform});
my ($arch, $machine) = split('/', $platform, 2);
$machine = $arch
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 10:50:33 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 92D3F151;
Wed, 19 Dec 2012 10:50:33 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 784A18FC14;
Wed, 19 Dec 2012 10:50:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJAoXkY074795;
Wed, 19 Dec 2012 10:50:33 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJAoXls074794;
Wed, 19 Dec 2012 10:50:33 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191050.qBJAoXls074794@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 10:50:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244420 - in user/des/tinderbox: . etc www
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 10:50:33 -0000
Author: des
Date: Wed Dec 19 10:50:32 2012
New Revision: 244420
URL: http://svnweb.freebsd.org/changeset/base/244420
Log:
svn:keywords
Modified:
Directory Properties:
user/des/tinderbox/Makefile (props changed)
user/des/tinderbox/etc/Makefile (props changed)
user/des/tinderbox/etc/default.rc (props changed)
user/des/tinderbox/etc/head.rc (props changed)
user/des/tinderbox/etc/releng_4.rc (props changed)
user/des/tinderbox/etc/releng_5.rc (props changed)
user/des/tinderbox/etc/releng_6.rc (props changed)
user/des/tinderbox/etc/releng_7.rc (props changed)
user/des/tinderbox/etc/releng_8.rc (props changed)
user/des/tinderbox/etc/releng_9.rc (props changed)
user/des/tinderbox/etc/update_head.rc (props changed)
user/des/tinderbox/etc/update_releng_4.rc (props changed)
user/des/tinderbox/etc/update_releng_5.rc (props changed)
user/des/tinderbox/etc/update_releng_6.rc (props changed)
user/des/tinderbox/etc/update_releng_7.rc (props changed)
user/des/tinderbox/etc/update_releng_8.rc (props changed)
user/des/tinderbox/etc/update_releng_9.rc (props changed)
user/des/tinderbox/tbmaster.1 (props changed)
user/des/tinderbox/tbmaster.pl (props changed)
user/des/tinderbox/tinderbox.1 (props changed)
user/des/tinderbox/tinderbox.pl (props changed)
user/des/tinderbox/www/Makefile (props changed)
user/des/tinderbox/www/index.cgi (props changed)
user/des/tinderbox/www/tb.css (props changed)
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 10:55:34 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 2A49F478;
Wed, 19 Dec 2012 10:55:34 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 050AD8FC12;
Wed, 19 Dec 2012 10:55:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJAtXYl075765;
Wed, 19 Dec 2012 10:55:33 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJAtXpK075759;
Wed, 19 Dec 2012 10:55:33 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191055.qBJAtXpK075759@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 10:55:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244421 - in user/des/tinderbox: . www
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 10:55:34 -0000
Author: des
Date: Wed Dec 19 10:55:32 2012
New Revision: 244421
URL: http://svnweb.freebsd.org/changeset/base/244421
Log:
Update copyright and license.
Modified:
user/des/tinderbox/tbmaster.1
user/des/tinderbox/tbmaster.pl
user/des/tinderbox/tinderbox.1
user/des/tinderbox/tinderbox.pl
user/des/tinderbox/www/index.cgi
Modified: user/des/tinderbox/tbmaster.1
==============================================================================
--- user/des/tinderbox/tbmaster.1 Wed Dec 19 10:50:32 2012 (r244420)
+++ user/des/tinderbox/tbmaster.1 Wed Dec 19 10:55:32 2012 (r244421)
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2003-2012 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2003-2012 Dag-Erling Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl Wed Dec 19 10:50:32 2012 (r244420)
+++ user/des/tinderbox/tbmaster.pl Wed Dec 19 10:55:32 2012 (r244421)
@@ -1,28 +1,28 @@
#!/usr/bin/perl -Tw
#-
-# Copyright (c) 2003-2011 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2003-2012 Dag-Erling Smørgrav
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer
-# in this position and unchanged.
+# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
#
# $FreeBSD$
#
@@ -34,7 +34,7 @@ use POSIX;
use Getopt::Long;
my $VERSION = "2.9";
-my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Coïdan Smørgrav. " .
+my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " .
"All rights reserved.";
my $abbreviate; # Abbreviate path names in log file
Modified: user/des/tinderbox/tinderbox.1
==============================================================================
--- user/des/tinderbox/tinderbox.1 Wed Dec 19 10:50:32 2012 (r244420)
+++ user/des/tinderbox/tinderbox.1 Wed Dec 19 10:55:32 2012 (r244421)
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2003-2011 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2003-2012 Dag-Erling Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl Wed Dec 19 10:50:32 2012 (r244420)
+++ user/des/tinderbox/tinderbox.pl Wed Dec 19 10:55:32 2012 (r244421)
@@ -1,28 +1,28 @@
#!/usr/bin/perl -Tw
#-
-# Copyright (c) 2003-2011 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2003-2012 Dag-Erling Smørgrav
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer
-# in this position and unchanged.
+# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
#
# $FreeBSD$
#
@@ -34,7 +34,7 @@ use POSIX;
use Getopt::Long;
my $VERSION = "2.9";
-my $COPYRIGHT = "Copyright (c) 2003-2011 Dag-Erling Coïdan Smørgrav. " .
+my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " .
"All rights reserved.";
my $arch; # Target architecture
Modified: user/des/tinderbox/www/index.cgi
==============================================================================
--- user/des/tinderbox/www/index.cgi Wed Dec 19 10:50:32 2012 (r244420)
+++ user/des/tinderbox/www/index.cgi Wed Dec 19 10:55:32 2012 (r244421)
@@ -1,28 +1,28 @@
#!/usr/bin/perl -Tw
#-
-# Copyright (c) 2003-2011 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2003-2012 Dag-Erling Smørgrav
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer
-# in this position and unchanged.
+# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
#
# $FreeBSD$
#
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 11:01:31 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 5AB50B13;
Wed, 19 Dec 2012 11:01:31 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 26DB68FC0C;
Wed, 19 Dec 2012 11:01:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJB1VUb076924;
Wed, 19 Dec 2012 11:01:31 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJB1UDU076920;
Wed, 19 Dec 2012 11:01:30 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191101.qBJB1UDU076920@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 11:01:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244422 - in user/des/tinderbox: . www
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 11:01:31 -0000
Author: des
Date: Wed Dec 19 11:01:30 2012
New Revision: 244422
URL: http://svnweb.freebsd.org/changeset/base/244422
Log:
Bump the Perl version requirement from 5.6.1 to 5.10.1. Although I
don't currently use any constructs that aren't supported in 5.6.1, I
haven't run this code on anything older than 5.10 in a good long
while. 5.10.1 happens to be the oldest version to implement the
current semantics of the smartmatch operator, which is the newest
language feature I'm likely to need.
Modified:
user/des/tinderbox/tbmaster.pl
user/des/tinderbox/tinderbox.pl
user/des/tinderbox/www/index.cgi
Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl Wed Dec 19 10:55:32 2012 (r244421)
+++ user/des/tinderbox/tbmaster.pl Wed Dec 19 11:01:30 2012 (r244422)
@@ -27,7 +27,7 @@
# $FreeBSD$
#
-use 5.006_001;
+use v5.10.1;
use strict;
use Fcntl qw(:DEFAULT :flock);
use POSIX;
Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl Wed Dec 19 10:55:32 2012 (r244421)
+++ user/des/tinderbox/tinderbox.pl Wed Dec 19 11:01:30 2012 (r244422)
@@ -27,7 +27,7 @@
# $FreeBSD$
#
-use 5.006_001;
+use v5.10.1;
use strict;
use Fcntl qw(:DEFAULT :flock);
use POSIX;
Modified: user/des/tinderbox/www/index.cgi
==============================================================================
--- user/des/tinderbox/www/index.cgi Wed Dec 19 10:55:32 2012 (r244421)
+++ user/des/tinderbox/www/index.cgi Wed Dec 19 11:01:30 2012 (r244422)
@@ -27,7 +27,7 @@
# $FreeBSD$
#
-use 5.006_001;
+use v5.10.1;
use strict;
use POSIX qw(strftime);
use Sys::Hostname;
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 11:17:09 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 75C90ED1;
Wed, 19 Dec 2012 11:17:09 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 5C6A08FC0C;
Wed, 19 Dec 2012 11:17:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJBH9Mv080453;
Wed, 19 Dec 2012 11:17:09 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJBH9lF080452;
Wed, 19 Dec 2012 11:17:09 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191117.qBJBH9lF080452@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 11:17:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244423 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 11:17:09 -0000
Author: des
Date: Wed Dec 19 11:17:08 2012
New Revision: 244423
URL: http://svnweb.freebsd.org/changeset/base/244423
Log:
Allow hyphens in config names.
Modified:
user/des/tinderbox/tbmaster.pl
Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl Wed Dec 19 11:01:30 2012 (r244422)
+++ user/des/tinderbox/tbmaster.pl Wed Dec 19 11:17:08 2012 (r244423)
@@ -651,7 +651,7 @@ MAIN:{
or die("$etcdir: $!\n");
}
for (my $n = 0; $n < @configs; ++$n) {
- $configs[$n] =~ m/^(\w+)$/
+ $configs[$n] =~ m/^([\w-]+)$/
or die("invalid config: $configs[$n]\n");
$configs[$n] = $1;
}
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 13:20:21 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 6E233D9B;
Wed, 19 Dec 2012 13:20:21 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 536A08FC0A;
Wed, 19 Dec 2012 13:20:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJDKLEW003194;
Wed, 19 Dec 2012 13:20:21 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJDKLRh003193;
Wed, 19 Dec 2012 13:20:21 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191320.qBJDKLRh003193@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 13:20:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244433 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 13:20:21 -0000
Author: des
Date: Wed Dec 19 13:20:20 2012
New Revision: 244433
URL: http://svnweb.freebsd.org/changeset/base/244433
Log:
Fix incorrect default for TARGETS.
Modified:
user/des/tinderbox/tbmaster.1
Modified: user/des/tinderbox/tbmaster.1
==============================================================================
--- user/des/tinderbox/tbmaster.1 Wed Dec 19 12:20:04 2012 (r244432)
+++ user/des/tinderbox/tbmaster.1 Wed Dec 19 13:20:20 2012 (r244433)
@@ -290,7 +290,7 @@ A list of targets (commands) to pass to
.Xr tinderbox 1
script.
The default value is
-.Dq world .
+.Dq update, world .
.It TIMEOUT
.Pq Vt single
The number of seconds after which each tinderbox invocation will time
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 13:21:44 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3EDBBEE2;
Wed, 19 Dec 2012 13:21:44 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 257C58FC15;
Wed, 19 Dec 2012 13:21:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJDLiJm003592;
Wed, 19 Dec 2012 13:21:44 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJDLhvK003585;
Wed, 19 Dec 2012 13:21:43 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191321.qBJDLhvK003585@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 13:21:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244434 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 13:21:44 -0000
Author: des
Date: Wed Dec 19 13:21:43 2012
New Revision: 244434
URL: http://svnweb.freebsd.org/changeset/base/244434
Log:
Implement a new "version" target, which logs the state of the source tree
after updating it but before building anything. Bump $VERSION.
Modified:
user/des/tinderbox/tbmaster.pl
user/des/tinderbox/tinderbox.1
user/des/tinderbox/tinderbox.pl
Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl Wed Dec 19 13:20:20 2012 (r244433)
+++ user/des/tinderbox/tbmaster.pl Wed Dec 19 13:21:43 2012 (r244434)
@@ -33,7 +33,7 @@ use Fcntl qw(:DEFAULT :flock);
use POSIX;
use Getopt::Long;
-my $VERSION = "2.9";
+my $VERSION = "2.10";
my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " .
"All rights reserved.";
Modified: user/des/tinderbox/tinderbox.1
==============================================================================
--- user/des/tinderbox/tinderbox.1 Wed Dec 19 13:20:20 2012 (r244433)
+++ user/des/tinderbox/tinderbox.1 Wed Dec 19 13:21:43 2012 (r244434)
@@ -283,6 +283,9 @@ but at the end of each job.
As
.Cm precleanroot ,
but at the end of each job.
+.It Cm version
+After updating and patching the source tree but before doing anything
+else, log information about the current state of the source tree.
.El
.Pp
The commands are executed in the order in which they are listed above,
Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl Wed Dec 19 13:20:20 2012 (r244433)
+++ user/des/tinderbox/tinderbox.pl Wed Dec 19 13:21:43 2012 (r244434)
@@ -33,7 +33,7 @@ use Fcntl qw(:DEFAULT :flock);
use POSIX;
use Getopt::Long;
-my $VERSION = "2.9";
+my $VERSION = "2.10";
my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " .
"All rights reserved.";
@@ -71,6 +71,7 @@ my %cmds = (
'kernels' => 0,
'install' => 0,
'release' => 0,
+ 'version' => 0,
);
my %kernels;
my %lint;
@@ -613,10 +614,6 @@ MAIN:{
warning("sleeping $delay s and retrying...");
sleep($delay);
}
- my $svnversioncmd = [grep({ -x } @svnversioncmds)]->[0]
- or error("unable to locate svnversion binary");
- my $svnversion = `$svnversioncmd $srcdir`;
- message("At svn revision $svnversion");
} elsif (defined($cvsup)) {
logstage("cvsupping the source tree");
open(my $fh, ">", "$sandbox/supfile")
@@ -691,6 +688,24 @@ MAIN:{
}
}
+ # Print source tree version information
+ if ($cmds{'version'}) {
+ if (defined($svnbase)) {
+ my $svncmd = [grep({ -x } @svncmds)]->[0]
+ or error("unable to locate svn binary");
+ my $svnversioncmd = [grep({ -x } @svnversioncmds)]->[0]
+ or error("unable to locate svnversion binary");
+ if ($verbose) {
+ spawn($svncmd, "stat", $srcdir)
+ or error("unable to stat source tree");
+ }
+ my $svnversion = `$svnversioncmd $srcdir`; # XXX
+ message("At svn revision $svnversion");
+ } else {
+ warning("the 'version' target is only supported for svn");
+ }
+ }
+
# Prepare environment for make(1);
%ENV = (
'TZ' => "UTC",
From owner-svn-src-user@FreeBSD.ORG Wed Dec 19 13:26:48 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0A763EC;
Wed, 19 Dec 2012 13:26:48 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id CB69D8FC0A;
Wed, 19 Dec 2012 13:26:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJDQln9004496;
Wed, 19 Dec 2012 13:26:47 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJDQlnw004493;
Wed, 19 Dec 2012 13:26:47 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201212191326.qBJDQlnw004493@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 19 Dec 2012 13:26:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244435 - user/des/tinderbox/etc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 13:26:48 -0000
Author: des
Date: Wed Dec 19 13:26:46 2012
New Revision: 244435
URL: http://svnweb.freebsd.org/changeset/base/244435
Log:
Add experimental shared-source config for head. The idea is to first run
head-ss-update to update the shared source tree, then run head-ss-build
to actually build the code. This should result in a dramatic performance
increase for parallellized builds.
Added:
user/des/tinderbox/etc/head-ss-build.rc (contents, props changed)
user/des/tinderbox/etc/head-ss-update.rc (contents, props changed)
Modified:
user/des/tinderbox/etc/Makefile
Modified: user/des/tinderbox/etc/Makefile
==============================================================================
--- user/des/tinderbox/etc/Makefile Wed Dec 19 13:21:43 2012 (r244434)
+++ user/des/tinderbox/etc/Makefile Wed Dec 19 13:26:46 2012 (r244435)
@@ -9,6 +9,7 @@ ETCFILES += releng_7.rc update_releng_7.
ETCFILES += releng_8.rc update_releng_8.rc
ETCFILES += releng_9.rc update_releng_9.rc
ETCFILES += head.rc update_head.rc
+ETCFILES += head-ss-update.rc head-ss-build.rc
ETCDIR ?= ${HOME}/etc
ETCOWN ?= ${USER}
ETCGRP ?= ${USER}
Added: user/des/tinderbox/etc/head-ss-build.rc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/des/tinderbox/etc/head-ss-build.rc Wed Dec 19 13:26:46 2012 (r244435)
@@ -0,0 +1,11 @@
+#
+# HEAD tinderbox setup, shared source - build stage
+#
+# $FreeBSD$
+#
+
+branches = HEAD
+platforms = amd64, arm, armv6/arm, i386, i386/pc98, ia64, mips, mips64/mips, powerpc, powerpc64/powerpc, sparc64
+targets = precleanobj, version, world, lint, kernels, postcleanobj
+srcdir = %%SANDBOX%%/%%BRANCH%%/src
+recipient += <current@freebsd.org>, <%%arch%%@freebsd.org>
Added: user/des/tinderbox/etc/head-ss-update.rc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/des/tinderbox/etc/head-ss-update.rc Wed Dec 19 13:26:46 2012 (r244435)
@@ -0,0 +1,12 @@
+#
+# HEAD tinderbox setup, shared source - update stage
+#
+# $FreeBSD$
+#
+
+branches = HEAD
+platforms = none
+srcdir = %%SANDBOX%%/%%BRANCH%%/src
+targets = update, version
+recipient += <current@freebsd.org>
+subject = [%%COMMENT%%] source tree update failure
From owner-svn-src-user@FreeBSD.ORG Sat Dec 22 14:18:25 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 64893D8D;
Sat, 22 Dec 2012 14:18:25 +0000 (UTC)
(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2F9B08FC0A;
Sat, 22 Dec 2012 14:18:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMEIPhv092124;
Sat, 22 Dec 2012 14:18:25 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMEIPki092123;
Sat, 22 Dec 2012 14:18:25 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212221418.qBMEIPki092123@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 22 Dec 2012 14:18:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244587 - user/attilio/membarclean
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 14:18:25 -0000
Author: attilio
Date: Sat Dec 22 14:18:24 2012
New Revision: 244587
URL: http://svnweb.freebsd.org/changeset/base/244587
Log:
Cleanup the messy semantic about {w|r}mb() and their fitting in
FreeBSD world.
Added:
- copied from r244586, head/sys/
Directory Properties:
user/attilio/membarclean/ (props changed)
From owner-svn-src-user@FreeBSD.ORG Sat Dec 22 14:27:00 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 47A982C1;
Sat, 22 Dec 2012 14:27:00 +0000 (UTC)
(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2D1AF8FC17;
Sat, 22 Dec 2012 14:27:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMER0m5093405;
Sat, 22 Dec 2012 14:27:00 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMEQxRf093390;
Sat, 22 Dec 2012 14:26:59 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212221426.qBMEQxRf093390@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 22 Dec 2012 14:26:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244588 - in user/attilio/membarclean/dev: bce cxgb e1000
ixgbe vxge
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 14:27:00 -0000
Author: attilio
Date: Sat Dec 22 14:26:58 2012
New Revision: 244588
URL: http://svnweb.freebsd.org/changeset/base/244588
Log:
Remove unused barriers.
Modified:
user/attilio/membarclean/dev/bce/if_bcereg.h
user/attilio/membarclean/dev/cxgb/cxgb_osdep.h
user/attilio/membarclean/dev/e1000/e1000_osdep.h
user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h
user/attilio/membarclean/dev/vxge/vxge-osdep.h
Modified: user/attilio/membarclean/dev/bce/if_bcereg.h
==============================================================================
--- user/attilio/membarclean/dev/bce/if_bcereg.h Sat Dec 22 14:18:24 2012 (r244587)
+++ user/attilio/membarclean/dev/bce/if_bcereg.h Sat Dec 22 14:26:58 2012 (r244588)
@@ -544,12 +544,10 @@ default: DBPRINT(sc, BCE_INSANE_PHY,
#if __FreeBSD_version < 800054
#if defined(__i386__) || defined(__amd64__)
#define mb() __asm volatile("mfence" ::: "memory")
-#define wmb() __asm volatile("sfence" ::: "memory")
#define rmb() __asm volatile("lfence" ::: "memory")
#else
#define mb()
#define rmb()
-#define wmb()
#endif
#endif
Modified: user/attilio/membarclean/dev/cxgb/cxgb_osdep.h
==============================================================================
--- user/attilio/membarclean/dev/cxgb/cxgb_osdep.h Sat Dec 22 14:18:24 2012 (r244587)
+++ user/attilio/membarclean/dev/cxgb/cxgb_osdep.h Sat Dec 22 14:26:58 2012 (r244588)
@@ -72,18 +72,14 @@ struct t3_mbuf_hdr {
#if #cpu(i386) || defined __i386 || defined i386 || defined __i386__ || #cpu(x86_64) || defined __x86_64__
#define mb() __asm__ __volatile__ ("mfence;": : :"memory")
#define wmb() __asm__ __volatile__ ("sfence;": : :"memory")
- #define rmb() __asm__ __volatile__ ("lfence;": : :"memory")
#elif #cpu(sparc64) || defined sparc64 || defined __sparcv9
#define mb() __asm__ __volatile__ ("membar #MemIssue": : :"memory")
#define wmb() mb()
- #define rmb() mb()
#elif #cpu(sparc) || defined sparc || defined __sparc__
#define mb() __asm__ __volatile__ ("stbar;": : :"memory")
#define wmb() mb()
- #define rmb() mb()
#else
#define wmb() mb()
- #define rmb() mb()
#define mb() /* XXX just to make this compile */
#endif
#else
Modified: user/attilio/membarclean/dev/e1000/e1000_osdep.h
==============================================================================
--- user/attilio/membarclean/dev/e1000/e1000_osdep.h Sat Dec 22 14:18:24 2012 (r244587)
+++ user/attilio/membarclean/dev/e1000/e1000_osdep.h Sat Dec 22 14:26:58 2012 (r244588)
@@ -107,18 +107,6 @@ typedef boolean_t bool;
#define __le32 u32
#define __le64 u64
-#if __FreeBSD_version < 800000 /* Now in HEAD */
-#if defined(__i386__) || defined(__amd64__)
-#define mb() __asm volatile("mfence" ::: "memory")
-#define wmb() __asm volatile("sfence" ::: "memory")
-#define rmb() __asm volatile("lfence" ::: "memory")
-#else
-#define mb()
-#define rmb()
-#define wmb()
-#endif
-#endif /*__FreeBSD_version < 800000 */
-
#if defined(__i386__) || defined(__amd64__)
static __inline
void prefetch(void *x)
Modified: user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h
==============================================================================
--- user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h Sat Dec 22 14:18:24 2012 (r244587)
+++ user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h Sat Dec 22 14:26:58 2012 (r244588)
@@ -130,10 +130,8 @@ typedef boolean_t bool;
#if defined(__i386__) || defined(__amd64__)
#define mb() __asm volatile("mfence" ::: "memory")
#define wmb() __asm volatile("sfence" ::: "memory")
-#define rmb() __asm volatile("lfence" ::: "memory")
#else
#define mb()
-#define rmb()
#define wmb()
#endif
#endif
Modified: user/attilio/membarclean/dev/vxge/vxge-osdep.h
==============================================================================
--- user/attilio/membarclean/dev/vxge/vxge-osdep.h Sat Dec 22 14:18:24 2012 (r244587)
+++ user/attilio/membarclean/dev/vxge/vxge-osdep.h Sat Dec 22 14:26:58 2012 (r244588)
@@ -262,12 +262,8 @@ typedef vxge_dma_alloc_t pci_dma_acc_h;
/* Write memory barrier */
#if __FreeBSD_version < 800000
#if defined(__i386__) || defined(__amd64__)
-#define mb() __asm volatile("mfence" ::: "memory")
#define wmb() __asm volatile("sfence" ::: "memory")
-#define rmb() __asm volatile("lfence" ::: "memory")
#else
-#define mb()
-#define rmb()
#define wmb()
#endif
#endif
From owner-svn-src-user@FreeBSD.ORG Sat Dec 22 14:35:46 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id EFD6F430;
Sat, 22 Dec 2012 14:35:46 +0000 (UTC)
(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id D3CBE8FC0C;
Sat, 22 Dec 2012 14:35:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMEZk2m094628;
Sat, 22 Dec 2012 14:35:46 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMEZkNo094627;
Sat, 22 Dec 2012 14:35:46 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212221435.qBMEZkNo094627@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 22 Dec 2012 14:35:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244589 - user/attilio/membarclean/dev/bxe
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 14:35:47 -0000
Author: attilio
Date: Sat Dec 22 14:35:46 2012
New Revision: 244589
URL: http://svnweb.freebsd.org/changeset/base/244589
Log:
There is no relation between prefetcht instruction and the mentioned
__FreeBSD_version, so fix this up by making prefetcht always available.
Modified:
user/attilio/membarclean/dev/bxe/if_bxe.h
Modified: user/attilio/membarclean/dev/bxe/if_bxe.h
==============================================================================
--- user/attilio/membarclean/dev/bxe/if_bxe.h Sat Dec 22 14:26:58 2012 (r244588)
+++ user/attilio/membarclean/dev/bxe/if_bxe.h Sat Dec 22 14:35:46 2012 (r244589)
@@ -1806,19 +1806,19 @@ struct bxe_softc {
#define mb() __asm volatile("mfence" ::: "memory")
#define wmb() __asm volatile("sfence" ::: "memory")
#define rmb() __asm volatile("lfence" ::: "memory")
-static __inline void
-prefetch(void *x)
-{
- __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
-}
#else
#define mb()
#define rmb()
#define wmb()
-#define prefetch()
#endif
#endif
+static __inline void
+prefetch(void *x)
+{
+ __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
+}
+
#define BXE_RX_ALIGN (1 << BXE_RX_ALIGN_SHIFT)
#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & (~PAGE_MASK))
From owner-svn-src-user@FreeBSD.ORG Sat Dec 22 20:35:46 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 05829EF6;
Sat, 22 Dec 2012 20:35:46 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DD7248FC0C;
Sat, 22 Dec 2012 20:35:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMKZjNw047694;
Sat, 22 Dec 2012 20:35:45 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMKZjAH047693;
Sat, 22 Dec 2012 20:35:45 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201212222035.qBMKZjAH047693@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Sat, 22 Dec 2012 20:35:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244599 - user/uqs/git_conv
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 20:35:46 -0000
Author: uqs
Date: Sat Dec 22 20:35:45 2012
New Revision: 244599
URL: http://svnweb.freebsd.org/changeset/base/244599
Log:
Skip two bogues revisions that commited files under /projects/ directly.
Modified:
user/uqs/git_conv/freebsd.rules
Modified: user/uqs/git_conv/freebsd.rules
==============================================================================
--- user/uqs/git_conv/freebsd.rules Sat Dec 22 20:16:21 2012 (r244598)
+++ user/uqs/git_conv/freebsd.rules Sat Dec 22 20:35:45 2012 (r244599)
@@ -16,6 +16,15 @@ match /user/GUIDELINES.txt
end match
match /vendor/atf/(README.txt|FREEBSD-Xlist)
end match
+# Skip bogus revision and the backout rev
+match /projects/.*
+min revision 244485
+max revision 244485
+end match
+match /projects/.*
+min revision 244487
+max revision 244487
+end match
match /svnadmin/.*
end match