X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=do_build;h=daa04283673bf52c0360c4123ff0665f11d86509;hb=50d7cb28be3021b644a47b9d4304b7565857bc74;hp=6909065762d81ffeb5c75702327fb5043936170d;hpb=3b12961b47780d32c77479e662fd342eff8f750a;p=next-scripts

diff --git a/do_build b/do_build
index 6909065..daa0428 100755
--- a/do_build
+++ b/do_build
@@ -1,11 +1,37 @@
 #!/bin/sh
 
-. "$(dirname $0)/common.sh"
+tree=
+if [ "$1" ]; then
+	tree=$1
+	shift
+fi
+
+tools_dir=$(dirname "$0")
+. "$tools_dir/common.sh"
 
 set -e
 
-###ssh "$build_host" /bin/sh -e <<-EOF
-ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
+bparent=$(dirname "$build_dir")
+
+line="$(tail -n 1 $SHA1_FILE)"
+
+# strip everything after the first tab character
+stree=${line%%	*}
+if [ "$tree" ]; then
+	[ "$tree" = "$stree" ] || {
+		echo "That is not the last tree merged ($tree v $stree)" 1>&2
+		exit 1
+	}
+else
+	tree="$stree"
+fi
+obdir="$bparent/old/$tree"
+
+cmd="/bin/sh"
+[ "$build_host" ] &&
+	cmd="ssh root@$build_host unshare -n su $(id -u -n)"
+
+$cmd <<-EOF
 
 	echo Building on \$(hostname)
 
@@ -14,92 +40,139 @@ ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
 
 	cd "$build_dir" || exit 1
 
-	export CCACHE_DIR="${build_dir%/*}/.ccache"
-	export TMPDIR="${build_dir%/*}/tmp"
+	export CCACHE_DIR="$bparent/.ccache"
+	export TMPDIR="$bparent/tmp"
 
 	git reset --hard next || exit 1
 	touch .scmversion || exit 1
 
+	[ -d "$obdir" ] || mkdir -p "$obdir" || exit 1
+
+	show_log() {
+		arch=\$1
+		conf=\$2
+		log=\$3
+
+		sep='======================================================================'
+
+		echo "\$sep"
+		echo " \$arch \$conf build OK - log follows"
+		echo "\$sep"
+		cat \$log
+		b=\$(basename \$log)
+		if [ -f $obdir/\$b ]; then
+			if [ \$(wc -l <$obdir/\$b) -lt \$(grep -v -x -F -f $bparent/log-ignore <\$log | wc -l) ]; then
+				echo "\$sep"
+				echo " log \$b increased number of lines"
+				echo "\$sep"
+				pushover "linux-next log got bigger"
+				diff -u $obdir/\$b \$log 2>&1 | less
+			fi
+		fi
+		mv \$log $obdir/\$b
+	}
+
 	echo Building: x86_64 allmodconfig
-	d=../x86_64_allmodconfig
+	d="$bparent/x86_64_allmodconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_x86=\$d.log
 	e=\$d.except
 	echo CONFIG_BUILD_DOCSRC=n >\$e || exit 1
-	KCONFIG_ALLCONFIG=\$e cross -n -N -a x86_64 -c $gcc_version O=\$d allyesconfig || exit 1
+	echo CONFIG_MODULES=y >>\$e || exit 1
+	KCONFIG_ALLCONFIG=\$e cross -n -N -a x86_64 -c "$gcc_version" O=\$d -s 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 &
+	/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=../powerpc_ppc64_defconfig
+	d="$bparent/powerpc_ppc64_defconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_ppc=\$d.log
-	cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d ppc64_defconfig || exit 1
+	cross -n -N -a powerpc64 -k powerpc -c "$gcc_ppc_version" O=\$d -s 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 &
+	/usr/bin/time cross -n -N -a powerpc64 -k powerpc -c "$gcc_ppc_version" O=\$d -j"$j_factor" -s > \$log_ppc 2>&1 &
+	ppc64_pid=\$!
 
 	echo Building: arm multi_v7_defconfig
-	d=../arm_multi_v7_defconfig
+	d="$bparent/arm_multi_v7_defconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_arm=\$d.log
-	cross -n -N -a arm -c $gcc_version O=\$d multi_v7_defconfig || exit 1
+	cross -n -N -a arm -c "$gcc_version" O=\$d -s 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 &
+	/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"
+	[ -d \$d ] || mkdir \$d || exit 1
+	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 %3
+	wait \$perf_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		echo "ERROR: ARM build failed - log follows"
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		cat \$log_arm
-		kill %1
-		kill %2
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		echo "ERROR: perf build failed - log follows"
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		cat \$log_perf
+		kill \$x86_64_pid
+		kill \$ppc64_pid
+		kill \$arm_pid
 		killall make
 		rm .scmversion
 		exit 1
 	else
-		echo "=================================================="
-		echo " ARM build OK - log follows"
-		echo "=================================================="
+		show_log native perf \$log_perf
+	fi
+
+	wait \$arm_pid
+	rc=\$?
+
+	if [ \$rc -ne 0 ]; then
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		echo "ERROR: arm multi_v7_defconfig build failed - log follows"
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_arm
+		kill \$x86_64_pid
+		kill \$ppd64_pid
+		killall make
+		rm .scmversion
+		exit 1
+	else
+		show_log arm multi_v7_defconfig \$log_arm
 	fi
 
-	wait %2
+	wait \$ppc64_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		echo "ERROR: powerpc build failed - log follows"
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		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
 	else
-		echo "=================================================="
-		echo " powerpc build OK - log follows"
-		echo "=================================================="
-		cat \$log_ppc
+		show_log powerpc ppc64_defconfig \$log_ppc
 	fi
 
-	wait %1
+	wait \$x86_64_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		echo "ERROR: x86 build failed - log follows"
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		echo "ERROR: x86_64 allmodconfig build failed - log follows"
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_x86
 		rm .scmversion
 		exit 1
 	else
-		echo "=================================================="
-		echo " x86 build OK - log follows"
-		echo "=================================================="
-		cat \$log_x86
+		show_log x86_64 allmodconfig \$log_x86
 	fi
 
 	rm .scmversion