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

don't go thru patch/configure/build for very small ports.

Browse Source
This commit is contained in:
espie 2013-01-10 12:27:21 +00:00
parent 41893cf148
commit 647327b6ba
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infrastructure/bin/dpb
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: dpb,v 1.74 2013/01/07 10:57:31 espie Exp $
# $OpenBSD: dpb,v 1.75 2013/01/10 12:27:21 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -265,6 +265,10 @@ sub start_cores
$override_prop->{stuck} =
$state->{subst}->value('STUCK_TIMEOUT');
}
if ($state->define_present('SMALL_TIME')) {
$override_prop->{small} =
$state->{subst}->value('SMALL_TIME');
}
if ($state->define_present('CONNECTION_TIMEOUT')) {
$override_prop->{timeout} =
$state->{subst}->value('CONNECTION_TIMEOUT');
@ -284,6 +288,7 @@ sub start_cores
junk => 100,
parallel => '/2',
wait_timeout => 600,
small => 120,
};
if ($state->{config}) {

9
infrastructure/lib/DPB/Job/Port.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Port.pm,v 1.65 2013/01/10 12:05:55 espie Exp $
# $OpenBSD: Port.pm,v 1.66 2013/01/10 12:27:21 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -703,9 +703,10 @@ sub add_normal_tasks
my @todo;
my $builder = $self->{builder};
my $small = 0;
# if (defined $times->{$self->{v}} && $times->{$self->{v}} < 120) {
# $small = 1;
# }
if (defined $times->{$self->{v}} &&
$times->{$self->{v}} < ($hostprop->{small} // 120)) {
$small = 1;
}
if ($builder->{clean}) {
$self->insert_tasks(DPB::Task::Port::BaseClean->new('clean'));