propogate NEXT_BUILD_HOST/DIR everywhere

diff --git a/do_merge b/do_merge
index d5e1a084a700e3c238f91297040ccc932b52c7df..13fd3c90c03a5d3b443e7bae3225112ba2424557 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -5,11 +5,11 @@ 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"
 
 no_build=false
 start_from=""
-[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
-[ "$NEXT_BUILD_DIR" ] && build_host="$NEXT_BUILD_DIR"
 
 [ "$1" = "-n" ] && {
        shift
@@ -33,6 +33,9 @@ start_from=""
        shift
 }
 
+export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_DIR="$build_dir"
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE

diff --git a/do_patch b/do_patch
index 6625a2b2b76345cff8f3de9cac8aa53a24ba6fe8..f35dab640964aca2fc7759f76629b92d49d4e861 100755 (executable)
--- a/do_patch
+++ b/do_patch
@@ -4,6 +4,8 @@ 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"
 
 no_build=false
 [ "$1" = "-n" ] && {
@@ -23,6 +25,9 @@ shift
        shift
 }
 
+export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_DIR="$build_dir"
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE

diff --git a/do_revert b/do_revert
index f67929018b0f00d09a170757f191004a3704ec0f..965f27a86f2fca0a4f801630d465b543edc8b82b 100755 (executable)
--- a/do_revert
+++ b/do_revert
@@ -4,6 +4,8 @@ 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"
 
 no_build=false
 [ "$1" = "-n" ] && {
@@ -23,6 +25,9 @@ shift
        shift
 }
 
+export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_DIR="$build_dir"
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE

diff --git a/merge_akpm b/merge_akpm
index b414a0329f200b9e66dee8a064d2b3b223777b1a..e09625d1316f4bb848addddf7f4dc8064c3c5d4d 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -5,12 +5,12 @@ 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"
 
 today="$(date '+%Y%m%d')"
 
 no_build=false
-[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
-[ "$NEXT_BUILD_DIR" ] && build_host="$NEXT_BUILD_DIR"
 
 [ "$1" = "-n" ] && {
        shift
@@ -25,6 +25,9 @@ no_build=false
        shift
 }
 
+export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_DIR="$build_dir"
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE

diff --git a/merge_fix b/merge_fix
index e1d68e1d6eda0db00b14bd3c59c9cfbb257a11c0..0bb4ed3939090173e9f67b767670d5e740d11c26 100755 (executable)
--- a/merge_fix
+++ b/merge_fix
@@ -4,6 +4,8 @@ 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"
 
 no_build=false
 [ "$1" = "-n" ] && {
@@ -25,6 +27,9 @@ shift
        shift
 }
 
+export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_DIR="$build_dir"
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE

diff --git a/merge_old_version b/merge_old_version
index c273d03d01132ac6da87ee5653cdf06f8ff1ea93..9cabd8b1c6b294fd3cb0c0bced4cdf0fabee30b8 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -5,6 +5,8 @@ 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"
 
 no_build=false
 [ "$1" = "-n" ] && {
@@ -30,6 +32,9 @@ rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
        shift
 }
 
+export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_DIR="$build_dir"
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE