Add -nocopy option to prevent bindist.tar from being copied over. Could

be useful between the first and second phases of the build.

Do a "killall make fetch" to clear any remaining processes.

1 files changed, 17 insertions, 7 deletions

diff --git a/Tools/portbuild/scripts/setupnode b/Tools/portbuild/scripts/setupnode
index e757008a645f..307bb3ec9f59 100755
--- a/Tools/portbuild/scripts/setupnode
+++ b/Tools/portbuild/scripts/setupnode
@@ -1,6 +1,11 @@
 #!/bin/sh
+nocopy=0
+if [ "x$1" = "x-nocopy" ]; then
+  nocopy=1
+  shift
+fi
 if [ $# != 4 ]; then
-  echo "usage: $0 master portbuilddir branch md5"
+  echo "usage: $0 [-nocopy] master portbuilddir branch md5"
   exit 1
 fi
 if [ $(echo $(/sbin/mount | grep "$2/.*read-only" | awk '{print $3}' | wc -c)) != 0 ]; then
@@ -12,13 +17,18 @@ if ! rm -rf $2/*/chroot/* >/dev/null 2>&1; then
   rm -rf $2/*/chroot/*
 fi
 
+killall make fetch >/dev/null 2>&1
+
 mkdir -p $2/scripts $2/$3/tarballs $2/$3/chroot
 
 scp -p $1:$2/scripts/portbuild $2/scripts
-md5=$(/sbin/md5 $2/$3/tarballs/bindist.tar | awk '{print $4}')
-if [ "$md5" = "$4" ]; then
-  echo "not copying bindist to $(hostname -s) since it is already up to date"
-else
-  echo "copying bindist to $(hostname -s)"
-  scp -p $1:$2/$3/tarballs/bindist.tar $2/$3/tarballs
+
+if [ "$nocopy" = 0 ]; then
+  md5=$(/sbin/md5 $2/$3/tarballs/bindist.tar | awk '{print $4}')
+  if [ "$md5" = "$4" ]; then
+    echo "not copying bindist to $(hostname -s) since it is already up to date"
+  else
+    echo "copying bindist to $(hostname -s)"
+    scp -p $1:$2/$3/tarballs/bindist.tar $2/$3/tarballs
+  fi
 fi