do_*_build: introduce a global kconfig override file

diff --git a/do_build b/do_build
index 385a7cf039c206793f367331bbe75a19dbcb9791..7aa01d68d78f1a9f82c83f1cdfd3c95c67c7ad58 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -60,6 +60,12 @@ $cmd <<-EOF
        git reset --hard next || exit 1
        touch .scmversion || exit 1
 
+       g=../global.except
+       if [ -r \$g ]; then
+               KCONFIG_ALLCONFIG=\$g
+               export KCONFIG_ALLCONFIG
+       fi
+
        [ -d "$obdir" ] || mkdir -p "$obdir" || exit 1
 
        sanitise_log() {
@@ -127,10 +133,10 @@ $cmd <<-EOF
                killall make
                rm .scmversion
                exit 1
-       else
-               show_log native perf \$log_perf
        fi
 
+       show_log native perf \$log_perf
+
        echo Building: powerpc ppc64_defconfig
        d="$bparent/powerpc_ppc64_defconfig"
        [ -d \$d ] || mkdir \$d || exit 1
@@ -148,10 +154,10 @@ $cmd <<-EOF
                killall make
                rm .scmversion
                exit 1
-       else
-               show_log powerpc ppc64_defconfig \$log_ppc
        fi
 
+       show_log powerpc ppc64_defconfig \$log_ppc
+
        echo Building: arm multi_v7_defconfig
        d="$bparent/arm_multi_v7_defconfig"
        [ -d \$d ] || mkdir \$d || exit 1
@@ -169,10 +175,10 @@ $cmd <<-EOF
                killall make
                rm .scmversion
                exit 1
-       else
-               show_log arm multi_v7_defconfig \$log_arm
        fi
 
+       show_log arm multi_v7_defconfig \$log_arm
+
        wait \$x86_64_pid
        rc=\$?
 
@@ -183,9 +189,9 @@ $cmd <<-EOF
                cat \$log_x86
                rm .scmversion
                exit 1
-       else
-               show_log x86_64 allmodconfig \$log_x86
        fi
 
+       show_log x86_64 allmodconfig \$log_x86
+
        rm .scmversion
 EOF

diff --git a/do_last_build b/do_last_build
index f625d5dd8c6b1390a705174a801ed226ec77c825..90ab9a9396ac7b493953b8b4ba65a03148090f2b 100755 (executable)
--- a/do_last_build
+++ b/do_last_build
@@ -23,6 +23,12 @@ $cmd <<-EOF
 
        touch .scmversion
 
+       g=../global.except
+       if [ -r \$g ]; then
+               KCONFIG_ALLCONFIG=\$g
+               export KCONFIG_ALLCONFIG
+       fi
+
        echo Building: powerpc allyesconfig
        d=../powerpc_allyesconfig
        [ -d \$d ] || mkdir \$d
@@ -51,6 +57,9 @@ $cmd <<-EOF
        e=\$d.except
        echo CONFIG_PPC64=y >\$e
        echo CONFIG_SECTION_MISMATCH_WARN_ONLY=y >>\$e
+       if [ -r \$g ]; then
+               cat \$g >>\$e
+       fi
        KCONFIG_ALLCONFIG=\$e make ARCH=powerpc -s O=\$d allnoconfig
        rm \$e
        make ARCH=powerpc O=\$d -j$j1_factor -O -s