various updates

diff --git a/backup_next b/backup_next
index 5ac047cc22fb584a8446b2e75de953f3d8c95a6b..1834e7d3c5e8ba33e5bc22d3adb7151b3703cda1 100755 (executable)
--- a/backup_next
+++ b/backup_next
@@ -3,7 +3,7 @@
 host="fs"
 [ "$1" ] && host="$1"
 
-rsync -avHP --exclude gitk.cache \
+rsync -avHP --exclude gitk.cache --exclude next-2'*'/ \
        --include next/.git --include next/.git/'**' --exclude next/'**' \
        --include quilt/.git --include quilt/.git/'**' --exclude quilt/'**' \
        --include next-fixes/.git --include next-fixes/.git/'**' --exclude next-fixes/'**' \

diff --git a/build_msg b/build_msg
index 4d6123c47f411f66b8263054acded6960fd9c32f..fd6169ed0df39f78060aa185df36de317b3a4c0c 100755 (executable)
--- a/build_msg
+++ b/build_msg
@@ -5,15 +5,24 @@ log=../merge.log
 control=../real_control
 [ -f real_control ] && control=real_control
 
-branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
-branch=${branch#quilt/}
-branch=${branch%%/*}
+branch=""
+[ "$1" = "-t" ] && {
+        branch=$2
+        shift 2
+}
 
-contact=$(sed -n "/    $branch /s/     .*$//p" $control)
+[ "$branch" ] || {
+       branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
+       branch=${branch#quilt/}
+       branch=${branch%%/*}
+}
+
+contact=$(awk -F '     ' '$3=="'"$branch"'" { print $1; }' $control)
 greeting=${contact%% *}
+greeting=${greeting#\"}
 [ "${contact%,*}" = "${contact}" ] || greeting="all"
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: build failure after merge of $branch tree&Body=Hi $greeting,%0A\
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: build failure after merge of the $branch tree&Body=Hi $greeting,%0A\
 %0A\
 After merging the $branch tree, today's linux-next build ()%0A\
 failed like this:"

diff --git a/build_warn b/build_warn
index 5d0be6f6445911bda476127d0fe36dcd034d5286..e6cc2c594e0ade07d1a0aaf92d0f2c808304d504 100755 (executable)
--- a/build_warn
+++ b/build_warn
@@ -5,15 +5,24 @@ log=../merge.log
 control=../real_control
 [ -f real_control ] && control=real_control
 
-branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
-branch=${branch#quilt/}
-branch=${branch%%/*}
+branch=""
+[ "$1" = "-t" ] && {
+        branch=$2
+        shift 2
+}
 
-contact=$(sed -n "/    $branch /s/     .*$//p" $control)
+[ "$branch" ] || {
+       branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
+       branch=${branch#quilt/}
+       branch=${branch%%/*}
+}
+
+contact=$(awk -F '     ' '$3=="'"$branch"'" { print $1; }' $control)
 greeting=${contact%% *}
+greeting=${greeting#\"}
 [ "${contact%,*}" = "${contact}" ] || greeting="all"
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: build warning after merge of $branch tree&Body=Hi $greeting,%0A\
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: build warning after merge of the $branch tree&Body=Hi $greeting,%0A\
 %0A\
 After merging the $branch tree, today's linux-next build ()%0A\
 produced this warning:"

diff --git a/do_merge b/do_merge
index c1e688208a678b48c7b30e5bdca1e3c959806be4..ffbecf1c5aee2e8a7a5292bc23742a08ab6c08e1 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -117,7 +117,8 @@ for h in $heads; do
                fi
        }
 
-       log Merging $h
+       hlog=$(git log -1 --oneline $h) 2>/dev/null
+       log Merging $h "($hlog)"
        old_head=$(git rev-parse HEAD)
        case "$h" in
        *:*)

diff --git a/do_patch b/do_patch
index 3fe1df8e0f425dfcf81dbb39c65d9a1f6663b4fa..6625a2b2b76345cff8f3de9cac8aa53a24ba6fe8 100755 (executable)
--- a/do_patch
+++ b/do_patch
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOG_FILE="../merge.log"
-build_host="sprygo"
+build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
 
@@ -14,7 +14,14 @@ no_build=false
 patch="$1"
 shift
 
-[ -n "$1" ] && build_host="$1"
+[ -n "$1" ] && {
+       build_host="$1"
+       shift
+}
+[ -n "$1" ] && {
+       build_dir="$1"
+       shift
+}
 
 log()
 {
@@ -32,8 +39,8 @@ GIT_EDITOR=: execute git am -3 "$patch" || exit 1
 
 $no_build && exit 0
 
-rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-       echo Rsync failed 1>&2
+git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       echo git push failed 1>&2
        bash -i || exit
 }
 ssh "$build_host" "$build_cmd" || {

diff --git a/do_revert b/do_revert
index e8844e7ba54e19aa97b54b666ec20afbcae262b8..f67929018b0f00d09a170757f191004a3704ec0f 100755 (executable)
--- a/do_revert
+++ b/do_revert
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOG_FILE="../merge.log"
-build_host="sprygo"
+build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
 
@@ -14,7 +14,14 @@ no_build=false
 rev=$1
 shift
 
-[ -n "$1" ] && build_host="$1"
+[ -n "$1" ] && {
+       build_host="$1"
+       shift
+}
+[ -n "$1" ] && {
+       build_dir="$1"
+       shift
+}
 
 log()
 {
@@ -32,8 +39,8 @@ GIT_EDITOR=: execute git revert $rev || exit 1
 
 $no_build && exit 0
 
-rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-       echo Rsync failed 1>&2
+git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       echo git push failed 1>&2
        bash -i || exit
 }
 ssh "$build_host" "$build_cmd" || {

diff --git a/fetch_trees b/fetch_trees
index 369787349627a7c077a94d40d80efb8349bf8077..f7e2312358bfcc9f29a47da47a4bfb41669881d4 100755 (executable)
--- a/fetch_trees
+++ b/fetch_trees
@@ -23,10 +23,10 @@ for name in $trees; do
                url=$(get_field "$name" 4)
 
                case "$url" in
-               http://kernel.org/*|http://www.kernel.org/*)
-                       use_rsync=true
-                       rurl=$(echo "$url" | sed -r 's,^http://(www\.)?kernel\.org,master.kernel.org:,')
-                       ;;
+#              http://kernel.org/*|http://www.kernel.org/*)
+#                      use_rsync=true
+#                      rurl=$(echo "$url" | sed -r 's,^http://(www\.)?kernel\.org,master.kernel.org:,')
+#                      ;;
                http://ozlabs.org/~*)
                        use_rsync=true
                        rurl=$(echo "$url" | sed -r 's,^http://ozlabs\.org/([^/]*),ozlabs.org:\1/public_html,')

diff --git a/get_gitid b/get_gitid
index 408ca2176a278be5ee9d2e54f88d7ef413de8f24..8c86f7f26f1403d2a7a47a4712a6830ad577eebd 100755 (executable)
--- a/get_gitid
+++ b/get_gitid
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-wget -q -O - http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-$1.id
+if [ "$1" = "${1#3}" ]; then
+       dir=v2.6
+else
+       dir=v3.0
+fi
+
+wget -q -O - http://www.kernel.org/pub/linux/kernel/$dir/snapshots/patch-$1.id

diff --git a/make_abat_scripts b/make_abat_scripts
index e37060cc4909993d2f34dbb62446a137f090f4da..d88c378cfe96ae4a72e06072cb2a1bb081460b54 100755 (executable)
--- a/make_abat_scripts
+++ b/make_abat_scripts
@@ -5,34 +5,31 @@ d="$1"
 [ -d ../abat ] || mkdir ../abat
 
 i=1
-for t in "IBM,9124-720 eServer OpenPower 720" "IBM,9110-51A System p5 510" "IBM,9117-MMA System p 570"
-do
-       cat >"../abat/$d-abat.ozlabs.ibm.com-$i" <<EOF
-option title linux-next $d boot test
-class next type="$t" provision:=ubuntu-gutsy-ozlabs
-+\$kernel "master^"
-+\$patch http://fs.ozlabs.ibm.com/~sfr/ABAT-fix.patch
-+\$config http://ozlabs.au.ibm.com/~tony/abat/configs/no_CONFIG_LOCALVERSION_AUTO.config
-build generic git git://fs.ozlabs.ibm.com/home/kernel/linux-next.git \$kernel -p \$patch -c \$config -m -j\$num_cpus
-boot initcall_debug
-EOF
-       i=$((i + 1));
-done
 
-exit 0
+cat >"../abat/$d-abat.ozlabs.ibm.com-$i" <<EOF
+option title linux-next $d stable boot test
+class next cpu_type like "POWER6%"
++\$kernel "origin/stable"
++\$patch "http://fs.ozlabs.ibm.com/~sfr/ABAT-fix.patch"
++\$config "http://fs.ozlabs.ibm.com/~sfr/config.next"
+build generic git git://fs.ozlabs.ibm.com/home/kernel/linux-next.git \$kernel -c \$config -p \$patch -m -j\$num_cpus
+boot initcall_debug=y debug
+EOF
+i=$((i + 1))
 
-i=1
-for t in 'type="88552RZ"' 'type="IBM eServer BladeCenter LS20 -[885055U]-"' 'type="-[622142U]-"' 'type="PowerMac7,2"' 'machine_name="js22-bup1"'
-do
-       cat >"../abat/$d-abat.linux.ibm.com-$i" <<EOF
+#for t in  'POWER5%gr%' 'POWER5%gs%' 'POWER6%' 'POWER7%' '%Opteron%' '%PPC970%'; do
+for t in  'POWER5%gs%' 'POWER6%' 'POWER7%' '%PPC970%'; do
+       cat >"../abat/$d-abat.ozlabs.ibm.com-$i" <<EOF
 option title linux-next $d boot test
-class next $t
+#option timed 2010-07-07 19:30 +1000
+class next cpu_type like "$t"
 +\$kernel "master^"
-+\$config http://ozlabs.au.ibm.com/~tony/abat/configs/no_CONFIG_LOCALVERSION_AUTO.config
-build generic git git://ozlabs.au.ibm.com/srv/git/sfr/next.git \$kernel -c \$config -m -j\$num_cpus
-boot initcall_debug
++\$patch "http://fs.ozlabs.ibm.com/~sfr/ABAT-fix.patch"
++\$config "http://fs.ozlabs.ibm.com/~sfr/config.next"
+build generic git git://fs.ozlabs.ibm.com/home/kernel/linux-next.git \$kernel -c \$config -p \$patch -m -j\$num_cpus
+boot initcall_debug=y debug
 EOF
-       i=$((i + 1));
+i=$((i + 1))
 done
 
 exit 0

diff --git a/make_next_branches b/make_next_branches
index c26a8ce71f22642ced6854489454bb85cd735856..de39d4bbf3719b0cad9a32bcb384b4b898d4edd2 100755 (executable)
--- a/make_next_branches
+++ b/make_next_branches
@@ -13,6 +13,8 @@ for h in $heads; do
                tree=${h#quilt/}
                rem_ref=refs/heads
        }
+       [ "${h%:*}" == "${h}" ] ||
+               h="${tree}/${h##*:}"
 
        git update-ref "refs/next/$dir/$tree" "$rem_ref/$h"
 done
@@ -20,4 +22,3 @@ done
 git pack-refs --all --prune
 
 exit 0
-

diff --git a/make_summ b/make_summ
index 9afc3211920433365c953cf3b48deee5091628f8..6dc3b8b7bc17dd75632add5ced1d18f6ba1a0aad 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-egrep '(git (cherry|rm|reset|checkout|quiltimport))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log | egrep -v '(reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at)' >summ
+egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log |
+       egrep -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] Merge( remote(-tracking)?)? branch|^hint:' >summ
 
 exit 0

diff --git a/make_tree_file b/make_tree_file
index 7dc21f5d8756aac9d33bdf04f2c150dce7e92445..addcb1e4ad07b54dba59b9195ae70d2e42c83a3b 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -7,8 +7,12 @@ h=$(date '+%H')
        exit 1
 }
 
+#git update-ref refs/heads/akpm-end refs/heads/master
+
 # This means I get the right tag if I finish after midnight
 d=$(date --date "5 hours ago" '+%Y%m%d')
+l="$(git describe --match "v*" --abbrev=0)"
+n="next-$d"
 
 mkdir Next
 
@@ -25,10 +29,9 @@ while read email type name url ref build; do
        [[ "$email" =~ '^#.*$' ]] && continue
        tab="\t"
        [ $(echo "$name" | wc -c) -le 8 ] && tab="\t\t"
+       [ "${ref%:*}" = "${ref}" ] || ref=${ref##*:}
        [ "$type" = "git" ] && url="$url#$ref"
        printf "%s$tab%s\t%s\n" $name $type $url
-       href="$name/$ref"
-       [ "$type" = "quilt" ] && href="quilt/$name"
        printf "%s$tab%s\n" $name $(git show-ref --verify --hash "refs/next/$d/$name") >> Next/SHA1s
 done <../real_control >>Next/Trees
 
@@ -40,13 +43,30 @@ printf -- "-next-%s\n" $d >localversion-next
 
 git add Next localversion-next
 git commit -s -v -a -m "Add linux-next specific files for $d"
-git tag -u 058D8206 -m "next-$d" "next-$d"
+git tag -u 41D5C07A -m "$n" "$n"
+
 git update-ref refs/heads/stable refs/remotes/origin/master
+git update-ref refs/heads/akpm-start refs/remotes/origin/master
+
+p="patch-$l-$n"
+git diff-tree -p "$l.." >"../$p"
+gpg2 -u 41D5C07A -a -b "../$p"
+#echo "$l" > "../LATEST-IS-$n"
+
+../tools/make_abat_scripts "$d" "$l"
+
+echo Pushing to korg ...
+git push korg
+
+echo Pushing to korg-history ...
+git push korg-history
 
-# Stitch the new tree into the history branch
-new_ref=$(echo "next-$d" | git commit-tree 'HEAD^{tree}' -p history -p HEAD)
-git update-ref -m "next-$d" refs/heads/history $new_ref
+echo Pushing to history
+git push history
 
-../tools/make_abat_scripts "$d"
+echo Pushing patch to kernel.org ...
+cd ..
+xz -v -9 "$p"
+kup --host=geb.kernel.org put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
 
 exit 0

diff --git a/merge_fix b/merge_fix
index e0bb7adbc453717058c03e563623243fc1e1d201..9cf57c03322d14060611d7eb065a445295e1077c 100755 (executable)
--- a/merge_fix
+++ b/merge_fix
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOG_FILE="../merge.log"
-build_host="sprygo"
+build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
 
@@ -11,11 +11,19 @@ no_build=false
        no_build=true
 }
 patch="$1"
+shift
 [ -f "$patch" ] || {
        echo "patch does not exist" 1>&2
        exit 1
 }
-[ -n "$2" ] && build_host="$2"
+[ -n "$1" ] && {
+       build_host="$1"
+       shift
+}
+[ -n "$1" ] && {
+       build_dir="$1"
+       shift
+}
 
 log()
 {
@@ -59,8 +67,8 @@ GIT_EDITOR=: execute git commit -v -a --amend || {
 
 $no_build && exit 0
 
-rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-       echo Rsync failed 1>&2
+git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       echo git push failed 1>&2
        bash -i || exit
 }
 

diff --git a/merge_msg b/merge_msg
index 48bb70302f46d3b30cb898b72c668065c3ac696f..547fbb92821393cf46fa9a7b7e61d13212091da9 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -5,17 +5,18 @@ log=../merge.log
 control=../real_control
 [ -f real_control ] && control=real_control
 
-branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
+branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
 branch=${branch#quilt/}
 branch=${branch%%/*}
 
-contact=$(sed -n "/    $branch /s/     .*$//p" $control)
+contact=$(awk -F '     ' '$3=="'"$branch"'" { print $1; }' $control)
 greeting=${contact%% *}
+greeting=${greeting#\"}
 [ "${contact%,*}" = "${contact}" ] || greeting="all"
 
 file="$*"
 
-gitk.test --merge -- $file &
+gitk --merge -- $file &
 [ "$file" ] && gvim $file
 
 sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the  tree&Body=Hi $greeting,%0A\

diff --git a/merge_old_version b/merge_old_version
index 3b7465ec8288c2ab92cf86a11be5f39dda9362db..41833eaeb507230c06a88e794fa5b86bb30ad69b 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOG_FILE="../merge.log"
-build_host="sprygo"
+build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
 
@@ -20,7 +20,14 @@ rev=$(git show-ref --verify --hash "refs/next/$ver/$tree")
        exit 1
 }
 
-[ -n "$3" ] && build_host="$3"
+[ -n "$3" ] && {
+       build_host="$3"
+       shift
+}
+[ -n "$3" ] && {
+       build_dir="$3"
+       shift
+}
 
 log()
 {
@@ -42,10 +49,21 @@ GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
 log Merging "refs/next/$ver/$tree"
 execute git merge "refs/next/$ver/$tree" || {
        echo Merge failed 1>&2
-       bash -i || exit
+       echo "refs/next/$ver/$tree" >>../merge.debug
+       git diff >>../merge.debug 2>&1
+       git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+               bash -i || exit
+       }
        GIT_EDITOR=: execute git commit -v -a
        execute git diff -M --stat --summary 'HEAD^..'
 }
+[ -f "../merge-fixes/$tree" ] && {
+       for p in $(cat "../merge-fixes/$tree"); do
+               ../tools/merge_fix -n "$p" || {
+                       bash -i || exit
+               }
+       done
+}
 
 d=$(date --date "5 hours ago" '+%Y%m%d')
 git update-ref "refs/next/$d/broken/$tree" "refs/next/$d/$tree"
@@ -53,8 +71,8 @@ git update-ref "refs/next/$d/$tree" "refs/next/$ver/$tree"
 
 $no_build && exit 0
 
-rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-       echo Rsync failed 1>&2
+git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       echo git push failed 1>&2
        bash -i || exit
 }
 

diff --git a/rebase_end b/rebase_end
index c6c27a1fec399c7086c3e2c0078a256905ad96d9..eabf618843075708a640d33723e00faf8fe6206e 100755 (executable)
--- a/rebase_end
+++ b/rebase_end
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOG_FILE="../merge.log"
-build_host="sprygo"
+build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
 

diff --git a/update_trees b/update_trees
index d46b80caf7a637e01e553acbbd851d3c103ae448..2b47e3c3d15207bc173d23270ce0dab915c0516f 100755 (executable)
--- a/update_trees
+++ b/update_trees
@@ -25,7 +25,8 @@ for name in $quilters; do
        sfile="../quilt/$name/series"
        base=$(sed -n 's/^#[    ]*NEXT[-_]BASE[         ]*\([^  ]*\)[   ]*$/\1/p' "$sfile")
        if [ -n "$base" ]; then
-               base=$(grep -v '^#' ../real_control | awk -F '  ' '$3=="'"$base"'" { if ($2=="quilt") printf("quilt/%s", "'"$base"'"); else printf("%s/%s", "'"$base"'", $5); }')
+               nbase=$(grep -v '^#' ../real_control | awk -F ' ' '$3=="'"$base"'" { if ($2=="quilt") printf("quilt/%s", "'"$base"'"); else printf("%s/%s", "'"$base"'", $5); }')
+               [ -n "$nbase" ] && base="$nbase"
        else
                base=$(sed -n 's/^#[    ]*BASE[         ]*\(.*\)[       ]*$/\1/p' "$sfile")
                [ -n "$base" ] || {
@@ -37,7 +38,7 @@ for name in $quilters; do
        fi
        rbase="$base"
        case "$base" in
-       *-git[0-9]*)    rbase=$(wget -q -O - "http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-${base}.id")
+       *-git[0-9]*)    rbase=$($(dirname $0)/get_gitid "${base}")
                        ;;
        commit*)        rbase=$(expr "$base" : "commit[         ]*\(.*\)")
                        ;;
@@ -89,8 +90,15 @@ for name in $quilters; do
        cd ../quilt-tmp
        execute git reset --hard "$rbase_sha1"
 
-       author=$(grep -v '^#' ../real_control | awk -F '        ' '$3=="'"$name"'" { printf("%s", $1); }' | sed 's/,.*$//')
-       execute git quiltimport --author "$author" --patches "../quilt/$name"
+       while read f <&5 ; do
+               old_head=$(git rev-parse --verify HEAD)
+               execute git am "../quilt/$name/$f"
+               new_head=$(git rev-parse --verify HEAD)
+               [ "$new_head" = "$old_head" ] && {
+                       echo "Tree unchanged, please check ..."
+                       bash -i || exit
+               }
+       done 5<"../quilt/$name/series"
 
        log '$' cd ../next
        cd ../next