X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=common.sh;h=5e27d5f90abeef67082e63590b3767317e71f193;hb=560ce17516f98ac4d747f7e491721b6fd896811c;hp=71f17fbb6a88b89278a507180378406a9bce9742;hpb=92627a4a3489079993c43ebf70caad7914b5d5ec;p=next-scripts

diff --git a/common.sh b/common.sh
index 71f17fb..5e27d5f 100644
--- a/common.sh
+++ b/common.sh
@@ -6,21 +6,30 @@
 [ "$_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_dir="/scratch/sfr/next"
+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"
+[ "$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,17 @@ gpg_key=41D5C07A
 	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_GCC_PPC_VERSION="$gcc_ppc_version"
+export NEXT_GCC_PPCLE_VERSION="$gcc_ppcle_version"
+export NEXT_J_FACTOR="$j_factor"
+
+# Support functions
+get_contacts()
+{
+	awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $1; }' $CTRL_FILE
+}
 
 true