merge_akpm: add removing files logic

[next-scripts] / do_patch

diff --git a/do_patch b/do_patch
index 6625a2b2b76345cff8f3de9cac8aa53a24ba6fe8..c48dcb23ddd57e1dfab0e3101ca1391e4df48bbb 100755 (executable)
--- a/do_patch
+++ b/do_patch
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-LOG_FILE="../merge.log"
-build_host="ka2"
-build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
-
 no_build=false
 [ "$1" = "-n" ] && {
        shift
@@ -14,14 +9,7 @@ no_build=false
 patch="$1"
 shift
 
-[ -n "$1" ] && {
-       build_host="$1"
-       shift
-}
-[ -n "$1" ] && {
-       build_dir="$1"
-       shift
-}
+. "$(dirname $0)/common.sh"
 
 log()
 {
@@ -43,7 +31,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
 }