cope with doing the merges and build on the same machine

[next-scripts] / common.sh

diff --git a/common.sh b/common.sh
index f4118484cd5dbe5996cf68c11b237524559a4a8b..e3e220925fc2e219772e35b8f3cffa7a4948b32a 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -19,7 +19,10 @@ j_factor=48
 ssh_key_file=~/.ssh/ra.kernel.org
 gpg_key=41D5C07A
 
-[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
+[ "$NEXT_BUILD_HOST" ] && {
+       build_host="$NEXT_BUILD_HOST"
+       [ "$build_host" = "none" ] && build_host=""
+}
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 [ "$NEXT_GCC_VERSION" ] && gcc_version="$NEXT_GCC_VERSION"
 [ "$NEXT_J_FACTOR" ] && j_factor="$NEXT_J_FACTOR"
@@ -33,7 +36,7 @@ gpg_key=41D5C07A
        shift
 }
 
-export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_HOST="${build_host:-none}"
 export NEXT_BUILD_DIR="$build_dir"
 export NEXT_GCC_VERSION="$gcc_version"
 export NEXT_J_FACTOR="$j_factor"