do_build: build tools/perf as well

fix allmodconfig build

diff --git a/do_build b/do_build
index 26b8476d1a1b37eb384708aad2615e535536c0ed..b9dfd96fec1120ed7e1ba3f2539ba20af1b67855 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -26,6 +26,7 @@ ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
        log_x86=\$d.log
        e=\$d.except
        echo CONFIG_BUILD_DOCSRC=n >\$e || exit 1
+       echo CONFIG_MODULES=y >>\$e || exit 1
        KCONFIG_ALLCONFIG=\$e cross -n -N -a x86_64 -c $gcc_version O=\$d allmodconfig || exit 1
        echo "Forking x86 build ..."
        /usr/bin/time cross -n -N -a x86_64 -c $gcc_version O=\$d -j$j_factor -s > \$log_x86 2>&1 &
@@ -46,6 +47,34 @@ ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
        echo "Forking arm build ..."
        /usr/bin/time cross -n -N -a arm -c $gcc_version O=\$d -j$j_factor -s > \$log_arm 2>&1 &
 
+       echo Building: perf
+       d=../perf
+       [ -d \$d ] || mkdir \$d || exit 1
+       log_perf=\$d.log
+       echo "Forking perf build ..."
+       /usr/bin/time make -s -C tools/perf JOBS=$j_factor O=\$d > \$log_perf 2>&1 &
+
+       wait %4
+       rc=\$?
+
+       if [ \$rc -ne 0 ]; then
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: perf build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_perf
+               kill %1
+               kill %2
+               kill %3
+               killall make
+               rm .scmversion
+               exit 1
+       else
+               echo "============================"
+               echo " perf build OK - log follows"
+               echo "============================"
+               cat \$log_perf
+       fi
+
        wait %3
        rc=\$?
 

diff --git a/setup_build b/setup_build
index 3103871d52cc9160b62d4460a88d0f68eaa300cf..26d511af0e33e6409a38cc646d211827f07f7187 100755 (executable)
--- a/setup_build
+++ b/setup_build
@@ -6,7 +6,7 @@ ssh "$build_host" /bin/sh <<EOF
        set -x -e
        [ -d "$build_dir" ] || mkdir -p "$build_dir"
        cd "$build_dir/.."
-       rm -rf *config
+       rm -rf *config perf *config.log perf.log
        rm -rf next
        [ -d tmp ] || mkdir tmp
        [ -d .ccache ] || mkdir .ccache