Merge commit '568b19de2beb'

add sfr's key as the default

diff --git a/common.sh b/common.sh
index 28954e481e0ee8dd7b3c1d98dd95721b533e317d..71f17fbb6a88b89278a507180378406a9bce9742 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -17,6 +17,7 @@ build_dir="/scratch/sfr/next"
 gcc_version="4.9.0"
 j_factor=48
 ssh_key_file=~/.ssh/ra.kernel.org
+gpg_key=41D5C07A
 
 [ "$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 d83eec7e3c5de2d522dd535700942e3c3f7d1670..9cc6882365a87c8d9623d7fc52cb968eaec40cdc 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -55,13 +55,13 @@ printf -- "-next-%s\n" $d >localversion-next
 
 git add Next localversion-next
 git commit -s -v -a -m "Add linux-next specific files for $d"
-git tag -u 41D5C07A -m "$n" "$n"
+git tag -u $gpg_key -m "$n" "$n"
 
 git branch -f stable refs/remotes/origin/master
 
 p="patch-$l-$n"
 git diff-tree -p "$l.." >"../$p"
-gpg2 -u 41D5C07A -a -b "../$p"
+gpg2 -u $gpg_key -a -b "../$p"
 
 oldest=$(date --date "3 months ago" '+%Y%m%d')
 echo "Removing old releases ... <= next-$oldest"