X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=common.sh;h=827015a0190347ec25cfcb863eecc466ef13e8ae;hb=03ab49aeeb0c7c64216efcc817255d8790af4d1d;hp=eb7cc75e2afca8a44fd8f917462989e76b17c730;hpb=029aa065ad2dfb9c8c7419df4ff996ebb9de31b9;p=next-scripts

diff --git a/common.sh b/common.sh
index eb7cc75..827015a 100644
--- a/common.sh
+++ b/common.sh
@@ -8,16 +8,16 @@ _next_common_included=1
 
 bin_dir=$(dirname "$0")
 
-LOG_FILE="../merge.log"
+[ "$LOG_FILE" ] || LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
 CTRL_FILE="../etc/control"
 
-build_host="colugo-sfr"
+build_host="ash"
 build_dir="/home/sfr/next/next"
 gcc_version="4.9.0"
-j_factor=48
-ssh_key_file=~/.ssh/ra.kernel.org
+j_factor=$(nproc)
 gpg_key=89F91C0A41D5C07A
+kup_gpg_key=015042F34957D06C
 
 [ "$NEXT_BUILD_HOST" ] && {
 	build_host="$NEXT_BUILD_HOST"