allow for different compiler versions for ppc and ppcle

[next-scripts] / common.sh

diff --git a/common.sh b/common.sh
index 1cd814fea35e036d1cfcc66746eb49260dda96cd..cb720a87adcfba4d6ec7e820aae6af3cb1217127 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -12,15 +12,24 @@ LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
 CTRL_FILE="../etc/control"
 
-build_host="alpine1.ozlabs.ibm.com"
-build_dir="/home/michael/linux-next/tmpfs/next"
-gcc_version="4.9.3"
-j_factor=640
-ssh_key_file="~/work/topics/korg/ssh/korg-mpe"
-gpg_key="C8E1A580"
-
-[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
+build_host="ka2"
+build_dir="/home/sfr/next/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"
+       [ "$build_host" = "none" ] && build_host=""
+}
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
+[ "$NEXT_GCC_VERSION" ] && gcc_version="$NEXT_GCC_VERSION"
+gcc_ppc_version=$gcc_version
+[ "$NEXT_GCC_PPC_VERSION" ] && gcc_ppc_version="$NEXT_GCC_PPC_VERSION"
+gcc_ppcle_version=$gcc_ppc_version
+[ "$NEXT_GCC_PPCLE_VERSION" ] && gcc_ppcle_version="$NEXT_GCC_PPCLE_VERSION"
+[ "$NEXT_J_FACTOR" ] && j_factor="$NEXT_J_FACTOR"
 
 [ -n "$1" ] && {
        build_host="$1"
@@ -31,7 +40,9 @@ gpg_key="C8E1A580"
        shift
 }
 
-export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_HOST="${build_host:-none}"
 export NEXT_BUILD_DIR="$build_dir"
+export NEXT_GCC_VERSION="$gcc_version"
+export NEXT_J_FACTOR="$j_factor"
 
 true