sanitise the log fiels a bit before comparing them to old ones

this should prevet the merge script form stopping so often

diff --git a/do_build b/do_build
index daa04283673bf52c0360c4123ff0665f11d86509..a63a9fb18d1e8f047f8dc1a6908841ea632edd2f 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -6,7 +6,7 @@ if [ "$1" ]; then
        shift
 fi
 
-tools_dir=$(dirname "$0")
+tools_dir=$(cd $(dirname "$0"); pwd)
 . "$tools_dir/common.sh"
 
 set -e
@@ -59,6 +59,8 @@ $cmd <<-EOF
                echo " \$arch \$conf build OK - log follows"
                echo "\$sep"
                cat \$log
+               $tools_dir/sanitise_log \$log >\$log.san
+               mv -f \$log.san \$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

diff --git a/sanitise_log b/sanitise_log
new file mode 100755 (executable)
index 0000000..5765893
--- /dev/null
+++ b/sanitise_log
@@ -0,0 +1,8 @@
+#!/bin/sed -rf
+
+/^[.[: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