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

diff --git a/common.sh b/common.sh
index cb720a8..827015a 100644
--- a/common.sh
+++ b/common.sh
@@ -6,18 +6,18 @@
 [ "$_next_common_included" ] && return 0
 _next_common_included=1
 
-bin_dir="$(dirname $0)"
+bin_dir=$(dirname "$0")
 
-LOG_FILE="../merge.log"
+[ "$LOG_FILE" ] || LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
 CTRL_FILE="../etc/control"
 
-build_host="ka2"
+build_host="ash"
 build_dir="/home/sfr/next/next"
 gcc_version="4.9.0"
-j_factor=48
-ssh_key_file=~/.ssh/ra.kernel.org
-gpg_key=41D5C07A
+j_factor=$(nproc)
+gpg_key=89F91C0A41D5C07A
+kup_gpg_key=015042F34957D06C
 
 [ "$NEXT_BUILD_HOST" ] && {
 	build_host="$NEXT_BUILD_HOST"
@@ -43,6 +43,8 @@ gcc_ppcle_version=$gcc_ppc_version
 export NEXT_BUILD_HOST="${build_host:-none}"
 export NEXT_BUILD_DIR="$build_dir"
 export NEXT_GCC_VERSION="$gcc_version"
+export NEXT_GCC_PPC_VERSION="$gcc_ppc_version"
+export NEXT_GCC_PPCLE_VERSION="$gcc_ppcle_version"
 export NEXT_J_FACTOR="$j_factor"
 
 true