From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Oct 2015 06:50:56 +0000 (+1100)
Subject: do_build: make more posix shell compliant
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=72cf49a15d4445f0a5165e9f186feee10ebc6a3e;p=next-scripts

do_build: make more posix shell compliant
---

diff --git a/do_build b/do_build
index 84b225c..51bea9c 100755
--- a/do_build
+++ b/do_build
@@ -35,6 +35,7 @@ $cmd <<-EOF
 	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 &
+	x86_64_pid=\$!
 
 	echo Building: powerpc ppc64_defconfig
 	d="$bparent/powerpc_ppc64_defconfig"
@@ -43,6 +44,7 @@ $cmd <<-EOF
 	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 &
+	ppc64_pid=\$!
 
 	echo Building: arm multi_v7_defconfig
 	d="$bparent/arm_multi_v7_defconfig"
@@ -51,6 +53,7 @@ $cmd <<-EOF
 	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 &
+	arm_pid=\$!
 
 	echo Building: perf
 	d="$bparent/perf"
@@ -58,8 +61,9 @@ $cmd <<-EOF
 	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 &
+	perf_pid=\$!
 
-	wait %4
+	wait \$perf_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
@@ -67,9 +71,9 @@ $cmd <<-EOF
 		echo "ERROR: perf build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_perf
-		kill %1
-		kill %2
-		kill %3
+		kill \$x86_64_pid
+		kill \$ppc64_pid
+		kill \$arm_pid
 		killall make
 		rm .scmversion
 		exit 1
@@ -80,7 +84,7 @@ $cmd <<-EOF
 		cat \$log_perf
 	fi
 
-	wait %3
+	wait \$arm_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
@@ -88,8 +92,8 @@ $cmd <<-EOF
 		echo "ERROR: arm multi_v7_defconfig build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_arm
-		kill %1
-		kill %2
+		kill \$x86_64_pid
+		kill \$ppd64_pid
 		killall make
 		rm .scmversion
 		exit 1
@@ -100,7 +104,7 @@ $cmd <<-EOF
 		cat \$log_arm
 	fi
 
-	wait %2
+	wait \$ppc64_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
@@ -108,7 +112,7 @@ $cmd <<-EOF
 		echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_ppc
-		kill %1
+		kill \$x86_64_pid
 		killall make
 		rm .scmversion
 		exit 1
@@ -119,7 +123,7 @@ $cmd <<-EOF
 		cat \$log_ppc
 	fi
 
-	wait %1
+	wait \$x86_64_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then