From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 May 2013 07:13:25 +0000 (+1000)
Subject: use the local do_build script
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=4105f526175d8fd8726d8e56a2fcca7edb94d8c0;p=next-scripts

use the local do_build script
---

diff --git a/do_merge b/do_merge
index 59f1ea9..21cdf11 100755
--- 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 f35dab6..e17c79c 100755
--- 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 965f27a..a66225b 100755
--- 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 aa4e984..8de8b74 100755
--- 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 0bb4ed3..27db62f 100755
--- 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 9cabd8b..6ba9fd0 100755
--- 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
 }