Fixes for new build environment

Build-tools/Do-all-build-steps

@@ -14,6 +14,7 @@ EXTRA_CONFIG="--without-perl"
 echo "Building on $to_host"
 
 rm -rf $BD/*
+rm -f $WD/binary/*
 mkdir -p $WD/Logs
 mkdir -p $BD/Logs
 
@@ -86,3 +87,7 @@ fi
 cd "$BD"
 DIST=`ls -t mysql-*.tar.gz | head -1`
 $BD/Build-tools/mysql-copyright --target=. $DIST
+
+# move the binaries to the 'binary' directory
+mv $BD/mysql*tar.gz $WD/binary
+mv $BD/NEW-RPMS/* $WD/binary

Build-tools/Do-compile

@@ -66,6 +66,7 @@ if ($opt_stage == 0)
   system("mkdir $host/test") if (! -d "$host/test");
   system("mkdir $host/bin") if (! -d "$host/bin");
   system("mkdir Logs") if (! -d "Logs");
+  system("mv $log ${log}-old") if (-f $log);
   unlink($log);
 }