From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Nov 2021 03:34:35 +0000 (+1100)
Subject: do_last_build: so the powerpc allyesconfig build in parallel
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=3fb9412d415afb39ccb92d2e3bf324130e17c276;p=next-scripts

do_last_build: so the powerpc allyesconfig build in parallel
---

diff --git a/do_last_build b/do_last_build
index 7c67135..5c70f08 100755
--- a/do_last_build
+++ b/do_last_build
@@ -8,6 +8,8 @@ cmd="/bin/sh"
 [ "$build_host" ] &&
 	cmd="ssh root@$build_host unshare -n su $(id -u -n)"
 
+j_factor=$(( j_factor / 2 ))
+
 $cmd <<-EOF
 	set -e
 
@@ -21,6 +23,13 @@ $cmd <<-EOF
 
 	touch .scmversion
 
+	echo Building: powerpc allyesconfig
+	d=../powerpc_allyesconfig
+	[ -d \$d ] || mkdir \$d
+	make ARCH=powerpc -s O=\$d allyesconfig
+	printf 'Backgrouding the %s build\n' 'powerpc_allyesconfig'
+	make ARCH=powerpc O=\$d -j$j_factor -O -s -k >\$d.log 2>&1 </dev/null &
+
 	echo Building: x86_64 modules_install
 	INSTALL_MOD_PATH="${build_dir%/*}" /usr/bin/time make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=../x86_64_allmodconfig -j$j_factor -O -s modules_install
 
@@ -52,12 +61,6 @@ $cmd <<-EOF
 	make ARCH=powerpc -s O=\$d ppc44x_defconfig
 	make ARCH=powerpc O=\$d -j$j_factor -O -s
 
-	echo Building: powerpc allyesconfig
-	d=../powerpc_allyesconfig
-	[ -d \$d ] || mkdir \$d
-	make ARCH=powerpc -s O=\$d allyesconfig
-	make ARCH=powerpc O=\$d -j$j_factor -O -s -k
-
 	echo Building: powerpc pseries_le_defconfig
 	d=../powerpc_pseries_le_defconfig
 	[ -d \$d ] || mkdir \$d
@@ -70,33 +73,24 @@ $cmd <<-EOF
 	make ARCH=i386 O=\$d CROSS_COMPILE=x86_64-linux-gnu- -s defconfig
 	make ARCH=i386 O=\$d CROSS_COMPILE=x86_64-linux-gnu- -j$j_factor -O -s
 
-	rm .scmversion
-EOF
-
-for a in sparc64 sparc:sparc64
-do
-	ka=${a%:*}
-	ca=${a#*:}
-	d=../${ka}_defconfig
-	$cmd <<-EOF
-		set -e
-
-		echo \$PATH | grep -q "\$HOME/bin" ||
-			export PATH="\$HOME/bin:\$PATH"
-		export LANG=C
+	echo Building: sparc64 defconfig
+	d=../sparc64_defconfig
+	[ -d \$d ] || mkdir \$d
+	cross -n -N -a sparc64 -k sparc64 -c $gcc_version -s O=\$d defconfig
+	cross -n -N -a sparc64 -k sparc64 -c $gcc_version O=\$d -j$j_factor -O -s
 
-		cd "$build_dir"
+	echo Building: sparc defconfig
+	d=../sparc_defconfig
+	[ -d \$d ] || mkdir \$d
+	cross -n -N -a sparc64 -k sparc -c $gcc_version -s O=\$d defconfig
+	cross -n -N -a sparc64 -k sparc -c $gcc_version O=\$d -j$j_factor -O -s
 
-		export CCACHE_DIR="${build_dir%/*}/.ccache"
-		export TMPDIR="${build_dir%/*}/tmp"
+	printf '\nWaiting for powerpc allyesconfig build\n\n'
+	wait
 
-		touch .scmversion
+	rm .scmversion
 
-		echo Building: $ka defconfig
-		[ -d $d ] || mkdir $d
-		cross -n -N -a ${ca} -k ${ka} -c $gcc_version -s O=$d defconfig
-		cross -n -N -a ${ca} -k ${ka} -c $gcc_version O=$d -j$j_factor -O -s
+	cat ../powerpc_allyesconfig.log
+EOF
 
-		rm .scmversion
-	EOF
-done
+exit 0