cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

duplicate -m option, resolve conflict by renaming old unused one to -M.

Browse Source 
Document some new stuff
This commit is contained in:
espie 2012-03-09 15:16:38 +00:00
parent dcc22d4d3f
commit 11d2036d1a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infrastructure/bin/dpb
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: dpb,v 1.49 2012/03/09 12:51:38 espie Exp $
# $OpenBSD: dpb,v 1.50 2012/03/09 15:16:38 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -140,7 +140,7 @@ sub handle_options
$state->{random} = 1;
$state->heuristics->random;
},
m => sub {
M => sub {
$state->heuristics->set_threshold(shift)
},
P => sub {
@ -160,9 +160,9 @@ sub handle_options
},
};
$state->SUPER::handle_options('acemqrRstuUvh:xA:C:f:F:I:j:J:m:P:b:L:S:',
$state->SUPER::handle_options('acemqrRstuUvh:xA:C:f:F:I:j:J:M:P:b:L:S:',
"[-acemrRsuUvx] [-A arch] [-C plist] [-f N] [-F N] [-I plist] [-J p] [-j N]",
"[-P plist] [-h hosts] [-L logdir] [-b log] [-t ctimeout] [-m threshold]",
"[-P plist] [-h hosts] [-L logdir] [-b log] [-t ctimeout] [-M threshold]",
"[path ...]");
$state->{fullrepo} = join("/", $state->{repo}, $state->arch, "all");
$state->{logdir} //= $ENV{LOGDIR} // '%p/logs/%a';

18
infrastructure/man/man1/dpb.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: dpb.1,v 1.35 2012/03/02 19:35:09 espie Exp $
.\" $OpenBSD: dpb.1,v 1.36 2012/03/09 15:16:38 espie Exp $
.\"
.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: March 2 2012 $
.Dd $Mdocdate: March 9 2012 $
.Dt DPB 1
.Os
.Sh NAME
@ -23,7 +23,7 @@
.Sh SYNOPSIS
.Nm dpb
.Bk -words
.Op Fl aceqrRsuUx
.Op Fl acemqrRsuUx
.Op Fl A Ar arch
.Op Fl b Ar logfile
.Op Fl C Ar pathlist
@ -35,7 +35,7 @@
.Op Fl J Ar p
.Op Fl j Ar n
.Op Fl L Ar logdir
.Op Fl m Ar threshold
.Op Fl M Ar threshold
.Op Fl P Ar pathlist
.Op Fl S Ar sizefile
.Op Ar pathlist ...
@ -320,13 +320,15 @@ Choose a log directory.
Defaults to
.Pa ${PORTSDIR}/logs/${ARCH}
.Pc .
.It Fl m Ar threshold
.It Fl M Ar threshold
Build ports besides the memory threshold within
.Pa /tmp .
Avoid for now, as
.Xr mfs 8
has serious race conditions which yield
random errors under stress conditions such as bulk build.
.It Fl m
Force tty-style reporting.
.It Fl P Ar pathlist
Read list of
.Xr pkgpath 7
@ -602,6 +604,12 @@ will force
into checking all files again.
.Pp
.Nm
also records rolling build statistics under
.Pa ${DISTDIR}/build-stats/${ARCH} ,
and uses them automatically in the absence of
.Fl b Ar logfile .
.Pp
.Nm
will also create a large number of log files under
.Pa ${PORTSDIR}/logs/{$ARCH} :
.Bl -tag -width engine.log