X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=ca55e9fd871202ebf873ae55500de75db6010dfa;hb=e2b1ad956622c4b4b6d98e412013e433411c7aac;hp=6f3f0705efd4b496f1abe26b0fef2ede82aa6c5e;hpb=d270a218b283d15bda88ffdd0ee662f3ab3d689e;p=next-scripts

diff --git a/merge_akpm b/merge_akpm
index 6f3f070..ca55e9f 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -64,11 +64,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
 	}
@@ -90,6 +90,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
 }
 echo "fix up?"
 notify-send "Waiting for akpm fix up"
+pushover "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -123,11 +124,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
 	}