sync latest version of abuild (0.6) (trivial patch)
- parallel building - fix non-gnu-getopt systems - silent mode Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3351 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
Stefan Reinauer
parent
ee9e1a3911
commit
02a4e7f6f8
|
|
@ -5,7 +5,7 @@
|
|||
# This script builds coreboot images for all available targets.
|
||||
#
|
||||
# (C) 2004 by Stefan Reinauer <stepan@openbios.org>
|
||||
# (C) 2006 by coresystems GmbH <info@coresystems.de>
|
||||
# (C) 2006-2008 by coresystems GmbH <info@coresystems.de>
|
||||
#
|
||||
# This file is subject to the terms and conditions of the GNU General
|
||||
# Public License. See the file COPYING in the main directory of this
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
#set -x # Turn echo on....
|
||||
|
||||
ABUILD_DATE="October 24, 2006"
|
||||
ABUILD_VERSION="0.4"
|
||||
ABUILD_DATE="May 3rd, 2008"
|
||||
ABUILD_VERSION="0.6"
|
||||
|
||||
# Where shall we place all the build trees?
|
||||
TARGET=$( pwd )/coreboot-builds
|
||||
|
|
@ -29,6 +29,9 @@ CONTEXT=5
|
|||
|
||||
TESTSUBMISSION="http://qa.coreboot.org/deployment/send.php"
|
||||
|
||||
# Number of CPUs to compile on per default
|
||||
cpus=1
|
||||
|
||||
# One might want to adjust these in case of cross compiling
|
||||
MAKE="make"
|
||||
PYTHON=python
|
||||
|
|
@ -36,6 +39,10 @@ PYTHON=python
|
|||
# this can be changed to xml by -x
|
||||
mode=text
|
||||
|
||||
# silent mode.. no compiler calls, only warnings in the log files.
|
||||
# this is disabled per default but can be enabled with -s
|
||||
silent=
|
||||
|
||||
ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
|
||||
-e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \
|
||||
-e "s/Power Macintosh/ppc/"`
|
||||
|
|
@ -173,13 +180,13 @@ EOF
|
|||
COMPRESSION="# no compression"
|
||||
fi
|
||||
|
||||
sed -i.pre -e s,VENDOR,$VENDOR,g \
|
||||
-e s,MAINBOARD,$MAINBOARD,g \
|
||||
-e s,payload\ __PAYLOAD__,payload\ $PAYLOAD,g \
|
||||
-e s,CROSSCC,"$CC",g \
|
||||
-e s,CROSS_PREFIX,"$CROSS_COMPILE",g \
|
||||
-e s,CROSS_HOSTCC,"$HOSTCC",g \
|
||||
-e s,__COMPRESSION__,"$COMPRESSION",g \
|
||||
sed -i.pre -e s:VENDOR:$VENDOR:g \
|
||||
-e s:MAINBOARD:$MAINBOARD:g \
|
||||
-e s:payload\ __PAYLOAD__:payload\ $PAYLOAD:g \
|
||||
-e s:CROSSCC:"$CC":g \
|
||||
-e s:CROSS_PREFIX:"$CROSS_COMPILE":g \
|
||||
-e s:CROSS_HOSTCC:"$HOSTCC":g \
|
||||
-e s:__COMPRESSION__:"$COMPRESSION":g \
|
||||
$TARGET/Config-${VENDOR}_${MAINBOARD}.lb
|
||||
printf " ok\n"
|
||||
}
|
||||
|
|
@ -243,11 +250,15 @@ function compile_target
|
|||
VENDOR=$1
|
||||
MAINBOARD=$2
|
||||
|
||||
printf " Compiling image .."
|
||||
printf " Compiling image "
|
||||
test "$cpus" == "" && printf "in parallel .. "
|
||||
test "$cpus" == "1" && printf "on 1 cpu .. "
|
||||
test 0$cpus -gt 1 && printf "on %d cpus in parallel .. " $cpus
|
||||
|
||||
CURR=$( pwd )
|
||||
cd $TARGET/${VENDOR}_${MAINBOARD}
|
||||
stime=`date +%s`
|
||||
eval $MAKE &> make.log
|
||||
eval $MAKE $silent -j $cpus &> make.log
|
||||
ret=$?
|
||||
etime=`date +%s`
|
||||
duration=$(( $etime - $stime ))
|
||||
|
|
@ -301,9 +312,17 @@ function build_target
|
|||
TARCH=$( architecture $VENDOR $MAINBOARD )
|
||||
|
||||
# default setting
|
||||
CC='$(CROSS_COMPILE)gcc'
|
||||
HOSTCC='gcc'
|
||||
CROSS_COMPILE=''
|
||||
|
||||
if [ "`uname -s`" == Darwin ]; then
|
||||
# Darwin requires i386-elf-[binuitils|gcc] from MacPorts
|
||||
# and a link from i386-elf-gcc-<version> to i386-elf-gcc
|
||||
CC="$TARCH-elf-gcc -Wa,--divide"
|
||||
CROSS_COMPILE="$TARCH-elf-"
|
||||
else
|
||||
CC='$(CROSS_COMPILE)gcc'
|
||||
CROSS_COMPILE=''
|
||||
fi
|
||||
HOSTCC='gcc'
|
||||
|
||||
printf "Processing mainboard/$VENDOR/$MAINBOARD"
|
||||
|
||||
|
|
@ -447,6 +466,8 @@ function myhelp
|
|||
printf " [-x|--xml] write xml log file \n"
|
||||
printf " (defaults to $XMLFILE)\n"
|
||||
printf " [-T|--test] submit image(s) to automated test system\n"
|
||||
printf " [-c|--cpus <numcpus>] build on <numcpus> at the same time\n"
|
||||
printf " [-s|--silent] omit compiler calls in logs\n"
|
||||
printf " [lbroot] absolute path to coreboot sources\n"
|
||||
printf " (defaults to $LBROOT)\n\n"
|
||||
}
|
||||
|
|
@ -473,15 +494,21 @@ buildall=false
|
|||
LBROOT=$( cd ../..; pwd )
|
||||
verbose=false
|
||||
|
||||
# parse parameters
|
||||
args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test Vvhat:bp:T -- "$@"`
|
||||
# parse parameters.. try to find out whether we're running GNU getopt
|
||||
if [ "`getopt -V`" == "getopt.*" ]; then
|
||||
args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent Vvhat:bp:Tc:s -- "$@"`
|
||||
eval set "$args"
|
||||
else
|
||||
# Detected non-GNU getopt
|
||||
args=`getopt Vvhat:bp:Tc:s $*`
|
||||
set -- $args
|
||||
fi
|
||||
|
||||
if [ $? != 0 ]; then
|
||||
myhelp
|
||||
exit 1
|
||||
fi
|
||||
|
||||
eval set "$args"
|
||||
while true ; do
|
||||
case "$1" in
|
||||
-x|--xml) shift; mode=xml; rm -f $XMLFILE ;;
|
||||
|
|
@ -493,6 +520,8 @@ while true ; do
|
|||
-h|--help) shift; myversion; myhelp; exit 0;;
|
||||
-p|--payloads) shift; payloads="$1"; shift;;
|
||||
-T|--test) shift; hwtest=true;;
|
||||
-c|--cpus) shift; cpus="$1"; test "$cpus" == "max" && cpus=""; shift;;
|
||||
-s|--silent) shift; silent="-s";;
|
||||
--) shift; break;;
|
||||
-*) printf "Invalid option\n\n"; myhelp; exit 1;;
|
||||
*) break;;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
.TH ABUILD 1 "October 24, 2006"
|
||||
.TH ABUILD 1 "May 3, 2008"
|
||||
.SH NAME
|
||||
abuild \- build coreboot images for all available targets
|
||||
.SH SYNOPSIS
|
||||
.B abuild
|
||||
\fR[\fB\-abxVh\fR] [\fB\-t\fR vendor/board] [\fB\-p\fR dir]
|
||||
\fR[\fB\-abvxsTVh\fR] [\fB\-c\fR numcpus|max] [\fB\-t\fR vendor/board] [\fB\-p\fR dir]
|
||||
[LBROOT]
|
||||
.SH DESCRIPTION
|
||||
.B abuild
|
||||
|
|
@ -47,6 +47,16 @@ Submit generated image(s) to the automated test system.
|
|||
The results of the tests will be made available at
|
||||
.B http://qa.coreboot.org/log_manual.php
|
||||
.TP
|
||||
.B "\-c, \-\-cpus [<numcpus>|max]"
|
||||
Build on
|
||||
.B numcpus
|
||||
cpus at the same time, or on all available with
|
||||
.B max\fR.
|
||||
.TP
|
||||
.B "\-s, \-\-silent"
|
||||
Don't print any compiler calls in the log files. In coreboot v2 compiler
|
||||
calls are quite long, so it is hard to find the warnings between them.
|
||||
.TP
|
||||
.B "\-v, \-\-verbose"
|
||||
More verbose output.
|
||||
.TP
|
||||
|
|
@ -66,7 +76,7 @@ is covered by the GNU General Public License (GPL), version 2 or later.
|
|||
.SH COPYRIGHT
|
||||
2004 Stefan Reinauer
|
||||
.br
|
||||
2006 coresystems GmbH
|
||||
2006-2008 coresystems GmbH
|
||||
.SH AUTHORS
|
||||
Stefan Reinauer <stepan@coresystems.de>
|
||||
.PP
|
||||
|
|
|
|||
Loading…
Reference in New Issue