check_fixes: a few cleanups

[next-scripts] / do_build

diff --git a/do_build b/do_build
index 4fa16a11b440691f32074a061f59b9e87ec4c4f3..1b8ee97c0bf6f8cf97c658a29fd6417f5bc44abb 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -27,7 +27,7 @@ else
 fi
 obdir="$bparent/old/$tree"
 
-cmd="firejail --profile=$bin_dir/build.profile /bin/sh"
+cmd="/bin/sh"
 [ "$build_host" ] &&
        cmd="ssh root@$build_host unshare -n su $(id -u -n)"
 
@@ -143,9 +143,9 @@ $cmd <<-EOF
                echo "ERROR: perf build failed - log follows"
                echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
                cat \$log_perf
-               kill \$x86_64_pid
-               kill \$ppc64_pid
-               kill \$arm_pid
+               kill \$x86_64_pid || true
+               kill \$ppc64_pid || true
+               kill \$arm_pid || true
                killall make
                rm .scmversion
                exit 1
@@ -161,8 +161,8 @@ $cmd <<-EOF
                echo "ERROR: arm multi_v7_defconfig build failed - log follows"
                echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
                cat \$log_arm
-               kill \$x86_64_pid
-               kill \$ppd64_pid
+               kill \$x86_64_pid || true
+               kill \$ppc64_pid || true
                killall make
                rm .scmversion
                exit 1
@@ -178,7 +178,7 @@ $cmd <<-EOF
                echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
                echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
                cat \$log_ppc
-               kill \$x86_64_pid
+               kill \$x86_64_pid || true
                killall make
                rm .scmversion
                exit 1