update to_build_host a bit

[next-scripts] / make_tree_file

diff --git a/make_tree_file b/make_tree_file
index 7e5d682cd4e58b662ad00e92ac55742de0bdbfca..75614f6bb80595c39b1944d1ca14e4f84f2985f0 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -14,7 +14,7 @@ ssh git@gitolite.kernel.org 2fa val-session $tok
 
 # 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)"
+l=$(git tag -l --sort=taggerdate 'v*' | tail -n 1)
 n="next-$d"
 
 mkdir Next
@@ -30,8 +30,9 @@ mkdir Next
        IFS='   '
        grep -v '^#' $CTRL_FILE |
                while read email type name url ref build; do
+                       [ "$type" = "branch" ] && continue
                        tab="\t"
-                       [ ${#name} -le 8 ] && tab="\t\t"
+                       [ ${#name} -lt 8 ] && tab="\t\t"
                        [ "$type" = "git" ] && url="$url#${ref##*:}"
                        printf "%s$tab%s\t%s\n" $name $type $url
                done
@@ -39,9 +40,7 @@ mkdir Next
 
 mv ../SHA1s Next/SHA1s
 
-for i in quilt-import.log merge.log; do
-       grep -v '^Checking out files:' ../$i >Next/$i
-done
+grep -v '^Checking out files:' ../merge.log >Next/merge.log
 
 printf -- "-next-%s\n" $d >localversion-next
 
@@ -77,4 +76,6 @@ cd ..
 xz -v -9 "$p"
 kup put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
 
+ssh -O exit git@gitolite.kernel.org
+
 exit 0