X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=make_tree_file;h=75614f6bb80595c39b1944d1ca14e4f84f2985f0;hb=HEAD;hp=f7c1c6993ebdf085a6857f99118c1fc367c835bd;hpb=7feff05394b1dd5699a01e5974b4ab9ce5bac970;p=next-scripts

diff --git a/make_tree_file b/make_tree_file
index f7c1c69..75614f6 100755
--- a/make_tree_file
+++ b/make_tree_file
@@ -9,21 +9,12 @@ h=$(date '+%k')
 	exit 1
 }
 
-# allow kisskb to use more of ka2
-#ssh $build_host /usr/local/bin/set-kisskb-jfactor 48
-
-trap "ssh-add -d $ssh_key_file" EXIT
-
-ssh-add $ssh_key_file || exit 1
-
-if ! ssh git@gitolite.kernel.org 2fa isval; then
-	read -r -p "Yubikey token: " tok
-	ssh git@gitolite.kernel.org 2fa val $tok
-fi
+read -r -p "Yubikey token: " tok
+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
@@ -39,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
@@ -48,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
 
@@ -62,7 +52,7 @@ git branch -f stable refs/remotes/origin/master
 
 p="patch-$l-$n"
 git diff-tree -p "$l.." >"../$p"
-gpg -u $gpg_key -a -b "../$p"
+gpg -u $kup_gpg_key -a -b "../$p"
 
 oldest=$(date --date "3 months ago" '+%Y%m%d')
 echo "Removing old releases ... <= next-$oldest"
@@ -86,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