Merge commit '6ac2d40f29e6'

add sfr's key file as the default

diff --git a/common.sh b/common.sh
index 759c7f1af8f58e0a018910679085b6f50be80b27..28954e481e0ee8dd7b3c1d98dd95721b533e317d 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -16,6 +16,7 @@ build_host="ka2"
 build_dir="/scratch/sfr/next"
 gcc_version="4.9.0"
 j_factor=48
+ssh_key_file=~/.ssh/ra.kernel.org
 
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"

diff --git a/make_tree_file b/make_tree_file
index 195fb2c640984e584ffb2641e2bda5af67c8e150..d83eec7e3c5de2d522dd535700942e3c3f7d1670 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -13,7 +13,7 @@ h=$(date '+%k')
 ssh $build_host /usr/local/bin/set-kisskb-jfactor 48
 
 eval $(gpg-agent --daemon --enable-ssh-support)
-ssh-add ~/.ssh/ra.kernel.org
+ssh-add $ssh_key_file
 
 if ! ssh git@gitolite.kernel.org 2fa isval; then
        read -r -p "Yubikey token: " tok