From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 10 Jul 2025 09:42:06 +0000 (+1000)
Subject: do_build: go back to serial builds
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=a78c10d23c3c8383eec8bd79f03ad7298ec512c9;p=next-scripts

do_build: go back to serial builds
---

diff --git a/do_build b/do_build
index 0815989..c4c45c1 100755
--- a/do_build
+++ b/do_build
@@ -123,22 +123,13 @@ $cmd <<-EOF
 		mv \$log $obdir/\$b
 	}
 
-	echo Building: x86_64 allmodconfig
-	d="$bparent/x86_64_allmodconfig"
-	[ -d \$d ] || mkdir \$d || exit 1
-	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 -j200 -O -s > \$log_x86 2>&1 &
-	x86_64_pid=\$!
-
 	echo Building: perf
 	d="$bparent/perf"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_perf=\$d.log
 
-	if ! /usr/bin/time make -C tools/perf -f Makefile.perf -s -O -j100 O=\$d NO_BPF_SKEL=1 > \$log_perf 2>&1; then
-		do_fail perf "\$log_perf" "\$x86_64_pid"
+	if ! /usr/bin/time make -C tools/perf -f Makefile.perf -s -O -j200 O=\$d NO_BPF_SKEL=1 > \$log_perf 2>&1; then
+		do_fail perf "\$log_perf"
 	fi
 
 	show_log native perf \$log_perf
@@ -149,8 +140,8 @@ $cmd <<-EOF
 	log_ppc=\$d.log
 	make ARCH=powerpc O=\$d -s ppc64_defconfig || exit 1
 
-	if ! /usr/bin/time make ARCH=powerpc O=\$d -j100 -O -s > \$log_ppc 2>&1; then
-		do_fail "powerpc ppc64_defconfig" "\$log_ppc" "\$x86_64_pid"
+	if ! /usr/bin/time make ARCH=powerpc O=\$d -j200 -O -s > \$log_ppc 2>&1; then
+		do_fail "powerpc ppc64_defconfig" "\$log_ppc"
 	fi
 
 	show_log powerpc ppc64_defconfig \$log_ppc
@@ -161,13 +152,19 @@ $cmd <<-EOF
 	log_arm=\$d.log
 	make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -s multi_v7_defconfig || exit 1
 
-	if ! /usr/bin/time make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -j100 -O -s > \$log_arm 2>&1; then
-		do_fail 'arm multi_v7_defconfig' "\$log_arm" "\$x86_64_pid"
+	if ! /usr/bin/time make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -j200 -O -s > \$log_arm 2>&1; then
+		do_fail 'arm multi_v7_defconfig' "\$log_arm"
 	fi
 
 	show_log arm multi_v7_defconfig \$log_arm
 
-	if ! wait \$x86_64_pid; then
+	echo Building: x86_64 allmodconfig
+	d="$bparent/x86_64_allmodconfig"
+	[ -d \$d ] || mkdir \$d || exit 1
+	log_x86=\$d.log
+	make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -s allmodconfig || exit 1
+
+	if ! /usr/bin/time make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -j200 -O -s > \$log_x86 2>&1; then
 		do_fail "x86_64 allmodconfig" "\$log_x86"
 	fi