cope with doing the merges and build on the same machine

[next-scripts] / do_build

diff --git a/do_build b/do_build
index ba631f4f30bf2842b20b2ed77b74b85e3decad63..0cb125148fcd4bef5bd141a31923bcb02e7cfc28 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -4,8 +4,11 @@
 
 set -e
 
-###ssh "$build_host" /bin/sh -e <<-EOF
-ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
+cmd="/bin/sh"
+[ "$build_host" ] &&
+       cmd="ssh root@$build_host unshare -n su $(id -u -n)"
+
+$cmd <<-EOF
 
        echo Building on \$(hostname)
 
@@ -26,7 +29,9 @@ 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
-       KCONFIG_ALLCONFIG=\$e cross -n -N -a x86_64 -c $gcc_version O=\$d allyesconfig || 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 &
 
        echo Building: powerpc ppc64_defconfig
@@ -34,6 +39,7 @@ ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
        [ -d \$d ] || mkdir \$d || exit 1
        log_ppc=\$d.log
        cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d ppc64_defconfig || exit 1
+       echo "Forking powerpc build ..."
        /usr/bin/time cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d -j$j_factor -s > \$log_ppc 2>&1 &
 
        echo Building: arm multi_v7_defconfig
@@ -41,45 +47,91 @@ ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
        [ -d \$d ] || mkdir \$d || exit 1
        log_arm=\$d.log
        cross -n -N -a arm -c $gcc_version O=\$d multi_v7_defconfig || exit 1
+       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=\$?
 
-       cat \$log_arm
        if [ \$rc -ne 0 ]; then
-               echo "ERROR: ARM build failed"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: arm multi_v7_defconfig build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_arm
                kill %1
                kill %2
+               killall make
                rm .scmversion
                exit 1
        else
-               echo "ARM build OK"
+               echo "=================================================="
+               echo " ARM build OK - log follows"
+               echo "=================================================="
+               cat \$log_arm
        fi
 
        wait %2
        rc=\$?
 
-       cat \$log_ppc
        if [ \$rc -ne 0 ]; then
-               echo "ERROR: powerpc build failed"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_ppc
                kill %1
+               killall make
                rm .scmversion
                exit 1
        else
-               echo "powerpc build OK"
+               echo "=================================================="
+               echo " powerpc build OK - log follows"
+               echo "=================================================="
+               cat \$log_ppc
        fi
 
        wait %1
        rc=\$?
 
-       cat \$log_x86
        if [ \$rc -ne 0 ]; then
-               echo "ERROR: x86 build failed"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: x86_64 allmodconfig build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_x86
                rm .scmversion
                exit 1
        else
-               echo "x86 build OK"
+               echo "=================================================="
+               echo " x86 build OK - log follows"
+               echo "=================================================="
+               cat \$log_x86
        fi
 
        rm .scmversion