new default build directory

[next-scripts] / common.sh

diff --git a/common.sh b/common.sh
index bac6dfdfaba8e4546c81a3e9c3b0298be5dbe7df..f4118484cd5dbe5996cf68c11b237524559a4a8b 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -1,16 +1,28 @@
 #
 # Common setup for linux-next scripts
 #
+
+# Just in case this gets included twice ...
+[ "$_next_common_included" ] && return 0
+_next_common_included=1
+
 bin_dir="$(dirname $0)"
 
 LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
+CTRL_FILE="../etc/control"
 
 build_host="ka2"
-build_dir="/scratch/sfr/next"
+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"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
+[ "$NEXT_GCC_VERSION" ] && gcc_version="$NEXT_GCC_VERSION"
+[ "$NEXT_J_FACTOR" ] && j_factor="$NEXT_J_FACTOR"
 
 [ -n "$1" ] && {
        build_host="$1"
@@ -23,5 +35,7 @@ build_dir="/scratch/sfr/next"
 
 export NEXT_BUILD_HOST="$build_host"
 export NEXT_BUILD_DIR="$build_dir"
+export NEXT_GCC_VERSION="$gcc_version"
+export NEXT_J_FACTOR="$j_factor"
 
 true