From ba950ca97a30b852e16e72664f058dc13b338112 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 5 Mar 2013 12:36:55 +1100 Subject: [PATCH] propogate NEXT_BUILD_HOST/DIR everywhere --- do_merge | 7 +++++-- do_patch | 5 +++++ do_revert | 5 +++++ merge_akpm | 7 +++++-- merge_fix | 5 +++++ merge_old_version | 5 +++++ 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/do_merge b/do_merge index d5e1a08..13fd3c9 100755 --- 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 6625a2b..f35dab6 100755 --- 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 f679290..965f27a 100755 --- 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 b414a03..e09625d 100755 --- 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 e1d68e1..0bb4ed3 100755 --- 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 c273d03..9cabd8b 100755 --- 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 -- 2.39.5