do_build: factor out showing the successful logs

diff --git a/do_build b/do_build
index ecef199aae1edfd2bcde21e191756aadbc6b133d..310498f24d638b2b899fbc198a61e730d6877556 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -48,6 +48,29 @@ $cmd <<-EOF
 
        [ -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 \$(wc -l <\$log) ]; then
+                               echo "\$sep"
+                               echo " log \$b increased number of lines"
+                               echo "\$sep"
+                               diff -u $obdir/\$b \$log 2>&1 | less
+                       fi
+               fi
+               mv \$log $obdir/\$b
+       }
+
        echo Building: x86_64 allmodconfig
        d="$bparent/x86_64_allmodconfig"
        [ -d \$d ] || mkdir \$d || exit 1
@@ -101,10 +124,7 @@ $cmd <<-EOF
                rm .scmversion
                exit 1
        else
-               echo "============================"
-               echo " perf build OK - log follows"
-               echo "============================"
-               cat \$log_perf
+               show_log native perf \$log_perf
        fi
 
        wait \$arm_pid
@@ -121,10 +141,7 @@ $cmd <<-EOF
                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 \$ppc64_pid
@@ -140,10 +157,7 @@ $cmd <<-EOF
                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 \$x86_64_pid
@@ -157,24 +171,8 @@ $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
 
-       for i in \$log_x86 \$log_ppc \$log_arm \$log_perf; do
-               b=\$(basename \$i)
-               if [ -f $obdir/\$b ]; then
-                       if [ \$(wc -l <$obdir/\$b) -lt \$(wc -l <\$i) ]; then
-                               echo "=================================================="
-                               echo " log \$i increased number of lines"
-                               echo "=================================================="
-                               diff -u $obdir/\$b \$i 2>&1 | less
-                       fi
-               fi
-               mv \$i $obdir/\$b
-       done
-
        rm .scmversion
 EOF