update to_build_host a bit

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index 8de8b7463b7891d710ef9e85ea167b8b94a48908..4b9be3adcb2aa61b3045e61e81933036daf3a29f 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -1,14 +1,5 @@
 #!/bin/bash
 
-bin_dir="$(dirname $0)"
-
-LOG_FILE="../merge.log"
-SHA1_FILE="../SHA1s"
-build_host="ka2"
-build_dir="/scratch/sfr/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
@@ -17,17 +8,8 @@ no_build=false
        shift
        no_build=true
 }
-[ -n "$1" ] && {
-       build_host="$1"
-       shift
-}
-[ -n "$1" ] && {
-       build_dir="$1"
-       shift
-}
 
-export NEXT_BUILD_HOST="$build_host"
-export NEXT_BUILD_DIR="$build_dir"
+. "$(dirname $0)/common.sh"
 
 log()
 {
@@ -50,10 +32,13 @@ git branch -f akpm/base HEAD
 old_head=$(git rev-parse HEAD)
 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
 log Merging akpm-current/current "($hlog)"
-execute git merge akpm-current/current || {
+execute git merge --no-ff akpm-current/current || {
        echo Merge failed 1>&2
        echo $h >>../merge.debug
        git diff >>../merge.debug 2>&1
+
+       check_unmerged_files akpm-current
+
        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                bash -i || exit
        }
@@ -69,9 +54,6 @@ printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $S
                }
        done
 }
-[ -x "../pre-build/akpm-current" ] && {
-       "../pre-build/akpm-current" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
@@ -79,11 +61,11 @@ $no_build ||
        [ "$old_head" = "$new_head" ] ||
        [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-       git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
                echo git push failed 1>&2
                bash -i || exit
        }
-       "$bin_dir/do_build" || {
+       "$bin_dir/do_build" akpm-current || {
                echo Build failed 1>&2
                bash -i || exit
        }
@@ -104,6 +86,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
        bash -i || exit
 }
 echo "fix up?"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -130,9 +113,6 @@ printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
                }
        done
 }
-[ -x "../pre-build/akpm" ] && {
-       "../pre-build/akpm" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
@@ -140,11 +120,11 @@ $no_build ||
        [ "$old_head" = "$new_head" ] ||
        [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-       git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
                echo git push failed 1>&2
                bash -i || exit
        }
-       "$bin_dir/do_build" || {
+       "$bin_dir/do_build" akpm || {
                echo Build failed 1>&2
                bash -i || exit
        }