do_build: rearrange the builds a bit

diff --git a/do_build b/do_build
index 64876f7c8df21a83c2b4ea9c419d8e6e6aeb7233..9aede1371dc0f0059d9994177b4f722e52782104 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -108,36 +108,14 @@ $cmd <<-EOF
        log_x86=\$d.log
        make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -s allmodconfig || exit 1
        echo "Forking x86 build ..."
-       /usr/bin/time make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -j"$j_factor" -O -s > \$log_x86 2>&1 &
+       /usr/bin/time make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -j100 -O -s > \$log_x86 2>&1 &
        x86_64_pid=\$!
 
-       echo Building: powerpc ppc64_defconfig
-       d="$bparent/powerpc_ppc64_defconfig"
-       [ -d \$d ] || mkdir \$d || exit 1
-       log_ppc=\$d.log
-       make ARCH=powerpc O=\$d -s ppc64_defconfig || exit 1
-       echo "Forking powerpc build ..."
-       /usr/bin/time make ARCH=powerpc O=\$d -j"$j_factor" -O -s > \$log_ppc 2>&1 &
-       ppc64_pid=\$!
-
-       echo Building: arm multi_v7_defconfig
-       d="$bparent/arm_multi_v7_defconfig"
-       [ -d \$d ] || mkdir \$d || exit 1
-       log_arm=\$d.log
-       make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -s multi_v7_defconfig || exit 1
-       echo "Forking arm build ..."
-       /usr/bin/time make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -j"$j_factor" -O -s > \$log_arm 2>&1 &
-       arm_pid=\$!
-
        echo Building: perf
        d="$bparent/perf"
        [ -d \$d ] || mkdir \$d || exit 1
        log_perf=\$d.log
-       echo "Forking perf build ..."
-       /usr/bin/time make -C tools/perf -f Makefile.perf -s -O -j"$j_factor" O=\$d > \$log_perf 2>&1 &
-       perf_pid=\$!
-
-       wait \$perf_pid
+       /usr/bin/time make -C tools/perf -f Makefile.perf -s -O -j40 O=\$d > \$log_perf 2>&1
        rc=\$?
 
        if [ \$rc -ne 0 ]; then
@@ -146,8 +124,6 @@ $cmd <<-EOF
                echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
                cat \$log_perf
                kill \$x86_64_pid || true
-               kill \$ppc64_pid || true
-               kill \$arm_pid || true
                killall make
                rm .scmversion
                exit 1
@@ -155,37 +131,46 @@ $cmd <<-EOF
                show_log native perf \$log_perf
        fi
 
-       wait \$arm_pid
+       echo Building: powerpc ppc64_defconfig
+       d="$bparent/powerpc_ppc64_defconfig"
+       [ -d \$d ] || mkdir \$d || exit 1
+       log_ppc=\$d.log
+       make ARCH=powerpc O=\$d -s ppc64_defconfig || exit 1
+       /usr/bin/time make ARCH=powerpc O=\$d -j40 -O -s > \$log_ppc 2>&1
        rc=\$?
 
        if [ \$rc -ne 0 ]; then
-               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-               echo "ERROR: arm multi_v7_defconfig build failed - log follows"
-               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-               cat \$log_arm
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_ppc
                kill \$x86_64_pid || true
-               kill \$ppc64_pid || true
                killall make
                rm .scmversion
                exit 1
        else
-               show_log arm multi_v7_defconfig \$log_arm
+               show_log powerpc ppc64_defconfig \$log_ppc
        fi
 
-       wait \$ppc64_pid
+       echo Building: arm multi_v7_defconfig
+       d="$bparent/arm_multi_v7_defconfig"
+       [ -d \$d ] || mkdir \$d || exit 1
+       log_arm=\$d.log
+       make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -s multi_v7_defconfig || exit 1
+       /usr/bin/time make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -j40 -O -s > \$log_arm 2>&1
        rc=\$?
 
        if [ \$rc -ne 0 ]; then
-               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-               echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
-               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-               cat \$log_ppc
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: arm multi_v7_defconfig build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_arm
                kill \$x86_64_pid || true
                killall make
                rm .scmversion
                exit 1
        else
-               show_log powerpc ppc64_defconfig \$log_ppc
+               show_log arm multi_v7_defconfig \$log_arm
        fi
 
        wait \$x86_64_pid