X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=do_build;h=6493a15e527b8c09d3f2167842a04de194304492;hb=063e3ebc696de808c6254167104a3ec1c08892c9;hp=918fef95b042ca1acc93c4834e7455d54d6584da;hpb=107dc93fabd33b6a0d67b760841f60066be63036;p=next-scripts

diff --git a/do_build b/do_build
index 918fef9..6493a15 100755
--- a/do_build
+++ b/do_build
@@ -36,7 +36,7 @@ $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
 
@@ -50,12 +50,18 @@ $cmd <<-EOF
 
 	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
+s/^([[:xdigit:]]+)([[:space:]]+R_PPC64_REL32[[:space:]].*)$/XXX\2/
 ' | grep -vxFf $bparent/log-ignore
 	}
 
@@ -71,17 +77,27 @@ $cmd <<-EOF
 		echo "\$sep"
 		cat \$log
 		b=\$(basename \$log)
+		olen=0
 		if [ -f $obdir/\$b ]; then
-			olen=\$(sanitise_log $obdir/\$b | wc -l)
-			len=\$(sanitise_log \$log | wc -l)
-			if [ \$olen -lt \$len ]; then
-				echo "\$sep"
-				echo " log \$b increased number of lines"
-				echo "\$sep"
-				pushover "linux-next log got bigger"
+			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
 	}
 
@@ -89,30 +105,27 @@ $cmd <<-EOF
 	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 -s 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="$bparent/powerpc_ppc64_defconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_ppc=\$d.log
-	cross -n -N -a powerpc64 -k powerpc -c "$gcc_ppc_version" O=\$d -s 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_ppc_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="$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 -s 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
@@ -120,7 +133,7 @@ $cmd <<-EOF
 	[ -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 \$perf_pid
@@ -131,9 +144,9 @@ $cmd <<-EOF
 		echo "ERROR: perf build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_perf
-		kill \$x86_64_pid
-		kill \$ppc64_pid
-		kill \$arm_pid
+		kill \$x86_64_pid || true
+		kill \$ppc64_pid || true
+		kill \$arm_pid || true
 		killall make
 		rm .scmversion
 		exit 1
@@ -149,8 +162,8 @@ $cmd <<-EOF
 		echo "ERROR: arm multi_v7_defconfig build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_arm
-		kill \$x86_64_pid
-		kill \$ppd64_pid
+		kill \$x86_64_pid || true
+		kill \$ppc64_pid || true
 		killall make
 		rm .scmversion
 		exit 1
@@ -166,7 +179,7 @@ $cmd <<-EOF
 		echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 		cat \$log_ppc
-		kill \$x86_64_pid
+		kill \$x86_64_pid || true
 		killall make
 		rm .scmversion
 		exit 1