use the local do_build script

diff --git a/do_merge b/do_merge
index 59f1ea9bfda131b620467cbb6faea1f2fb6dadba..21cdf118bfe8b9e90dbc0f299d05ec05a5f7549c 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
+
 build_host="ka2"
 build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
@@ -147,7 +149,7 @@ for h in $heads; do
        esac
        [ -f "../merge-fixes/$tree" ] && {
                for p in $(cat "../merge-fixes/$tree"); do
-                       $(dirname $0)/merge_fix -n "$p" || {
+                       "$bin_dir/merge_fix" -n "$p" || {
                                bash -i || exit
                        }
                done
@@ -175,7 +177,7 @@ for h in $heads; do
                echo git push failed 1>&2
                bash -i || exit
        }
-       ssh "$build_host" "$build_cmd" || {
+       "$bin_dir/do_build" || {
                echo Build failed 1>&2
                bash -i || exit
        }

diff --git a/do_patch b/do_patch
index f35dab640964aca2fc7759f76629b92d49d4e861..e17c79c23c2b9e1d2ed377baa7054a2744408857 100755 (executable)
--- a/do_patch
+++ b/do_patch
@@ -1,9 +1,10 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 build_host="ka2"
 build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
@@ -48,7 +49,7 @@ git push -f "$build_host":"$build_dir" master:refs/heads/next || {
        echo git push failed 1>&2
        bash -i || exit
 }
-ssh "$build_host" "$build_cmd" || {
+"$bin_dir/do_build" || {
        echo Build failed 1>&2
        bash -i || exit
 }

diff --git a/do_revert b/do_revert
index 965f27a86f2fca0a4f801630d465b543edc8b82b..a66225b605a784ac896ce70a88563b5e964d26d3 100755 (executable)
--- a/do_revert
+++ b/do_revert
@@ -1,9 +1,10 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 build_host="ka2"
 build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
@@ -48,7 +49,7 @@ git push -f "$build_host":"$build_dir" master:refs/heads/next || {
        echo git push failed 1>&2
        bash -i || exit
 }
-ssh "$build_host" "$build_cmd" || {
+"$bin_dir/do_build" || {
        echo Build failed 1>&2
        bash -i || exit
 }

diff --git a/merge_akpm b/merge_akpm
index aa4e984bfabffe956f68aba47de073d289454dbf..8de8b7463b7891d710ef9e85ea167b8b94a48908 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -1,10 +1,11 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
 build_host="ka2"
 build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
@@ -82,7 +83,7 @@ $no_build ||
                echo git push failed 1>&2
                bash -i || exit
        }
-       ssh "$build_host" "$build_cmd" || {
+       "$bin_dir/do_build" || {
                echo Build failed 1>&2
                bash -i || exit
        }
@@ -143,7 +144,7 @@ $no_build ||
                echo git push failed 1>&2
                bash -i || exit
        }
-       ssh "$build_host" "$build_cmd" || {
+       "$bin_dir/do_build" || {
                echo Build failed 1>&2
                bash -i || exit
        }

diff --git a/merge_fix b/merge_fix
index 0bb4ed3939090173e9f67b767670d5e740d11c26..27db62fd6e079806b68a04ce83b58c3cf24fca2f 100755 (executable)
--- a/merge_fix
+++ b/merge_fix
@@ -1,9 +1,10 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 build_host="ka2"
 build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
@@ -77,8 +78,7 @@ git push -f "$build_host":"$build_dir" master:refs/heads/next || {
        bash -i || exit
 }
 
-echo "Building using $build_cmd on $build_host"
-ssh "$build_host" "$build_cmd" || {
+"$bin_dir/do_build" || {
        echo Build failed 1>&2
        bash -i || exit
 }

diff --git a/merge_old_version b/merge_old_version
index 9cabd8b1c6b294fd3cb0c0bced4cdf0fabee30b8..6ba9fd02252f3511e6ef2e040103e354421930b8 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -1,10 +1,11 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
 build_host="ka2"
 build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
@@ -94,8 +95,7 @@ git push -f "$build_host":"$build_dir" master:refs/heads/next || {
        bash -i || exit
 }
 
-echo "Building using $build_cmd on $build_host"
-ssh "$build_host" "$build_cmd" || {
+"$bin_dir/do_build" || {
        echo Build failed 1>&2
        bash -i || exit
 }