X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fabuild%2Fabuild;h=0ed295ff1826319c6d87172d731d3194041ff156;hb=140a990a612e25a6d4974f696b9fa757e834d764;hp=22962a8a404fc5538703990f68b14538c2d90724;hpb=1cd76e77bf1b8227ddc290a5c347d2f2ec5f4569;p=coreboot.git
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 22962a8a4..0ed295ff1 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -10,12 +10,12 @@
# 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
# archive for more details.
-#
+#
#set -x # Turn echo on....
-ABUILD_DATE="January 29th, 2010"
-ABUILD_VERSION="0.9"
+ABUILD_DATE="December 10th, 2010"
+ABUILD_VERSION="0.9.1"
# Where shall we place all the build trees?
TARGET=coreboot-builds
@@ -35,6 +35,9 @@ cpus=1
# Configure-only mode
configureonly=0
+# Did any board fail to build?
+failed=0
+
# One might want to adjust these in case of cross compiling
for i in make gmake gnumake nonexistant_make; do
$i --version 2>/dev/null |grep "GNU Make" >/dev/null && break
@@ -99,13 +102,27 @@ function xml
function xmlfile
{
- test "$mode" == "xml" && {
+ test "$mode" == "xml" && {
printf '\n'
+ printf ']]>\n'
} >> $XMLFILE
}
+function junit
+{
+ test "$mode" == "junit" && printf "$*\n" >> $XMLFILE
+ return 0
+}
+
+function junitfile
+{
+ test "$mode" == "junit" && {
+ printf '\n'
+ } >> $XMLFILE
+}
function vendors
@@ -119,9 +136,9 @@ function mainboards
{
# make this a function so we can easily select
# without breaking readability
-
+
VENDOR=$1
-
+
ls -1 $ROOT/src/mainboard/$VENDOR | grep -v Kconfig
}
@@ -143,7 +160,7 @@ function create_config
build_dir=$TARGET/${VENDOR}_${MAINBOARD}
# get a working payload for the board if we have one.
- # the --payload option expects a directory containing
+ # the --payload option expects a directory containing
# a shell script payload.sh
# Usage: payload.sh [VENDOR] [DEVICE]
# the script returns an absolute path to the payload binary.
@@ -154,7 +171,6 @@ function create_config
fi
[ "$update" = "true" ] && mv ${build_dir}/coreboot.rom coreboot.rom.tmp
- $MAKE distclean obj=${build_dir}
mkdir -p ${build_dir}
mkdir -p $TARGET/sharedutils
[ "$update" = "true" ] && mv coreboot.rom.tmp ${build_dir}/coreboot.rom
@@ -162,53 +178,53 @@ function create_config
if [ "$CONFIG" != "" ]; then
printf " Using existing configuration $CONFIG ... "
xml " $CONFIG"
- cp $CONFIG .config
+ cp src/mainboard/$VENDOR/$MAINBOARD/$CONFIG ${build_dir}/config.build
else
printf " Creating config file... "
xml " autogenerated"
- grep "depends[\t ]on[\t ]*VENDOR" src/mainboard/$VENDOR/$MAINBOARD/../Kconfig | \
- sed "s,^.*\(VENDOR_.*\)[^A-Z0-9_]*,CONFIG_\1=y," > .config
- grep "config[\t ]*BOARD" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
- sed "s,^.*\(BOARD_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> .config
+ grep "if[\t ]*VENDOR" src/mainboard/$VENDOR/$MAINBOARD/../Kconfig | \
+ sed "s,^.*\(VENDOR_.*\)[^A-Z0-9_]*,CONFIG_\1=y," > ${build_dir}/config.build
+ grep "if[\t ]*BOARD" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+ sed "s,^.*\(BOARD_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> ${build_dir}/config.build
grep "select[\t ]*ARCH" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
- sed "s,^.*\(ARCH_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> .config
- echo "CONFIG_MAINBOARD_DIR=\"$VENDOR/$MAINBOARD\"" >> .config
- echo "CONFIG_CBFS_PREFIX=\"$cbfs_prefix\"" >> .config
+ sed "s,^.*\(ARCH_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> ${build_dir}/config.build
+ echo "CONFIG_MAINBOARD_DIR=\"$VENDOR/$MAINBOARD\"" >> ${build_dir}/config.build
+ echo "CONFIG_CBFS_PREFIX=\"$cbfs_prefix\"" >> ${build_dir}/config.build
if [ "$PAYLOAD" != "/dev/null" ]; then
- echo "# CONFIG_PAYLOAD_NONE is not set" >> .config
- echo "CONFIG_PAYLOAD_ELF=y" >> .config
- echo "CONFIG_FALLBACK_PAYLOAD_FILE=\"$PAYLOAD\"" >> .config
+ echo "# CONFIG_PAYLOAD_NONE is not set" >> ${build_dir}/config.build
+ echo "# CONFIG_PAYLOAD_SEABIOS is not set" >> ${build_dir}/config.build
+ echo "CONFIG_PAYLOAD_ELF=y" >> ${build_dir}/config.build
+ echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build
fi
if [ "$loglevel" != "default" ]; then
printf "(loglevel override) "
- echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
- echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel" >> .config
- echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
- echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel" >> .config
+ echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y" >> ${build_dir}/config.build
+ echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel" >> ${build_dir}/config.build
+ echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y" >> ${build_dir}/config.build
+ echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel" >> ${build_dir}/config.build
fi
if [ "$update" != "false" ]; then
printf "(update) "
- echo "CONFIG_UPDATE_IMAGE=y" >> .config
+ echo "CONFIG_UPDATE_IMAGE=y" >> ${build_dir}/config.build
fi
if [ "$ccache" = "true" ]; then
printf "(ccache enabled) "
- echo "CONFIG_CCACHE=y" >> .config
+ echo "CONFIG_CCACHE=y" >> ${build_dir}/config.build
fi
if [ "$scanbuild" = "true" ]; then
printf "(scan-build enabled) "
- echo "CONFIG_SCANBUILD_ENABLE=y" >> .config
- echo "CONFIG_SCANBUILD_REPORT_LOCATION=\"$TARGET/scan-build-results-tmp\"" >> .config
+ echo "CONFIG_SCANBUILD_ENABLE=y" >> ${build_dir}/config.build
+ echo "CONFIG_SCANBUILD_REPORT_LOCATION=\"$TARGET/scan-build-results-tmp\"" >> ${build_dir}/config.build
fi
fi
#yes "" | $MAKE oldconfig -j $cpus obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
- yes "" | $MAKE oldconfig obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
+ yes "" | $MAKE oldconfig DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
ret=$?
- mv .config.old $TARGET/${VENDOR}_${MAINBOARD}/config.in
if [ $ret -eq 0 ]; then
printf "ok; "
xml " ok"
@@ -241,19 +257,24 @@ function create_buildenv
# Allow simple "make" in the target directory
MAKEFILE=$TARGET/${VENDOR}_${MAINBOARD}/Makefile
- echo "# autogenerated makefile" > $MAKEFILE
+ echo "# autogenerated" > $MAKEFILE
echo "TOP=$ROOT" >> $MAKEFILE
- echo "OUT=$TARGET/${VENDOR}_${MAINBOARD}" >> $MAKEFILE
+ echo "BUILD=$TARGET" >> $MAKEFILE
+ echo "OBJ=\$(BUILD)/${VENDOR}_${MAINBOARD}" >> $MAKEFILE
+ echo "OBJUTIL=\$(BUILD)/sharedutils" >> $MAKEFILE
echo "all:" >> $MAKEFILE
- echo " cp config.build \$(TOP)/.config" >> $MAKEFILE
- echo " cd \$(TOP); \$(MAKE) oldconfig obj=\$(OUT)" >> $MAKEFILE
- echo " cd \$(TOP); \$(MAKE) obj=\$(OUT)" >> $MAKEFILE
+ echo " @cp -a config.h config.h.bak" >> $MAKEFILE
+ echo " @cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE
+ echo " @tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> $MAKEFILE
+ echo " @cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> $MAKEFILE
+ echo " @rm config.h.bak config.new config.old" >> $MAKEFILE
+ echo " @cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE
return $ret
}
function compile_target
-{
+{
VENDOR=$1
MAINBOARD=$2
@@ -265,16 +286,16 @@ function compile_target
CURR=$( pwd )
#stime=`perl -e 'print time();' 2>/dev/null || date +%s`
build_dir=$TARGET/${VENDOR}_${MAINBOARD}
- eval $MAKE $silent -j $cpus obj=${build_dir} objutil=$TARGET/sharedutils \
+ eval $MAKE $silent -j $cpus DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \
&> ${build_dir}/make.log
ret=$?
- mv .config ${build_dir}/config.build
mv .xcompile ${build_dir}/xcompile.build
cd $TARGET/${VENDOR}_${MAINBOARD}
etime=`perl -e 'print time();' 2>/dev/null || date +%s`
duration=$(( $etime - $stime ))
xml " ${duration}s"
+ junit " "
xml " "
xmlfile make.log
@@ -282,33 +303,26 @@ function compile_target
if [ $ret -eq 0 ]; then
xml " ok"
+ junit ""
+ junitfile make.log
+ junit ""
printf "ok\n" > compile.status
printf "ok. (took ${duration}s)\n"
cd $CURR
return 0
else
xml " failed"
+ junit ""
+ junitfile make.log
+ junit ""
printf "FAILED after ${duration}s!\nLog excerpt:\n"
tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log
cd $CURR
+ failed=1
return 1
fi
}
-function built_successfully
-{
- CURR=`pwd`
- status="fail"
- if [ -d "$TARGET/${VENDOR}_${MAINBOARD}" ]; then
- cd $TARGET/${VENDOR}_${MAINBOARD}
- if [ -r compile.status ] ; then
- status=`cat compile.status`
- fi
- cd $CURR
- fi
- [ "$buildall" != "true" -a "$status" == "ok" ]
-}
-
function build_broken
{
CURR=`pwd`
@@ -381,17 +395,20 @@ function build_target
done
fi
-
+
# TBD: look for suitable cross compiler suite
# cross-$TARCH-gcc and cross-$TARCH-ld
-
+
# Check result:
if [ $found_crosscompiler == "false" ]; then
printf "$TARCH: skipped, we're $ARCH\n\n"
xml " notbuilt"
xml ""
xml ""
-
+
+ junit " "
+ junit "No cross-compiler for $TARCH found"
+
return 0
else
printf "$TARCH: ok, $ARCH using ${CROSS_COMPILE}gcc\n"
@@ -409,31 +426,24 @@ function build_target
CC="$CC -fno-stack-protector"
fi
- built_successfully $VENDOR $MAINBOARD && test $update = "false" && \
- {
- printf " ( mainboard/$VENDOR/$MAINBOARD previously ok )\n\n"
- xml " previouslyok"
- xml ""
- xml ""
- return 0
- }
-
build_broken $VENDOR $MAINBOARD || \
{
printf " ( broken mainboard/$VENDOR/$MAINBOARD skipped )\n\n"
xml " knownbroken"
xml ""
xml ""
+ junit " "
+ junit "Board is marked as broken"
return 0
}
-
+
stime=`perl -e 'print time();' 2>/dev/null || date +%s`
create_buildenv $VENDOR $MAINBOARD $CONFIG
if [ $? -eq 0 -a $configureonly -eq 0 ]; then
if [ "$scanbuild" = "true" ]; then
rm -rf $TARGET/scan-build-results-tmp
fi
- compile_target $VENDOR $MAINBOARD &&
+ compile_target $VENDOR $MAINBOARD &&
xml " ok" ||
xml "broken"
if [ "$scanbuild" = "true" ]; then
@@ -448,6 +458,7 @@ function build_target
xml ""
xml ""
+ junit ""
printf "\n"
}
@@ -527,6 +538,8 @@ function myhelp
printf " [-h|--help] print this help and exit\n"
printf " [-x|--xml] write xml log file \n"
printf " (defaults to $XMLFILE)\n"
+ printf " [-J|--junit] write JUnit formatted xml log file \n"
+ printf " (defaults to $XMLFILE)\n"
printf " [-T|--test] submit image(s) to automated test system\n"
printf " [-c|--cpus ] build on at the same time\n"
printf " [-s|--silent] omit compiler calls in logs\n"
@@ -541,7 +554,7 @@ function myhelp
printf " (defaults to $ROOT)\n\n"
}
-function myversion
+function myversion
{
cat << EOF
@@ -570,11 +583,11 @@ test "$ROOT" = "" && ROOT=$( cd ../..; pwd )
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,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache Vvhat:bp:Tc:sxCl:rP:uy -- "$@"`
- eval set "$args"
+ args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,junit,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache -o Vvhat:bp:Tc:sJxCl:rP:uy -- "$@"`
+ eval set -- $args
else
# Detected non-GNU getopt
- args=`getopt Vvhat:bp:Tc:sxCl:rP:uy $*`
+ args=`getopt Vvhat:bp:Tc:sJxCl:rP:uy $*`
set -- $args
fi
@@ -586,10 +599,11 @@ fi
while true ; do
case "$1" in
-x|--xml) shift; mode=xml; rm -f $XMLFILE ;;
+ -J|--junit) shift; mode=junit; rm -f $XMLFILE ;;
-t|--target) shift; target="$1"; shift;;
-a|--all) shift; buildall=true;;
-b|--broken) shift; buildbroken=true;;
- -r|--remove) shift; remove=true; shift;;
+ -r|--remove) shift; remove=true;;
-v|--verbose) shift; verbose=true; silent='V=1';;
-V|--version) shift; myversion; exit 0;;
-h|--help) shift; myversion; myhelp; exit 0;;
@@ -618,6 +632,9 @@ debug "ROOT=$ROOT"
xml ''
xml ''
+junit ''
+junit ''
+
if [ "$target" != "" ]; then
# build a single board
VENDOR=`printf $target|cut -f1 -d/`
@@ -626,6 +643,7 @@ if [ "$target" != "" ]; then
if [ ! -r $ROOT/src/mainboard/$target ]; then
printf "No such target: $target\n"
xml ''
+ junit ''
exit 1
fi
build_target $VENDOR $MAINBOARD $CONFIG
@@ -641,4 +659,6 @@ else
done
fi
xml ''
+junit ''
+exit $failed