X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=make_tree_file;h=66373bfcea5b69f75d6d8d4743966328af361e19;hb=c86f9a3696d40e5f8c9aba4e67b0099b408d7399;hp=6504f0df396a6ebc8e90f3d265025cf368ffc072;hpb=816e8b41f9c7c3b1558626fff47b24119f18ca75;p=next-scripts

diff --git a/make_tree_file b/make_tree_file
index 6504f0d..66373bf 100755
--- a/make_tree_file
+++ b/make_tree_file
@@ -9,15 +9,8 @@ h=$(date '+%k')
 	exit 1
 }
 
-# allow kisskb to use more of ka2
-#ssh $build_host /usr/local/bin/set-kisskb-jfactor 48
-
-ssh-add -t 600 $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')
@@ -37,6 +30,7 @@ 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"
 			[ "$type" = "git" ] && url="$url#${ref##*:}"
@@ -60,18 +54,18 @@ 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"
 
-old_tags=$(git ls-remote --tags korg 'next-*[0-9]' |
+old_tags=$(git tag -l 'next-*[0-9]' |
 	awk -F - '$2 ~ /^[0-9]*$/ && $2 <= '$oldest' { printf("next-%s\n", $2); }')
 
-[ "$old_tags" ] && git push korg --delete $old_tags
+[ "$old_tags" ] && git tag -d $old_tags
 
 echo Pushing to korg ...
-git push korg
+git push --prune korg
 
 echo Pushing to korg-history ...
 git push korg-history
@@ -82,6 +76,8 @@ git push history
 echo Pushing patch to kernel.org ...
 cd ..
 xz -v -9 "$p"
-kup --host=kup.kernel.org put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
+kup put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
+
+ssh -O exit git@gitolite.kernel.org
 
 exit 0