Scripts: Allow 'out-of-tree' builds and fix option overrides

Author: warped-rudi

config/options

@@ -1,4 +1,3 @@
 [ -r build/config/options ] && . build/config/options
-[ -r build/config/options-doozer ] && . build/config/options-doozer
-[ -r build/config/options-jenkins ] && . build/config/options-jenkins
+
 . config/path

config/path

@@ -2,6 +2,12 @@
 
 set -e
 
+#################################
+# Global settings               #
+#################################
+
+[ -r build/config/global-settings ] && . build/config/global-settings
+
 #################################
 # Target system path definition #
 #################################

scripts/Autobuild.sh

@@ -52,10 +52,10 @@ echo "######################"
 # Build with the maximum speed (maybe we should try too without MAKECFLAGS set)
 DOOZER_CONCURRENCY_MAKE_LEVEL=$(echo $MAKEFLAGS |cut -d, -f2)
 echo "Using DOOZER_CONCURRENCY_MAKE_LEVEL=$DOOZER_CONCURRENCY_MAKE_LEVEL : MAKEFLAGS was $MAKEFLAGS"
-echo DOOZER_CONCURRENCY_MAKE_LEVEL=$DOOZER_CONCURRENCY_MAKE_LEVEL >> build/config/options-doozer
-echo "NO_DEBUG_PKG=yes" >> build/config/options-doozer
-echo "DOOZER_TARGET_CCACHE=/project/.ccache-$1" >> build/config/options-doozer
-echo "DO_NOT_SET_ROOT=yes" >> build/config/options-doozer
+echo DOOZER_CONCURRENCY_MAKE_LEVEL=$DOOZER_CONCURRENCY_MAKE_LEVEL >> build/config/global-settings
+echo "NO_DEBUG_PKG=yes" >> build/config/global-settings
+echo "DOOZER_TARGET_CCACHE=/project/.ccache-$1" >> build/config/global-settings
+echo "DO_NOT_SET_ROOT=yes" >> build/config/global-settings
 
 
 ./scripts/loadcfg $1 || exit 1

scripts/kconfiggenerate

@@ -51,5 +51,5 @@ cd $BUILD/kconfig-frontends-*
 # conf --silentoldconfig needs these folders
 mkdir -p include/config include/generated
 
-${conf_tool} ${conf_tool_options} ../../../config/Kconfig.main
+${conf_tool} ${conf_tool_options} $ROOT/config/Kconfig.main