]> git.ozlabs.org Git - next-scripts/commitdiff
do_build: stop a failing "kill" from killing the whole here-script
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Dec 2018 01:30:10 +0000 (12:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Dec 2018 01:30:10 +0000 (12:30 +1100)
do_build

index 4ea51aa8a6dbd6034cbb4c186786975894e00dc8..3c4df6dd99d13ac77ace60c1aa9646da12330cff 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -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 \$ppc64_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