X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=do_build;h=6493a15e527b8c09d3f2167842a04de194304492;hb=063e3ebc696de808c6254167104a3ec1c08892c9;hp=4ea51aa8a6dbd6034cbb4c186786975894e00dc8;hpb=6ebf198e3a80c018c34ac182fe1a5e60cfd679de;p=next-scripts

diff --git a/do_build b/do_build
index 4ea51aa..6493a15 100755
--- 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)"
 
@@ -61,6 +61,7 @@ $cmd <<-EOF
 /^WARNING: drivers\/built-in\.o\(\.text\+0x[[:xdigit:]]+\): Section mismatch in reference from /d
 /^Warning: Kernel ABI header at /d
 /^[[:space:]]+PERF_VERSION = /d
+s/^([[:xdigit:]]+)([[:space:]]+R_PPC64_REL32[[:space:]].*)$/XXX\2/
 ' | grep -vxFf $bparent/log-ignore
 	}
 
@@ -143,9 +144,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 +162,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 +179,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