Date: Wed, 2 Oct 2013 17:22:28 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r255995 - user/des/tinderbox Message-ID: <201310021722.r92HMSUK034754@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed Oct 2 17:22:27 2013 New Revision: 255995 URL: http://svnweb.freebsd.org/changeset/base/255995 Log: Remove support for cvs and cvsup. Modified: user/des/tinderbox/tinderbox.1 user/des/tinderbox/tinderbox.pl Modified: user/des/tinderbox/tinderbox.1 ============================================================================== --- user/des/tinderbox/tinderbox.1 Wed Oct 2 17:21:28 2013 (r255994) +++ user/des/tinderbox/tinderbox.1 Wed Oct 2 17:22:27 2013 (r255995) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 29, 2013 +.Dd October 2, 2013 .Dt TINDERBOX 1 .Os .Sh NAME @@ -54,14 +54,10 @@ The default value is whatever the host s reports. .It Fl -branch Ns = Ns Ar BRANCH The branch to check out from -.Xr svn 1 , -.Xr cvs 1 -or -.Xr cvsup 1 +.Xr svn 1 when updating the source tree. The default is to check out HEAD. -When using -.Xr svn 1 , +For historical compatibility, .Xr cvs 1 Ns -style branch names are translated to .Xr svn 1 @@ -73,15 +69,6 @@ and .Dv RELENG_9_1 becomes .Pa releng/9.1 . -.It Fl -cvsup Ns = Ns Ar NAME -The name of the -.Xr cvsup 1 -server from which to update the source tree -.Cm update -command is specified. -The default is to use -.Xr cvs 1 -instead. .It Fl -destdir Ns = Ns Ar DIR The directory (aka .Dv DESTDIR ) @@ -134,14 +121,6 @@ for more information), regardless of whe .Cm patch command was specified. The default is to not apply any patches. -.It Fl -repository Ns = Ns Ar DIR -The location of the -.Xr cvs 1 -repository from which to update the source tree if the -.Cm update -command is specified. -The default is -.Pa /home/ncvs . .It Fl -sandbox Ns = Ns Ar DIR The location of the sandbox in which the builds are to take place. This directory should reside on a reasonably fast disk with at least @@ -166,6 +145,9 @@ or commands. .It Fl -svnbase Ns = Ns Ar URL The URL to the base of the Subversion repository. +The default is +.\" There does not seem to be an mdoc macro for URLs; use Pa instead. +.Pa svn://svn.freebsd.org/base . .It Fl -timeout Ns = Ns Ar NUM The maximum wall-time duration of the run, in seconds. The default is to continue until all targets are completed. @@ -214,7 +196,7 @@ Delete the installation tree at the star Delete the release chroot tree at the start of each job. .It Cm update Update the sources using -.Xr cvs 1 . +.Xr svn 1 . This is highly recommended, for obvious reasons, if the .Cm clean command is specified. @@ -332,10 +314,6 @@ The following additional variables are s .Bl -tag -width 18n .It CHROOTDIR .Va $SANDBOX/root -.It CVSROOT -As specified with the -.Fl -repository -option. .It RELEASETAG .Va -rBRANCH if @@ -369,9 +347,9 @@ if a patch was specified. .Pp None of these variables may be overridden by command-line arguments. .Sh SEE ALSO -.Xr cvs 1 , .Xr make 1 , .Xr patch 1 , +.Xr svn 1 , .Xr tbmaster 1 , .Xr build 7 , .Xr release 7 Modified: user/des/tinderbox/tinderbox.pl ============================================================================== --- user/des/tinderbox/tinderbox.pl Wed Oct 2 17:21:28 2013 (r255994) +++ user/des/tinderbox/tinderbox.pl Wed Oct 2 17:22:27 2013 (r255995) @@ -33,13 +33,12 @@ use Fcntl qw(:DEFAULT :flock); use POSIX; use Getopt::Long; -my $VERSION = "2.12"; +my $VERSION = "2.20"; my $COPYRIGHT = "Copyright (c) 2003-2013 Dag-Erling Smørgrav. " . "All rights reserved."; my $arch; # Target architecture my $branch; # CVS branch to check out -my $cvsup; # Name of CVSup server my $destdir; # Destination directory my $jobs; # Number of paralell jobs my $hostname; # Name of the host running the tinderbox @@ -47,7 +46,6 @@ my $logfile; # Path to log file my $machine; # Target machine my $objdir; # Location of object tree my $patch; # Patch to apply before building -my $repository; # Location of CVS repository my $sandbox; # Location of sandbox my $srcdir; # Location of source tree my $svnbase; # Subversion base URL @@ -80,17 +78,6 @@ my $starttime; my $unamecmd = '/usr/bin/uname'; -my @cvscmds = ( - '/usr/bin/cvs', - '/usr/local/bin/cvs', -); - -my @cvsupcmds = ( - '/usr/bin/csup', - '/usr/local/bin/csup', - '/usr/local/bin/cvsup' -); - my @svncmds = ( '/usr/bin/svn', '/usr/local/bin/svn', @@ -386,15 +373,13 @@ Options: Parameters: --arch=ARCH Target architecture (e.g. i386) - --branch=BRANCH CVS branch to check out - --cvsup CVSup server + --branch=BRANCH Source branch to check out --destdir=DIR Destination directory when installing --jobs=NUM Maximum number of paralell jobs --hostname=NAME Name of the host running the tinderbox --logfile=FILE Path to log file --machine=MACHINE Target machine (e.g. pc98) --patch=PATCH Patch to apply before building - --repository=DIR Location of CVS repository --sandbox=DIR Location of sandbox --svnbase=URL Subversion base URL --timeout=SECONDS Maximum allowed build time @@ -432,15 +417,14 @@ MAIN:{ chomp($hostname); $branch = "HEAD"; $jobs = 0; - $repository = "/home/ncvs"; $sandbox = "/tmp/tinderbox"; + $svnbase = "svn://svn.freebsd.org/base"; $timeout = 0; # Get options GetOptions( "arch=s" => \$arch, "branch=s" => \$branch, - "cvsup=s" => \$cvsup, "destdir=s" => \$destdir, "jobs=i" => \$jobs, "hostname=s" => \$hostname, @@ -448,7 +432,6 @@ MAIN:{ "machine=s" => \$machine, "objdir=s" => \$objdir, "patch=s" => \$patch, - "repository=s" => \$repository, "sandbox=s" => \$sandbox, "srcdir=s" => \$srcdir, "svnbase=s" => \$svnbase, @@ -614,55 +597,8 @@ MAIN:{ warning("sleeping $delay s and retrying..."); sleep($delay); } - } elsif (defined($cvsup)) { - logstage("cvsupping the source tree"); - open(my $fh, ">", "$sandbox/supfile") - or error("$sandbox/supfile: $!"); - print($fh "*default base=$sandbox\n"); - print($fh "*default prefix=$sandbox\n"); - print($fh "*default delete use-rel-suffix\n"); - print($fh "src-all release=cvs"); - if ($branch eq 'HEAD') { - print($fh " tag=."); - } else { - print($fh " tag=$branch"); - } - print($fh "\n"); - close($fh); - my @cvsupargs = ( - "-z", - "-r 3", - "-g", - "-L", ($verbose ? 1 : 0), - "-h", - split(' ', $cvsup), - "$sandbox/supfile" - ); - my $cvsupcmd = [grep({ -x } @cvsupcmds)]->[0] - or error("unable to locate cvsup / csup binary"); - spawn($cvsupcmd, @cvsupargs) - or error("unable to cvsup the source tree"); } else { - logstage("checking out the source tree from $repository"); - cd("$sandbox"); - my @cvsargs = ( - "-f", - "-R", - $verbose ? "-q" : "-Q", - "-d$repository", - ); - if (-d $srcdir) { - push(@cvsargs, "update", "-Pd"); - } else { - push(@cvsargs, "checkout", "-P"); - }; - push(@cvsargs, ($branch eq 'HEAD') ? "-A" : "-r$branch") - if defined($branch); - push(@cvsargs, "src"); - my $cvscmd = [grep({ -x } @cvscmds)]->[0] - or error("unable to locate cvs binary"); - spawn($cvscmd, @cvsargs) - or error("unable to check out the source tree"); + error("no svn base URL defined"); } } @@ -849,7 +785,6 @@ MAIN:{ # Build a release if requested if ($cmds{'release'}) { $ENV{'CHROOTDIR'} = "$sandbox/root"; - $ENV{'CVSROOT'} = $repository; $ENV{'RELEASETAG'} = $branch if $branch ne 'HEAD'; $ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} =
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310021722.r92HMSUK034754>