From ca07f5d8dea98eea31a6d21e14777c610cf9450d Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 7 Jul 2015 15:57:18 +1000 Subject: [PATCH] do_build: build tools/perf as well fix allmodconfig build --- do_build | 29 +++++++++++++++++++++++++++++ setup_build | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/do_build b/do_build index 26b8476..b9dfd96 100755 --- 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 3103871..26d511a 100755 --- a/setup_build +++ b/setup_build @@ -6,7 +6,7 @@ ssh "$build_host" /bin/sh <