10 . "$(dirname $0)/common.sh"
14 echo "$@" | tee -a $LOG_FILE
20 $@ 2>&1 | tee -a $LOG_FILE
21 return ${PIPESTATUS[0]}
26 execute git clone -s -l -n -q . ../rebase-tmp || {
27 echo Clone failed 1>&2
30 log '$' cd ../rebase-tmp
32 execute git checkout -b cpuinit remotes/origin/cpuinit/master || {
33 echo Checkout of remotes/origin/cpuinit/master failed 1>&2
36 execute git rebase --onto master remotes/origin/cpuinit/master-base || {
37 echo Rebase failed 1>&2
44 execute git fetch -f ../rebase-tmp cpuinit:cpuinit/master || {
45 echo Fetch of cpuinit/master failed 1>&2
48 execute rm -rf ../rebase-tmp
50 git branch -f cpuinit/master-base HEAD
52 old_head=$(git rev-parse HEAD)
53 log Merging cpuinit/master '('$(git log -1 --oneline cpuinit/master)')'
54 execute git merge --no-ff cpuinit/master || {
55 echo Merge failed 1>&2
58 printf "%s\t\t%s\n" cpuinit $(git show-ref --hash cpuinit/master) >> $SHA1_FILE
60 [ -f "../merge-fixes/cpuinit" ] && {
61 for p in $(cat "../merge-fixes/cpuinit"); do
62 $(dirname $0)/merge_fix -n "$p" || {
68 new_head=$(git rev-parse HEAD)
71 [ "$old_head" = "$new_head" ] ||
72 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
74 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
75 echo git push failed 1>&2
78 "$bin_dir/do_build" || {
79 echo Build failed 1>&2