make_tree_file: cope with the changes in gpg2

by not using it :-(

and gpg-agent seems to be busted now as well, so just use any current
ssh-agent, but time limit the life of the caching.

diff --git a/make_tree_file b/make_tree_file
index ecc6cbeff2b9347ebde6bc0c81339b518ebbb66b..155cd50d0dc5556d504625f89319a261dd80049f 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -12,8 +12,7 @@ h=$(date '+%k')
 # allow kisskb to use more of ka2
 ssh $build_host /usr/local/bin/set-kisskb-jfactor 48
 
-eval $(gpg-agent --daemon --enable-ssh-support)
-ssh-add $ssh_key_file || exit 1
+ssh-add -t 600 $ssh_key_file || exit 1
 
 if ! ssh git@gitolite.kernel.org 2fa isval; then
        read -r -p "Yubikey token: " tok
@@ -61,7 +60,7 @@ git branch -f stable refs/remotes/origin/master
 
 p="patch-$l-$n"
 git diff-tree -p "$l.." >"../$p"
-gpg2 -u $gpg_key -a -b "../$p"
+gpg -u $gpg_key -a -b "../$p"
 
 oldest=$(date --date "3 months ago" '+%Y%m%d')
 echo "Removing old releases ... <= next-$oldest"
@@ -85,6 +84,4 @@ cd ..
 xz -v -9 "$p"
 kup --host=kup.kernel.org put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
 
-ssh-agent -k
-
 exit 0