Fixes the crippled console output on PortuxG20.

[karo-tx-uboot.git] / MAKEALL

diff --git a/MAKEALL b/MAKEALL
index 05e2d9097f8caca4a7bf8f6a622b1a886ff59071..eb7dd027d3704491840054d1fce895cfa4509d9a 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -87,9 +87,9 @@ while true ; do
        -c|--cpu)
                # echo "Option CPU: argument \`$2'"
                if [ "$opt_c" ] ; then
-                       opt_c="${opt_c%)} || \$3 == \"$2\")"
+                       opt_c="${opt_c%)} || \$3 == \"$2\" || \$3 ~ /$2:/)"
                else
-                       opt_c="(\$3 == \"$2\")"
+                       opt_c="(\$3 == \"$2\" || \$3 ~ /$2:/)"
                fi
                SELECTED='y'
                shift 2 ;;
@@ -201,6 +201,8 @@ LIST=""
 # Keep track of the number of builds and errors
 ERR_CNT=0
 ERR_LIST=""
+WRN_CNT=0
+WRN_LIST=""
 TOTAL_CNT=0
 CURRENT_CNT=0
 OLDEST_IDX=1
@@ -209,14 +211,17 @@ RC=0
 # Helper funcs for parsing boards.cfg
 boards_by_field()
 {
+       FS="[ \t]+"
+       [ -n "$3" ] && FS="$3"
        awk \
                -v field="$1" \
                -v select="$2" \
+               -F "$FS" \
                '($1 !~ /^#/ && $field == select) { print $1 }' \
                boards.cfg
 }
 boards_by_arch() { boards_by_field 2 "$@" ; }
-boards_by_cpu()  { boards_by_field 3 "$@" ; }
+boards_by_cpu()  { boards_by_field 3 "$@" "[: \t]+" ; }
 boards_by_soc()  { boards_by_field 6 "$@" ; }
 
 #########################################################################
@@ -639,14 +644,19 @@ build_target() {
                ${MAKE} tidy
 
                if [ -s ${LOG_DIR}/${target}.ERR ] ; then
-                       touch ${OUTPUT_PREFIX}/ERR/${target}
+                       cp ${LOG_DIR}/${target}.ERR ${OUTPUT_PREFIX}/ERR/${target}
                else
                        rm ${LOG_DIR}/${target}.ERR
                fi
        else
                if [ -s ${LOG_DIR}/${target}.ERR ] ; then
-                       : $(( ERR_CNT += 1 ))
-                       ERR_LIST="${ERR_LIST} $target"
+                       if grep -iw error ${LOG_DIR}/${target}.ERR ; then
+                               : $(( ERR_CNT += 1 ))
+                               ERR_LIST="${ERR_LIST} $target"
+                       else
+                               : $(( WRN_CNT += 1 ))
+                               WRN_LIST="${WRN_LIST} $target"
+                       fi
                else
                        rm ${LOG_DIR}/${target}.ERR
                fi
@@ -709,7 +719,11 @@ build_targets() {
                        : $((CURRENT_CNT += 1))
                        rm -f "${donep}${TOTAL_CNT}"
                        rm -f "${skipp}${TOTAL_CNT}"
-                       build_target ${t} ${TOTAL_CNT} &
+                       if [ $BUILD_MANY == 1 ] ; then
+                               build_target ${t} ${TOTAL_CNT} &
+                       else
+                               build_target ${t} ${TOTAL_CNT}
+                       fi
                fi
 
                # We maintain a running count of all the builds we have done.
@@ -743,17 +757,22 @@ print_stats() {
        rm -f ${donep}* ${skipp}*
 
        if [ $BUILD_MANY == 1 ] && [ -e "${OUTPUT_PREFIX}/ERR" ] ; then
-               ERR_LIST=$(ls ${OUTPUT_PREFIX}/ERR/)
-               ERR_CNT=`ls -1 ${OUTPUT_PREFIX}/ERR/ | wc | awk '{print $1}'`
-       else
-               ERR_CNT=0
+               ERR_LIST=`grep -riwl error ${OUTPUT_PREFIX}/ERR/`
+               ERR_LIST=`for f in $ERR_LIST ; do echo -n " $(basename $f)" ; done`
+               ERR_CNT=`echo $ERR_LIST | wc -w | awk '{print $1}'`
+               WRN_LIST=`grep -riwL error ${OUTPUT_PREFIX}/ERR/`
+               WRN_LIST=`for f in $WRN_LIST ; do echo -n " $(basename $f)" ; done`
+               WRN_CNT=`echo $WRN_LIST | wc -w | awk '{print $1}'`
        fi
 
        echo ""
        echo "--------------------- SUMMARY ----------------------------"
        echo "Boards compiled: ${TOTAL_CNT}"
        if [ ${ERR_CNT} -gt 0 ] ; then
-               echo "Boards with warnings or errors: ${ERR_CNT} (${ERR_LIST} )"
+               echo "Boards with errors: ${ERR_CNT} (${ERR_LIST} )"
+       fi
+       if [ ${WRN_CNT} -gt 0 ] ; then
+               echo "Boards with warnings but no errors: ${WRN_CNT} (${WRN_LIST} )"
        fi
        echo "----------------------------------------------------------"