X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=do_build;h=1b8ee97c0bf6f8cf97c658a29fd6417f5bc44abb;hb=8d005867845651e014c233986a6ebe69d5e3744f;hp=0cb125148fcd4bef5bd141a31923bcb02e7cfc28;hpb=a1da89c3815d37ec96fc9f298560852b2231e853;p=next-scripts

diff --git a/do_build b/do_build
index 0cb1251..1b8ee97 100755
--- a/do_build
+++ b/do_build
@@ -1,9 +1,32 @@
 #!/bin/sh
 
-. "$(dirname $0)/common.sh"
+tree=
+if [ "$1" ]; then
+	tree=$1
+	shift
+fi
+
+tools_dir=$(cd $(dirname "$0"); pwd)
+. "$tools_dir/common.sh"
 
 set -e
 
+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)"
@@ -13,51 +36,106 @@ $cmd <<-EOF
 	echo Building on \$(hostname)
 
 	echo \$PATH | grep -q "\$HOME/bin" || export PATH="\$HOME/bin:\$PATH"
-	export LANG=C
+	export LANG=C KCFLAGS="-Wimplicit-fallthrough"
 
 	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
+
+	sanitise_log() {
+		sed -r '
+/^[[:space:]]+$/d
+/^[.[:digit:]]+user [.[:digit:]]+system [:.[:digit:]]+elapsed [[:digit:]]+%CPU \([[:digit:]]+avgtext\+[[:digit:]]+avgdata [[:digit:]]+maxresident\)k$/d
+/^[[:digit:]]+inputs\+[[:digit:]]+outputs \([[:digit:]]+major\+[[:digit:]]+minor\)pagefaults [[:digit:]]+swaps$/d
+/^Setup is [[:digit:]]+ bytes \(padded to [[:digit:]]+ bytes\)\.$/d
+/^System is [[:digit:]]+ kB$/d
+/^CRC [[:xdigit:]]+$/d
+/^Kernel: arch\/x86\/boot\/bzImage is ready  \(#[[:digit:]]+\)$/d
+/^WARNING: vmlinux\.o\(\.text\+0x[[:xdigit:]]+\): Section mismatch in reference from /d
+/^WARNING: drivers\/built-in\.o\(\.text\+0x[[:xdigit:]]+\): Section mismatch in reference from /d
+/^Warning: Kernel ABI header at /d
+/^[[:space:]]+PERF_VERSION = /d
+' | grep -vxFf $bparent/log-ignore
+	}
+
+	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)
+		olen=0
+		if [ -f $obdir/\$b ]; then
+			olen=\$(sanitise_log <$obdir/\$b | wc -l)
+		fi
+		len=\$(sanitise_log <\$log | wc -l)
+		if [ \$len -gt \$olen ]; then
+			echo "\$sep"
+			echo " log \$b increased number of lines"
+			echo "\$sep"
+			linux-next-notify "\$arch \$conf log got bigger"
+			if [ -f $obdir/\$b ]; then
+				diff -u $obdir/\$b \$log 2>&1 | less
+			else
+				diff -u /dev/null \$log 2>&1 | less
+			fi
+		fi
+		if [ \$len -gt 0 ]; then
+			(sanitise_log <\$log; cat $bparent/log-ignore ) |
+				sort -u >$bparent/log-ignore.tmp
+			mv $bparent/log-ignore.tmp $bparent/log-ignore
+		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
-	echo CONFIG_MODULES=y >>\$e || exit 1
-	KCONFIG_ALLCONFIG=\$e cross -n -N -a x86_64 -c $gcc_version O=\$d allmodconfig || exit 1
+	make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- 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 make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -j"$j_factor" -O -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
+	make ARCH=powerpc 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 make ARCH=powerpc O=\$d -j"$j_factor" -O -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
+	make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- 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 make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -j"$j_factor" -O -s > \$log_arm 2>&1 &
+	arm_pid=\$!
 
 	echo Building: perf
-	d=../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 &
+	/usr/bin/time make -C tools/perf -f Makefile.perf -s -O -j"$j_factor" O=\$d > \$log_perf 2>&1 &
+	perf_pid=\$!
 
-	wait %4
+	wait \$perf_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
@@ -65,20 +143,17 @@ $cmd <<-EOF
 		echo "ERROR: perf build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_perf
-		kill %1
-		kill %2
-		kill %3
+		kill \$x86_64_pid || true
+		kill \$ppc64_pid || true
+		kill \$arm_pid || true
 		killall make
 		rm .scmversion
 		exit 1
 	else
-		echo "============================"
-		echo " perf build OK - log follows"
-		echo "============================"
-		cat \$log_perf
+		show_log native perf \$log_perf
 	fi
 
-	wait %3
+	wait \$arm_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
@@ -86,19 +161,16 @@ $cmd <<-EOF
 		echo "ERROR: arm multi_v7_defconfig build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_arm
-		kill %1
-		kill %2
+		kill \$x86_64_pid || true
+		kill \$ppc64_pid || true
 		killall make
 		rm .scmversion
 		exit 1
 	else
-		echo "=================================================="
-		echo " ARM build OK - log follows"
-		echo "=================================================="
-		cat \$log_arm
+		show_log arm multi_v7_defconfig \$log_arm
 	fi
 
-	wait %2
+	wait \$ppc64_pid
 	rc=\$?
 
 	if [ \$rc -ne 0 ]; then
@@ -106,18 +178,15 @@ $cmd <<-EOF
 		echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_ppc
-		kill %1
+		kill \$x86_64_pid || true
 		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
@@ -128,10 +197,7 @@ $cmd <<-EOF
 		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