Various fixes to the tree to get coreboot-v2 to build on Solaris

[coreboot.git] / util / abuild / abuild

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 33e0a335bbee10f2a3918f7be1f37edac8521437..5f6120faa8c62db95bb545fee7a213ae28f7b158 100755 (executable)
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -36,7 +36,14 @@ cpus=1
 configureonly=0
 
 # One might want to adjust these in case of cross compiling
-MAKE="make"
+for i in make gmake gnumake nonexistant_make; do
+       $i --version 2>/dev/null |grep "GNU Make" >/dev/null && break
+done
+if [ "$i" = "nonexistant_make" ]; then
+       echo No GNU Make found.
+       exit 1
+fi
+MAKE=$i
 PYTHON=python
 
 # this can be changed to xml by -x
@@ -52,6 +59,9 @@ scanbuild=false
 # stackprotect mode enabled by -ns option.
 stackprotect=false
 
+# loglevel changed with -l / --loglevel option
+loglevel=default
+
 ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
        -e s/i86pc/i386/ \
        -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \
@@ -119,17 +129,22 @@ function create_config
 {
        VENDOR=$1
        MAINBOARD=$2
+       CONFIG=$3
        TARCH=$( architecture $VENDOR $MAINBOARD )
        TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
 
+       if [ "$CONFIG" != "" ]; then
+               TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/$CONFIG
+       fi
+
         # get a working payload for the board if we have one.
         # the --payload option expects a directory containing 
-       # an executable shell script payload.sh
+       # a shell script payload.sh
        #   Usage: payload.sh [VENDOR] [DEVICE]
        # the script returns an absolute path to the payload binary.
 
-       if [ -x $payloads/payload.sh ]; then
-               PAYLOAD=`$payloads/payload.sh $VENDOR $MAINBOARD`
+       if [ -f $payloads/payload.sh ]; then
+               PAYLOAD=`sh $payloads/payload.sh $VENDOR $MAINBOARD`
                printf "Using payload $PAYLOAD\n"
        fi
        
@@ -154,6 +169,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 EOF
                if [ "$TARCH" == i386 ] ; then
@@ -185,10 +201,19 @@ EOF
                ) > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
        fi
 
-       if [ "`which lzma`" != "" -a "$PAYLOAD" != /dev/null ]; then
-               COMPRESSION="option CONFIG_COMPRESSED_PAYLOAD_LZMA=1"
+       if [ "$loglevel" != "default" ]; then
+               LOGLEVEL1="option MAXIMUM_CONSOLE_LOGLEVEL=$loglevel"
+               LOGLEVEL2="option DEFAULT_CONSOLE_LOGLEVEL=$loglevel"
        else
-               COMPRESSION="# no compression"
+               LOGLEVEL1="# no loglevel override"
+               LOGLEVEL2=""
+       fi
+
+       COMPRESSION="# no compression"
+       if which lzma >/dev/null 2>/dev/null; then
+               if [ "$PAYLOAD" != /dev/null ]; then
+                       COMPRESSION="option CONFIG_COMPRESSED_PAYLOAD_LZMA=1"
+               fi
        fi
 
        cp $TARGET/Config-${VENDOR}_${MAINBOARD}.lb $TARGET/Config-${VENDOR}_${MAINBOARD}.lb.pre
@@ -199,6 +224,8 @@ EOF
                -e s:CROSS_PREFIX:"$CROSS_COMPILE":g \
                -e s:CROSS_HOSTCC:"$HOSTCC":g \
                -e s:__COMPRESSION__:"$COMPRESSION":g \
+               -e s:__LOGLEVEL__:"$LOGLEVEL1"\
+"$LOGLEVEL2":g \
                $TARGET/Config-${VENDOR}_${MAINBOARD}.lb.pre > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
        printf " ok\n"
 }
@@ -247,7 +274,7 @@ function create_builddir
                xmlfile $build_dir/config.log
                xml "  </log>"
                xml ""
-               tail -n $CONTEXT $build_dir/config.log
+               tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log
                return 1
        fi
 }
@@ -256,7 +283,8 @@ function create_buildenv
 {
        VENDOR=$1
        MAINBOARD=$2
-       create_config $VENDOR $MAINBOARD
+       CONFIG=$3
+       create_config $VENDOR $MAINBOARD $CONFIG
        create_builddir $VENDOR $MAINBOARD
 }
 
@@ -295,7 +323,7 @@ function compile_target
                xml "  </log>"
 
                printf "FAILED after ${duration}s! Log excerpt:\n"
-               tail -n $CONTEXT make.log
+               tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log
                cd $CURR
                return 1
        fi
@@ -327,6 +355,7 @@ function build_target
 {
        VENDOR=$1
        MAINBOARD=$2
+       CONFIG=$3
        TARCH=$( architecture $VENDOR $MAINBOARD )
 
        # Allow architecture override in an abuild.info file.
@@ -445,7 +474,7 @@ function build_target
                return 0
        }
        
-       create_buildenv $VENDOR $MAINBOARD
+       create_buildenv $VENDOR $MAINBOARD $CONFIG
        if [ $? -eq 0  -a  $configureonly -eq 0 ]; then
                compile_target $VENDOR $MAINBOARD && 
                        xml "  <status>ok</status>" ||
@@ -543,6 +572,7 @@ function myhelp
        printf "    [-ns|--nostackprotect]        use gcc -fno-stack-protector option\n"
        printf "    [-sb|--scan-build]            use clang's static analyzer\n"
        printf "    [-C|--config]                 configure-only mode\n"
+       printf "    [-l|--loglevel <num>]         set loglevel\n"
        printf "    [lbroot]                      absolute path to coreboot sources\n"
        printf "                                  (defaults to $LBROOT)\n\n"
 }
@@ -573,11 +603,11 @@ verbose=false
 getoptbrand="`getopt -V`"
 if [ "${getoptbrand:0:6}" == "getopt" ]; then
        # Detected GNU getopt that supports long options.
-       args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,xml,config Vvhat:bp:Tc:sxC -- "$@"`
+       args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,xml,config,loglevel Vvhat:bp:Tc:sxCl: -- "$@"`
        eval set "$args"
 else
        # Detected non-GNU getopt
-       args=`getopt Vvhat:bp:Tc:sxC $*`
+       args=`getopt Vvhat:bp:Tc:sxCl: $*`
        set -- $args
 fi
 
@@ -603,6 +633,7 @@ while true ; do
                -ns|--nostackprotect) shift; stackprotect=true;;
                -sb|--scan-build) shift; scanbuild=true;;
                -C|--config)    shift; configureonly=1;;
+               -l|--loglevel)  shift; loglevel="$1"; shift;;
                --)             shift; break;;
                -*)             printf "Invalid option\n\n"; myhelp; exit 1;;
                *)              break;;
@@ -621,7 +652,8 @@ if [ "$target" != "" ]; then
        # build a single board
        VENDOR=`printf $target|cut -f1 -d/`
        MAINBOARD=`printf $target|cut -f2 -d/`
-       build_target $VENDOR $MAINBOARD
+       CONFIG=`printf $target|cut -f3 -d/`
+       build_target $VENDOR $MAINBOARD $CONFIG
        test_target $VENDOR $MAINBOARD
 else
        # build all boards per default