From 9941dd67625f104aeb2954ff1942bc7b1b0df549 Mon Sep 17 00:00:00 2001
From: jkratoch <>
Date: Fri, 5 Mar 2010 09:09:01 +0000
Subject: [PATCH] Change *-cvs-bare cache dirs to *-cvs-master. Fixup `rm
 -rf'es against u-w directories. Temporarily re-disable -pie runs for gdbcvs.

---
 bin/hammock | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/bin/hammock b/bin/hammock
index 3859c36..76f8c5b 100755
--- a/bin/hammock
+++ b/bin/hammock
@@ -8,10 +8,12 @@ use Getopt::Long qw(:config no_ignore_case);
 use Carp qw(&carp);
 my $start=time();
 
-my $gdbcvsbare=$ENV{"HOME"}."/redhat/gdb-cvs-bare";
-my $binutilscvsbare=$ENV{"HOME"}."/redhat/binutils-cvs-bare";
+my $gdbcvsmaster=$ENV{"HOME"}."/redhat/gdb-cvs-master";
+my $binutilscvsmaster=$ENV{"HOME"}."/redhat/binutils-cvs-master";
 my $archermaster=$ENV{"HOME"}."/redhat/archer-master";
 my $fedoracvsroot=q{:pserver:anonymous:@cvs.fedoraproject.org:/cvs/pkgs};
+#Unknown host cvs.devel.redhat.com.
+#my $rhelcvsroot=q{:pserver:anonymous:@cvs.devel.redhat.com:/cvs/dist};
 my $rhelcvsroot=q{:pserver:anonymous:@192.168.67.2:3401/cvs/dist};
 my $arch_i386=qr{(?:x86|i\d86|ia32)}io;
 my $arch_x86_64=qr{(?:x8664|x86_64|em64t)}io;
@@ -174,7 +176,7 @@ for my $seq (defined $userid ? $userid : (0..99)) {
   $dir="$basedir/$id";
   last if ! -e $dir;
 }
-spawn "rm -rf $dir" if -d $dir && $force && defined $userid;
+spawn "chmod -R u+w $dir; rm -rf $dir" if -d $dir && $force && defined $userid;
 error "Directory not free: $dir" if !$id || !$dir || -e $dir;
 print STDERR "ID = $id | dir = $dir\n";
 error "No distros specified" if !@distrouse;
@@ -346,9 +348,9 @@ while (@distrouse || keys(%child)) {
 
     if ($component=~/^(gdb|binutils)cvs$/) {
       my $which=$1;
-      my $cvsbare=$which eq "gdb" ? $gdbcvsbare : $binutilscvsbare;
-      if (-d $cvsbare) {
-	spawn "cp -a $cvsbare $builddir/src; cd $builddir/src; cvs update $cvsbranch";
+      my $cvsmaster=$which eq "gdb" ? $gdbcvsmaster : $binutilscvsmaster;
+      if (-d $cvsmaster) {
+	spawn "cp -a $cvsmaster $builddir/src; cd $builddir/src; cvs update $cvsbranch";
       } else {
 	spawn "cd $builddir; cvs -q -z3 -d :pserver:anoncvs:\@sourceware.org:/cvs/src co $cvsbranch $which";
       }
@@ -394,7 +396,8 @@ while (@distrouse || keys(%child)) {
       } else {
 	my @check=($distro=~/-x86_64/ ? qw(-m64 -m32) : -m32);
 	@check=map("check//unix/$_",@check);
-	@check=map({($_,"$_/-fPIE/-pie");} @check);
+### FIXME:
+###	@check=map({($_,"$_/-fPIE/-pie");} @check);
 	# for i in ".join(" ",@check).";do orphanripper make -k \$i || :;done
 	mockrun "cd $baretestsuite; $errs1; errs2; cd gdb; ulimit -c unlimited; orphanripper make -k ".join(" ",@check)." || :; mkdir $out; ".q{for t in sum log;do for file in testsuite*/gdb.$t;do suffix="${file#testsuite.unix.}"; suffix="${suffix%/gdb.$t}"; ln $file}." $out/gdb-$distro".q{$suffix.$t || :; done; done;};
       }
-- 
1.8.3.1