my $gdbcvsbare=$ENV{"HOME"}."/redhat/gdb-cvs-bare";
my $binutilscvsbare=$ENV{"HOME"}."/redhat/binutils-cvs-bare";
-my $archermaster=$ENV{"HOME"}."/redhat/master";
+my $archermaster=$ENV{"HOME"}."/redhat/archer-master";
my $fedoracvsroot=q{:pserver:anonymous:@cvs.fedoraproject.org:/cvs/pkgs};
my $rhelcvsroot=q{:pserver:anonymous:@192.168.67.2:3401/cvs/dist};
my $arch_i386=qr{(?:x86|i\d86|ia32)}io;
my $srcrpm;
my @file;
my @target;
+my $configure;
# FIXME: Connect make paralellization to the children.
my $distrojobs;
die if !GetOptions(
"file=s{,}"=>\@file,
"target=s{,}"=>\@target,
"D|distrojobs=s"=>\$distrojobs,
+ "configure=s"=>\$configure,
);
$component and ($component=~m{^(?:(?:fedora|rhel)(?:gdb|binutils|glibc)|gdbcvs|binutilscvs|archer-.*|/home/.*)$} or die "-c|--component required to be: fedoragdb|rhelgdb|fedorabinutils|rhelbinutils|fedoraglibc|rhelglibc|gdbcvs|binutilscvs|archer-*|/home/*");
$component and $component=~m{^/home/} and (-f "$component/gdb/gdbtypes.c" or die "$component/gdb/gdbtypes.c not found");
s/^(?:epel|rhel|centos)-?(\d)/epel-$1/;
s/^(?:f|fedora)-?(\d)/fedora-$1/;
my @archuse;
+ @archuse="" if -d "/var/lib/mock/$_";
@archuse="i386" if s/-$arch_i386$//o;
@archuse="x86_64" if s/-$arch_x86_64$//o;
for my $arch (@archuse?@archuse:@arch) {
- my $dir="/var/lib/mock/$_-$arch";
+ my $dir="/var/lib/mock/$_".(!$arch?"":"-$arch");
$force or -d $dir or error "No distro: $dir";
}
@archuse=@arch if !@archuse;
for my $archuse (@archuse) {
for my $target (@target?@target:undef()) {
- push @distrouse,{"distro"=>"$distro-$archuse","componentdistro"=>$componentdistro,"target"=>$target};
+ push @distrouse,{"distro"=>$distro.(!$archuse?"":"-$archuse"),"componentdistro"=>$componentdistro,"target"=>$target};
}
}
}
"component"=>$component,
"srcrpm"=>$srcrpm,
"file"=>join("\n",@file),
+ "configure"=>$configure,
);
while (my($name,$val)=each(%dump)) {
writefile "$dir/$name","$val\n" if $val;
my $errs1="errs1";
$errs1.=" --target=$target" if $target;
+ $errs1.=" $configure" if $configure;
if ($component eq "binutilscvs") {
mockrun "cd $baretestsuite; $errs1; errs2; ulimit -c unlimited; orphanripper make -k check || :; mkdir $out; ".q{for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log};do ln $file}." $out/binutils-$distro-".q{$(basename $file) || :; done;};