coreboot-gerrit December 2016

coreboot-gerrit@coreboot.org

1 participants
1140 discussions

New patch to review for coreboot: buildgcc: Test -fno-pie for broken Debian toolchain
by Nico Huber 06 Dec '16

06 Dec '16

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17743 -gerrit commit 571f11b9f966f7c07e216a7c2cb109ef6ef7a6d6 Author: Nico Huber <nico.h(a)gmx.de> Date: Tue Dec 6 23:57:33 2016 +0100 buildgcc: Test -fno-pie for broken Debian toolchain Current Debian-testing toolchain reportedly has `-fpie` enabled by default which breaks a lot things. Change-Id: I5f8645bb65576d2e2602096fdb110ccd60341220 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- util/crossgcc/buildgcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 97c38b8..ff87d09 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -946,7 +946,7 @@ if [ -z "${LANGUAGES}" ]; then fi fi # GCC -export HOSTCFLAGS="-Os" +export HOSTCFLAGS="-Os -fno-pie" if have_hostcflags_from_gmp; then set_hostcflags_from_gmp fi

1 0

Patch merged into coreboot/master: buildgcc: Be less restrictive when trying to build GNAT
by gerrit＠coreboot.org 06 Dec '16

06 Dec '16

the following patch was just integrated into master: commit 26267a7a41312c3160604766d17f361dc80c2a52 Author: Nico Huber <nico.h(a)gmx.de> Date: Sun Dec 4 02:45:58 2016 +0100 buildgcc: Be less restrictive when trying to build GNAT It turned out that newer GNAT versions can build our current (5.3.0) GNAT without bootstrapping. So adapt the version enforcement. Change-Id: Ie7189e8bcadeee56cf5c2172e8c0ae7cd534685a Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/17706 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See https://review.coreboot.org/17706 for details. -gerrit

1 0

Patch merged into coreboot/master: buildgcc: Fix function prototype in GCC
by gerrit＠coreboot.org 06 Dec '16

06 Dec '16

the following patch was just integrated into master: commit aa89fb4618987e5c5034f2370381168853cc7308 Author: Nico Huber <nico.h(a)gmx.de> Date: Sun Dec 4 01:39:44 2016 +0100 buildgcc: Fix function prototype in GCC With some newer versions of GCC (experienced with GCC 6.2.1 on Arch- Linux) the first stage of a boostrapping fails due to a mismatching function prototype. Also add a missing `static` to the signature. Change-Id: Ia927036ccd725550f1191890515578bc80c74f80 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/17704 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See https://review.coreboot.org/17704 for details. -gerrit

1 0

Patch set updated for coreboot: util/abuild: Fix or disable shellcheck warnings
by Martin Roth 06 Dec '16

06 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17722 -gerrit commit ec3846e8a50cac9e2024c59572222fdd450b889d Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 30 16:32:20 2016 -0700 util/abuild: Fix or disable shellcheck warnings This cleans up the shellcheck warnings in abuild. Warning count: 1 Unexpected ==. 1 Use "${var:?}" to ensure this never expands to / . 1 VARIABLE appears unused. Verify it or export it. 1 Use "$@" (with quotes) to prevent whitespace problems. 2 Consider using { cmd1; cmd2; } >> file instead of individual redirects. 2 Expressions don't expand in single quotes, use double quotes for that. 3 Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. 4 $/${} is unnecessary on arithmetic variables. 5 Check exit code directly with 'if mycmd;', not indirectly with $?. 5 Use cd ... || exit in case cd fails. 11 Declare and assign separately to avoid masking return values. 13 Use $(..) instead of legacy `..`. 20 Don't use variables in the printf format string. 103 Double quote to prevent globbing. Change-Id: I9c77e122435ba87ce3a4aee76b5022f7265f9ef2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 276 ++++++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 128 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 300921a..8d7685b 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -32,7 +32,7 @@ export KCONFIG_OVERWRITECONFIG=1 PAYLOAD=/dev/null # path to coreboot XGCC -XGCCPATH="`pwd`/util/crossgcc/xgcc/bin/" +XGCCPATH="$(pwd)/util/crossgcc/xgcc/bin/" # Add XGCC to the path. if [ -d "$XGCCPATH" ] && [[ ":$PATH:" != *":$XGCCPATH:"* ]]; then @@ -77,30 +77,25 @@ quiet=false # clang mode enabled by -sb option. scanbuild=false -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/ \ - -e "s/Power Macintosh/ppc/"` - trap interrupt INT function interrupt { - printf "\n$0: execution interrupted manually.\n" + printf "\n%s: execution interrupted manually.\n" "$0" if [ "$mode" == "junit" ]; then - printf "$0: deleting incomplete xml output file.\n" + printf "%s: deleting incomplete xml output file.\n" "$0" fi exit 1 } function debug { - test "$verbose" == "true" && printf "$*\n" + test "$verbose" == "true" && echo "$*" } function junit { - test "$mode" == "junit" && printf "$*\n" >> $XMLFILE + test "$mode" == "junit" && echo "$*" >> "$XMLFILE" return 0 } @@ -108,9 +103,9 @@ function junitfile { test "$mode" == "junit" && { printf '<![CDATA[\n' - cat $1 + cat "$1" printf ']]>\n' - } >> $XMLFILE + } >> "$XMLFILE" } # Return mainboard descriptors. @@ -120,6 +115,7 @@ function junitfile function get_mainboards { local search_space=${1-*/*} + # shellcheck disable=SC2086 grep -h "^[[:space:]]*config\>[[:space:]]*\<BOARD_" \ ${ROOT}/src/mainboard/${search_space}/Kconfig.name 2>/dev/null | \ sed "s,^.*\<BOARD_$[A-Z0-9_]*$\>.*$,\1," @@ -130,6 +126,7 @@ function mainboard_directory { local MAINBOARD=$1 + # shellcheck disable=SC2086 grep -l "^[[:space:]]*config\>[[:space:]]*\<BOARD_${MAINBOARD}\>" \ ${ROOT}/src/mainboard/*/*/Kconfig.name | \ sed "s:^$ROOT/src/mainboard/$.*$/Kconfig.name$:\1:" @@ -139,15 +136,17 @@ function mainboard_directory function mainboard_vendor { local MAINBOARD=$1 + local kconfig_file - local kconfig_file=$( \ + kconfig_file=$( \ + # shellcheck disable=SC2086 grep -l "^[[:space:]]*config\>[[:space:]]*\<BOARD_${MAINBOARD}\>" \ ${ROOT}/src/mainboard/*/*/Kconfig.name | \ sed "s:^$${ROOT}/src/mainboard/.*$/.*/$Kconfig.name$$:\1/\2:" ) if [ ! -f "$kconfig_file" ]; then exit 1 fi - grep "^[[:space:]]*config\>[[:space:]]*\<VENDOR_" $kconfig_file | \ + grep "^[[:space:]]*config\>[[:space:]]*\<VENDOR_" "$kconfig_file" | \ sed "s,^.*\<VENDOR_$[A-Z0-9_]*$\>.*$,\1," } @@ -157,16 +156,18 @@ function mainboard_vendor # If a directory contains multiple boards, returns them all. function normalize_target { - local targets=$(get_mainboards $1) + local targets + + targets=$(get_mainboards "$1") if [ -n "$targets" ]; then - echo $targets + echo "$targets" return fi - local targets=$(echo $1 | tr ',' ' ') + targets=$(echo "$1" | tr ',' ' ') for i in $targets; do - if [ -n "$(mainboard_directory $i)" ]; then - echo $i + if [ -n "$(mainboard_directory "$i")" ]; then + echo "$i" else echo "$i is not a valid target" >&2 exit 1 @@ -174,34 +175,36 @@ function normalize_target done } +# shellcheck disable=SC2129 function create_config { local BUILD_NAME=$1 local build_dir=$2 + local board_srcdir - local config_file=${build_dir}/config.build - local board_srcdir=$(mainboard_directory ${BUILD_NAME}) + local config_file="${build_dir}/config.build" + board_srcdir="$(mainboard_directory "${BUILD_NAME}")" - mkdir -p ${build_dir} - mkdir -p $TARGET/sharedutils + mkdir -p "${build_dir}" + mkdir -p "$TARGET/sharedutils" - if [ "$quiet" == "false" ]; then printf " Creating config file for $BUILD_NAME... \n"; fi - printf "CONFIG_VENDOR_$(mainboard_vendor ${BUILD_NAME})=y\n" > ${config_file} - printf "CONFIG_BOARD_${BUILD_NAME}=y\n" >> ${config_file} - grep "select[\t ]*ARCH" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig | \ - sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> ${config_file} - printf "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"\n" >> ${config_file} + if [ "$quiet" == "false" ]; then echo " Creating config file for $BUILD_NAME..."; fi + echo "CONFIG_VENDOR_$(mainboard_vendor "${BUILD_NAME}")=y" > "${config_file}" + echo "CONFIG_BOARD_${BUILD_NAME}=y" >> "${config_file}" + grep "select[\t ]*ARCH" "${ROOT}/src/mainboard/${board_srcdir}/Kconfig" | \ + sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> "${config_file}" + echo "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"" >> "${config_file}" update_config "$BUILD_NAME" "$build_dir" "$config_file" ret=$? if [ $ret -eq 0 ]; then - if [ "$quiet" == "false" ]; then printf " $BUILD_NAME config created.\n"; fi + if [ "$quiet" == "false" ]; then echo " $BUILD_NAME config created."; fi return 0 else # Does this ever happen? - if [ "$quiet" == "false" ]; then printf "$BUILD_NAME config creation FAILED!\nLog excerpt:\n"; fi - tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log + if [ "$quiet" == "false" ]; then printf "%s config creation FAILED!\nLog excerpt:\n" "$BUILD_NAME"; fi + tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" return 1 fi } @@ -212,6 +215,7 @@ function update_config local build_dir=$2 local config_file=$3 + local PAYLOAD local defconfig_file defconfig_file=${build_dir}/config.$(echo "${BUILD_NAME}" | tr '[:upper:]' '[:lower:]').default @@ -222,14 +226,15 @@ function update_config # the script returns an absolute path to the payload binary. if [ -f "$payloads/payload.sh" ]; then - local PAYLOAD=$(sh "$payloads/payload.sh" "$BUILD_NAME") - if [ $? -gt 0 ]; then + PAYLOAD=$(sh "$payloads/payload.sh" "$BUILD_NAME") + local PAYLOAD_OK=$? + if [ $PAYLOAD_OK -gt 0 ]; then echo "problem with payload" exit 1 fi if [ "$quiet" == "false" ]; then printf "Using payload %s\n" "$PAYLOAD"; fi elif [ "$payloads" = "none" ]; then - local PAYLOAD=none + PAYLOAD=none fi if [ "$PAYLOAD" = "none" ]; then @@ -258,8 +263,9 @@ function update_config echo "$configoptions" >> "${config_file}" # shellcheck disable=SC2086 - $MAKE olddefconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" - if [ $? -eq 0 ]; then + $MAKE olddefconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" ; \ + CONFIG_OK=$? + if [ $CONFIG_OK -eq 0 ]; then $MAKE savedefconfig $silent DEFCONFIG="${defconfig_file}" DOTCONFIG="${config_file}" obj="${build_dir}" objutil="$TARGET/sharedutils" &> "${build_dir}/config.log" return $? else @@ -267,6 +273,7 @@ function update_config fi } +# shellcheck disable=SC2129 function create_buildenv { local BUILD_NAME=$1 @@ -280,22 +287,22 @@ function create_buildenv cp "$config_file" "$new_config_file" update_config "$BUILD_NAME" "$build_dir" "$new_config_file" fi - ret=$? + local ret=$? # Allow simple "make" in the target directory local MAKEFILE=$TARGET/${BUILD_NAME}/Makefile - echo "# autogenerated" > $MAKEFILE - echo "TOP=$ROOT" >> $MAKEFILE - echo "BUILD=$TARGET" >> $MAKEFILE - echo "OBJ=\$(BUILD)/${MAINBOARD}" >> $MAKEFILE - echo "OBJUTIL=\$(BUILD)/sharedutils" >> $MAKEFILE - echo "all:" >> $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 + echo "# autogenerated" > "$MAKEFILE" + echo "TOP=$ROOT" >> "$MAKEFILE" + echo "BUILD=$TARGET" >> "$MAKEFILE" + echo "OBJ=\$(BUILD)/${MAINBOARD}" >> "$MAKEFILE" + echo "OBJUTIL=\$(BUILD)/sharedutils" >> "$MAKEFILE" + echo "all:" >> "$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 } @@ -322,41 +329,41 @@ function compile_target { local BUILD_NAME=$1 - if [ "$quiet" == "false" ]; then printf " Compiling $MAINBOARD image$cpuconfig...\n"; fi + if [ "$quiet" == "false" ]; then echo " Compiling $MAINBOARD image$cpuconfig..."; fi CURR=$( pwd ) #stime=`perl -e 'print time();' 2>/dev/null || date +%s` - eval $BUILDPREFIX $MAKE $silent DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \ - &> ${build_dir}/make.log - ret=$? - cp .xcompile ${build_dir}/xcompile.build - cd ${build_dir} - - etime=`perl -e 'print time();' 2>/dev/null || date +%s` - duration=$(( $etime - $stime )) + # shellcheck disable=SC2086 + eval $BUILDPREFIX $MAKE $silent DOTCONFIG="${build_dir}/config.build" obj="${build_dir}" objutil="$TARGET/sharedutils" \ + &> "${build_dir}/make.log" ; \ + MAKE_FAILED=$? + cp .xcompile "${build_dir}/xcompile.build" + cd "${build_dir}" || return $? + + etime=$(perl -e 'print time();' 2>/dev/null || date +%s) + duration=$(( etime - stime )) junit " <testcase classname='board${testclass/#/.}' name='$BUILD_NAME' time='$duration' >" - if [ $ret -eq 0 ]; then + if [ $MAKE_FAILED -eq 0 ]; then junit "<system-out>" junitfile make.log junit "</system-out>" printf "ok\n" > compile.status - printf "$BUILD_NAME built successfully. (took ${duration}s)\n" + printf "%s built successfully. (took %ss)\n" "$BUILD_NAME" "${duration}" else - ret=1 junit "<failure type='BuildFailed'>" junitfile make.log junit "</failure>" printf "failed\n" > compile.status - printf "$BUILD_NAME build FAILED after ${duration}s!\nLog excerpt:\n" + printf "%s build FAILED after %ss!\nLog excerpt:\n" "$BUILD_NAME" "${duration}" tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log failed=1 fi - cd $CURR - if [ $clean_work = "true" ]; then - rm -rf ${build_dir} + cd "$CURR" || return $? + if [ "$clean_work" = "true" ]; then + rm -rf "${build_dir}" fi - return $ret + return $MAKE_FAILED } function build_config @@ -365,11 +372,13 @@ function build_config local build_dir=$2 local BUILD_NAME=$3 local config_file=$4 + local board_srcdir + local ret - local board_srcdir=$(mainboard_directory "${MAINBOARD}") + board_srcdir=$(mainboard_directory "${MAINBOARD}") - if [ "$(cat "${build_dir}/compile.status" 2>/dev/null)" = "ok" -a \ - "$buildall" = "false" ]; then + if [ "$(cat "${build_dir}/compile.status" 2>/dev/null)" = "ok" ] && \ + [ "$buildall" = "false" ]; then echo "Skipping $BUILD_NAME; (already successful)" return fi @@ -389,7 +398,7 @@ function build_config if [ "$quiet" == "false" ]; then echo "Building $BUILD_NAME"; fi mkdir -p "$TARGET/${BUILD_NAME}" "$TARGET/abuild" - ABSPATH="$(cd "$TARGET/abuild"; pwd)" + ABSPATH="$(cd "$TARGET/abuild" && pwd)" XMLFILE="$ABSPATH/${BUILD_NAME}.xml" rm -f "${XMLFILE}" @@ -409,7 +418,7 @@ function build_config junitfile "$build_dir/config.log" junit "</failure>" printf "failed\n" > compile.status - printf "$BUILD_NAME build configuration FAILED!\nLog excerpt:\n" + printf "%s build configuration FAILED!\nLog excerpt:\n" "$BUILD_NAME" tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" junit "</testcase>" @@ -417,25 +426,26 @@ function build_config fi - required_arches=`egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" $TARGET/${BUILD_NAME}/config.build | \ - sed "s,^CONFIG_ARCH_[^_]*_$[^=]*$=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z '` - missing_arches=`printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -` + required_arches=$(egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" "$TARGET/${BUILD_NAME}/config.build" | \ + sed "s,^CONFIG_ARCH_[^_]*_$[^=]*$=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z ') + # shellcheck disable=SC2016,SC2059 + missing_arches=$(printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -) if [ -n "$missing_arches" ]; then - printf "skipping $BUILD_NAME because we're missing compilers for ($missing_arches)\n" + printf "skipping %s because we're missing compilers for (%s)\n" "$BUILD_NAME" "$missing_arches" return fi - if [ $? -eq 0 -a $configureonly -eq 0 ]; then + if [ $BUILDENV_CREATED -eq 0 ] && [ $configureonly -eq 0 ]; then BUILDPREFIX= if [ "$scanbuild" = "true" ]; then scanbuild_out=$TARGET/${BUILD_NAME}-scanbuild - rm -rf ${scanbuild_out} + rm -rf "${scanbuild_out}" BUILDPREFIX="scan-build -o ${scanbuild_out}tmp" fi - compile_target ${BUILD_NAME} + compile_target "${BUILD_NAME}" if [ "$scanbuild" = "true" ]; then - mv ${scanbuild_out}tmp/* ${scanbuild_out} - rmdir ${scanbuild_out}tmp + mv "${scanbuild_out}"tmp/* "${scanbuild_out}" + rmdir "${scanbuild_out}tmp" fi fi @@ -446,11 +456,12 @@ function build_config function build_target { local MAINBOARD=$1 - local MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]') + local MAINBOARD_LC + MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]') # look for config files in the config directory that match the boardname if [ -n "$( find "$configdir" -maxdepth 1 -name "config.${MAINBOARD_LC}*" -print -quit )" ]; then - for config in "$configdir"/config."${MAINBOARD_LC}"*; do + for config in "$configdir/config.${MAINBOARD_LC}"*; do BUILD_NAME="${config##*/}" BUILD_NAME="${BUILD_NAME##config.}" BUILD_NAME=$(echo "${BUILD_NAME}" | tr '[:lower:]' '[:upper:]') @@ -485,7 +496,7 @@ function remove_target fi echo "Removing build dir for $BUILD_NAME..." - rm -rf "$TARGET/${BUILD_NAME}" + rm -rf "${TARGET:?}/${BUILD_NAME}" return } @@ -556,7 +567,7 @@ verbose=false test -f util/sconfig/sconfig.l && ROOT=$( pwd ) test -f ../util/sconfig/sconfig.l && ROOT=$( cd ..; pwd ) -test "$ROOT" = "" && ROOT=$( cd ../..; pwd ) +test "$ROOT" = "" && ROOT=$( cd ../.. && pwd ) # Look if we have getopt. If not, build it. export PATH=$PATH:util/abuild @@ -566,18 +577,22 @@ getopt - > /dev/null 2>/dev/null || gcc -o util/abuild/getopt util/abuild/getopt cmdline="$* -c 1" # parse parameters.. try to find out whether we're running GNU getopt -getoptbrand="`getopt -V`" +getoptbrand="$(getopt -V)" + +# shellcheck disable=SC2086 if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=`getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@"` || exit 1 + args=$(getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@") || exit 1 eval set -- $args + retval=$? else # Detected non-GNU getopt - args=`getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: $*` + args=$(getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: "$@") set -- $args + retval=$? fi -if [ $? != 0 ]; then +if [ $retval != 0 ]; then myhelp exit 1 fi @@ -590,7 +605,7 @@ configoptions="" unset testclass while true ; do case "$1" in - -J|--junit) shift; mode=junit; rm -f $XMLFILE ;; + -J|--junit) shift; mode=junit; rm -f "$XMLFILE" ;; -t|--target) shift; target="$1"; shift;; -a|--all) shift; buildall=true;; -d|--dir) shift; configdir="$1"; shift;; @@ -605,7 +620,7 @@ while true ; do cpus=$1 test "$MAKEFLAGS" == "-j max" && export MAKEFLAGS="-j" && cpuconfig=" in parallel" test "$1" == "1" && cpuconfig=" on 1 cpu" - expr "$1" : '-\?[0-9]\+$' > /dev/null && test 0$1 -gt 1 && cpuconfig=" on $1 cpus in parallel" + expr "$1" : '-\?[0-9]\+$' > /dev/null && test "0$1" -gt 1 && cpuconfig=" on $1 cpus in parallel" shift;; -s|--silent) shift; silent="-s";; --scan-build) shift @@ -653,7 +668,7 @@ while true ; do ;; -X|--xmlfile) shift; XMLFILE=$1; REAL_XMLFILE=$1; shift;; -K|--kconfig) shift - testclass=="$(basename $1 | tr '.' '_' )" + testclass="$(basename "$1" | tr '.' '_' )" customizing="${customizing}, $1 config" configoptions="$(cat "$1")${configoptions}\n" shift;; @@ -663,12 +678,12 @@ while true ; do esac done -if [ -z "$TARGET" -o "$TARGET" = "/" ]; then +if [ -z "$TARGET" ] || [ "$TARGET" = "/" ]; then echo "Please specify a valid, non-root build directory." exit 1 fi -customizing=`echo $customizing |cut -c3-` +customizing=$(echo "$customizing" | cut -c3-) if [ "$customizing" = "" ]; then customizing="default configuration" fi @@ -692,44 +707,48 @@ build_targets() { local targets=${*-$(get_mainboards)} for MAINBOARD in $targets; do - build_target ${MAINBOARD} + build_target "${MAINBOARD}" done } else build_targets() { + local ABSPATH + local stime + local etime + local targets=${*-$(get_mainboards)} # seed shared utils - TMPCFG=`mktemp` - printf "$configoptions" > $TMPCFG - $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils allnoconfig - printf "$configoptions" >> $TMPCFG - yes "" 2>/dev/null | $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils oldconfig 2>/dev/null |head > /dev/null + TMPCFG=$(mktemp) + printf "%s" "$configoptions" > "$TMPCFG" + $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" allnoconfig + printf "%s" "$configoptions" >> "$TMPCFG" + yes "" 2>/dev/null | $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" oldconfig 2>/dev/null |head > /dev/null BUILDPREFIX= if [ "$scanbuild" = "true" ]; then scanbuild_out=$TARGET/sharedutils-scanbuild - rm -rf ${scanbuild_out} + rm -rf "${scanbuild_out}" BUILDPREFIX="scan-build -o ${scanbuild_out}tmp" fi - mkdir -p $TARGET/abuild - local ABSPATH=`cd $TARGET/abuild; pwd` - local XMLFILE=$ABSPATH/__util.xml - rm -f ${XMLFILE} - local stime=`perl -e 'print time();' 2>/dev/null || date +%s` - $BUILDPREFIX $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils tools > $TARGET/sharedutils/make.log 2>&1 + mkdir -p "$TARGET/abuild" + ABSPATH="$(cd "$TARGET/abuild" && pwd)" + local XMLFILE="$ABSPATH/__util.xml" + rm -f "${XMLFILE}" + stime=$(perl -e 'print time();' 2>/dev/null || date +%s) + $BUILDPREFIX $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" tools > "$TARGET/sharedutils/make.log" 2>&1 local ret=$? - local etime=`perl -e 'print time();' 2>/dev/null || date +%s` - local duration=$(( $etime - $stime )) + etime=$(perl -e 'print time();' 2>/dev/null || date +%s) + local duration=$(( etime - stime )) junit " <testcase classname='util' name='all' time='$duration' >" if [ $ret -eq 0 ]; then junit "<system-out>" - junitfile $TARGET/sharedutils/make.log + junitfile "$TARGET/sharedutils/make.log" junit "</system-out>" junit "</testcase>" else junit "<failure type='BuildFailed'>" - junitfile $TARGET/sharedutils/make.log + junitfile "$TARGET/sharedutils/make.log" junit "</failure>" junit "</testcase>" return @@ -739,11 +758,12 @@ build_targets() fi if [ "$scanbuild" = "true" ]; then - mv ${scanbuild_out}tmp/* ${scanbuild_out} - rmdir ${scanbuild_out}tmp + mv "${scanbuild_out}tmp/"* "${scanbuild_out}" + rmdir "${scanbuild_out}tmp" fi - rm -rf $TARGET/temp $TMPCFG - echo $targets | xargs -P ${cpus:-0} -n 1 $0 $cmdline -t + rm -rf "$TARGET/temp" "$TMPCFG" + # shellcheck disable=SC2086 + echo $targets | xargs -P ${cpus:-0} -n 1 "$0" $cmdline -t } fi @@ -756,33 +776,33 @@ junit '<testsuite>' if [ "$target" != "" ]; then # build a single board - MAINBOARD=$(normalize_target ${target}) + MAINBOARD=$(normalize_target "${target}") if [ -z "${MAINBOARD}" ]; then - printf "No such target: $target\n" + printf "No such target: %s\n" "$target" exit 1 fi - build_srcdir=$(mainboard_directory ${MAINBOARD}) - if [ "$(echo ${MAINBOARD} | wc -w)" -gt 1 ]; then - build_targets ${MAINBOARD} - elif [ ! -r $ROOT/src/mainboard/${build_srcdir} ]; then - printf "No such target: ${MAINBOARD}\n" + build_srcdir="$(mainboard_directory "${MAINBOARD}")" + if [ "$(echo "${MAINBOARD}" | wc -w)" -gt 1 ]; then + build_targets "${MAINBOARD}" + elif [ ! -r "$ROOT/src/mainboard/${build_srcdir}" ]; then + echo "No such target: ${MAINBOARD}" exit 1 else - build_target ${MAINBOARD} + build_target "${MAINBOARD}" test "$mode" != "text" && \ - test -f $TARGET/abuild/${MAINBOARD}.xml && \ - cat $TARGET/abuild/${MAINBOARD}.xml >> $REAL_XMLFILE + test -f "$TARGET/abuild/${MAINBOARD}.xml" && \ + cat "$TARGET/abuild/${MAINBOARD}.xml" >> "$REAL_XMLFILE" XMLFILE=$REAL_XMLFILE fi else build_targets - rm -f $REAL_XMLFILE - XMLFILE=$REAL_XMLFILE + rm -f "$REAL_XMLFILE" + XMLFILE="$REAL_XMLFILE" junit '<?xml version="1.0" encoding="utf-8"?>' junit '<testsuite>' if [ "$mode" != "text" ]; then for xmlfile in $TARGET/abuild/*_*.xml; do - cat $xmlfile >> $REAL_XMLFILE + cat "$xmlfile" >> "$REAL_XMLFILE" done fi XMLFILE=$REAL_XMLFILE

1 0

Patch set updated for coreboot: abuild: Build saved config files
by Martin Roth 06 Dec '16

06 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17590 -gerrit commit 1a6a1d4dc4de15b713445c8216fef9f500dd14ae Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 23 18:47:53 2016 -0700 abuild: Build saved config files Update abuild to allow for building saved miniconfig files. If one or more config files exist for a platform under coreboot/configs, they will be built instead of the automatically generated default config. The config filename needs to start with "config.$VENDOR_$BOARD" to be picked up by the abuild script. - Update to version 0.10.0 - Add -d parameter to specify the saved config file directory - Break split 2nd half of create_config function into update_config to set the payload for saved config files. - Unset new payload Kconfig options that could be set in a saved config file. - Update a bunch of MAINBOARD variable names to BUILD_NAME since the build name isn't necessarily the same as the mainboard name. - Split build_target into two functions - build_target and build_config because one mainboard can now build multiple configurations. - Update remove target and call it directly from build_target() instead of from build_targets() Change-Id: I1a276d3e507b178f7dcd9dc125fa9c59f1ab47bd Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 271 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 191 insertions(+), 80 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index a2a428b..300921a 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -16,8 +16,8 @@ #set -x # Turn echo on.... -ABUILD_DATE="Oct 13, 2015" -ABUILD_VERSION="0.9.4" +ABUILD_DATE="Nov 23, 2016" +ABUILD_VERSION="0.10.0" TOP=$PWD @@ -51,6 +51,9 @@ failed=0 # default: single CPU build cpus=1 +# change with -d <directory> +configdir="$TOP/configs" + # 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 @@ -173,72 +176,114 @@ function normalize_target function create_config { - local MAINBOARD=$1 + local BUILD_NAME=$1 + local build_dir=$2 - local build_dir=$TARGET/${MAINBOARD} local config_file=${build_dir}/config.build - local board_srcdir=$(mainboard_directory ${MAINBOARD}) + local board_srcdir=$(mainboard_directory ${BUILD_NAME}) + + mkdir -p ${build_dir} + mkdir -p $TARGET/sharedutils + + if [ "$quiet" == "false" ]; then printf " Creating config file for $BUILD_NAME... \n"; fi + printf "CONFIG_VENDOR_$(mainboard_vendor ${BUILD_NAME})=y\n" > ${config_file} + printf "CONFIG_BOARD_${BUILD_NAME}=y\n" >> ${config_file} + grep "select[\t ]*ARCH" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig | \ + sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> ${config_file} + printf "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"\n" >> ${config_file} + + update_config "$BUILD_NAME" "$build_dir" "$config_file" + + ret=$? + if [ $ret -eq 0 ]; then + if [ "$quiet" == "false" ]; then printf " $BUILD_NAME config created.\n"; fi + return 0 + else + # Does this ever happen? + if [ "$quiet" == "false" ]; then printf "$BUILD_NAME config creation FAILED!\nLog excerpt:\n"; fi + tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log + return 1 + fi +} + +function update_config +{ + local BUILD_NAME=$1 + local build_dir=$2 + local config_file=$3 - # get a working payload for the board if we have one. - # the --payload option expects a directory containing + local defconfig_file + defconfig_file=${build_dir}/config.$(echo "${BUILD_NAME}" | tr '[:upper:]' '[:lower:]').default + + # get a working payload for the board if we have one. + # the --payload option expects a directory containing # a shell script payload.sh # Usage: payload.sh [BOARD] # the script returns an absolute path to the payload binary. - if [ -f $payloads/payload.sh ]; then - local PAYLOAD=`sh $payloads/payload.sh $MAINBOARD` + if [ -f "$payloads/payload.sh" ]; then + local PAYLOAD=$(sh "$payloads/payload.sh" "$BUILD_NAME") if [ $? -gt 0 ]; then echo "problem with payload" exit 1 fi - if [ "$quiet" == "false" ]; then printf "Using payload $PAYLOAD\n"; fi + if [ "$quiet" == "false" ]; then printf "Using payload %s\n" "$PAYLOAD"; fi elif [ "$payloads" = "none" ]; then local PAYLOAD=none fi - mkdir -p ${build_dir} - mkdir -p $TARGET/sharedutils - - if [ "$quiet" == "false" ]; then printf " Creating config file for $MAINBOARD... \n"; fi - printf "CONFIG_VENDOR_$(mainboard_vendor ${MAINBOARD})=y\n" > ${config_file} - printf "CONFIG_BOARD_${MAINBOARD}=y\n" >> ${config_file} - grep "select[\t ]*ARCH" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig | \ - sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> ${config_file} - printf "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"\n" >> ${config_file} if [ "$PAYLOAD" = "none" ]; then - printf "CONFIG_PAYLOAD_NONE=y\n" >> ${config_file} + { + echo "CONFIG_PAYLOAD_NONE=y" + echo "# CONFIG_PAYLOAD_SEABIOS is not set" + echo "# CONFIG_PAYLOAD_ELF is not set" + echo "# CONFIG_PAYLOAD_BAYOU is not set" + echo "# CONFIG_PAYLOAD_FILO is not set" + echo "# CONFIG_PAYLOAD_GRUB2 is not set" + echo "# CONFIG_PAYLOAD_OPENBIOS is not set" + echo "# CONFIG_PAYLOAD_DEPTHCHARGE is not set" + echo "# CONFIG_PAYLOAD_UBOOT is not set" + echo "# CONFIG_PAYLOAD_TIANOCORE is not set" + } >> "${config_file}" elif [ "$PAYLOAD" != "/dev/null" ]; then - printf "# CONFIG_PAYLOAD_NONE is not set\n" >> ${config_file} - printf "# CONFIG_PAYLOAD_SEABIOS is not set\n" >> ${config_file} - printf "CONFIG_PAYLOAD_ELF=y\n" >> ${config_file} - printf "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\"\n" >> ${config_file} + { + echo "# CONFIG_PAYLOAD_NONE is not set" + echo "# CONFIG_PAYLOAD_SEABIOS is not set" + echo "CONFIG_PAYLOAD_ELF=y" + echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\"" + } >> "${config_file}" fi - if [ "$quiet" == "false" ]; then printf " $MAINBOARD ($customizing)\n"; fi - printf "$configoptions" >> ${config_file} + if [ "$quiet" == "false" ]; then echo " $MAINBOARD ($customizing)"; fi + echo "$configoptions" >> "${config_file}" - yes "" 2>/dev/null | $MAKE oldconfig $silent DOTCONFIG=${config_file} obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log - ret=$? - if [ $ret -eq 0 ]; then - if [ "$quiet" == "false" ]; then printf " $MAINBOARD config created.\n"; fi - return 0 + # shellcheck disable=SC2086 + $MAKE olddefconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" + if [ $? -eq 0 ]; then + $MAKE savedefconfig $silent DEFCONFIG="${defconfig_file}" DOTCONFIG="${config_file}" obj="${build_dir}" objutil="$TARGET/sharedutils" &> "${build_dir}/config.log" + return $? else - # Does this ever happen? - if [ "$quiet" == "false" ]; then printf "$MAINBOARD config creation FAILED!\nLog excerpt:\n"; fi - tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log return 1 fi } function create_buildenv { - local MAINBOARD=$1 + local BUILD_NAME=$1 + local build_dir=$2 + local config_file=$3 - create_config $MAINBOARD + if [ -z "$config_file" ]; then + create_config "$BUILD_NAME" "$build_dir" + else + local new_config_file="${build_dir}/config.build" + cp "$config_file" "$new_config_file" + update_config "$BUILD_NAME" "$build_dir" "$new_config_file" + fi ret=$? # Allow simple "make" in the target directory - local MAKEFILE=$TARGET/${MAINBOARD}/Makefile + local MAKEFILE=$TARGET/${BUILD_NAME}/Makefile echo "# autogenerated" > $MAKEFILE echo "TOP=$ROOT" >> $MAKEFILE echo "BUILD=$TARGET" >> $MAKEFILE @@ -255,128 +300,194 @@ function create_buildenv return $ret } +function check_config +{ + local BUILD_DIR="$1" + local TEST_TYPE="$2" + local TEST_STRING="$3" + + local CONFIG_FILE="$BUILD_DIR/config.build" + local CONFIG_LOG="$BUILD_DIR/config.log" + + if ! grep -q "$TEST_STRING" "$CONFIG_FILE"; then + echo "config file: $CONFIG_FILE has incorrect $TEST_TYPE" + echo "Error: Expected '$TEST_STRING' in config file." >> "$CONFIG_LOG" + return 1 + fi + + return 0 +} + function compile_target { - local MAINBOARD=$1 + local BUILD_NAME=$1 if [ "$quiet" == "false" ]; then printf " Compiling $MAINBOARD image$cpuconfig...\n"; fi CURR=$( pwd ) #stime=`perl -e 'print time();' 2>/dev/null || date +%s` - build_dir=$TARGET/${MAINBOARD} eval $BUILDPREFIX $MAKE $silent DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \ &> ${build_dir}/make.log ret=$? cp .xcompile ${build_dir}/xcompile.build - cd $TARGET/${MAINBOARD} + cd ${build_dir} etime=`perl -e 'print time();' 2>/dev/null || date +%s` duration=$(( $etime - $stime )) - junit " <testcase classname='board${testclass/#/.}' name='$MAINBOARD' time='$duration' >" + junit " <testcase classname='board${testclass/#/.}' name='$BUILD_NAME' time='$duration' >" if [ $ret -eq 0 ]; then junit "<system-out>" junitfile make.log junit "</system-out>" printf "ok\n" > compile.status - printf "$MAINBOARD built successfully. (took ${duration}s)\n" + printf "$BUILD_NAME built successfully. (took ${duration}s)\n" else ret=1 junit "<failure type='BuildFailed'>" junitfile make.log junit "</failure>" printf "failed\n" > compile.status - printf "$MAINBOARD build FAILED after ${duration}s!\nLog excerpt:\n" + printf "$BUILD_NAME build FAILED after ${duration}s!\nLog excerpt:\n" tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log failed=1 fi cd $CURR if [ $clean_work = "true" ]; then - rm -rf $TARGET/${MAINBOARD} + rm -rf ${build_dir} fi return $ret } -function build_target +function build_config { local MAINBOARD=$1 - local board_srcdir=$(mainboard_directory ${MAINBOARD}) + local build_dir=$2 + local BUILD_NAME=$3 + local config_file=$4 - if [ "`cat $TARGET/${MAINBOARD}/compile.status 2>/dev/null`" = "ok" -a \ + local board_srcdir=$(mainboard_directory "${MAINBOARD}") + + if [ "$(cat "${build_dir}/compile.status" 2>/dev/null)" = "ok" -a \ "$buildall" = "false" ]; then - printf "Skipping $MAINBOARD; (already successful)\n" + echo "Skipping $BUILD_NAME; (already successful)" return fi - HOSTCC='gcc' + export HOSTCC='gcc' - if [ $chromeos = true -a `grep -c "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS\>" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig` -eq 0 ]; then - echo "${MAINBOARD} doesn't support Chrome OS, skipping." + if [ "$chromeos" = true ] && [ "$(grep -c "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS\>" "${ROOT}/src/mainboard/${board_srcdir}/Kconfig")" -eq 0 ]; then + echo "${BUILD_NAME} doesn't support Chrome OS, skipping." return fi - if [ -f src/mainboard/${board_srcdir}/abuild.disabled ]; then - echo "${MAINBOARD} disabled:" - cat src/mainboard/${board_srcdir}/abuild.disabled + if [ -f "src/mainboard/${board_srcdir}/abuild.disabled" ]; then + echo "${BUILD_NAME} disabled:" + cat "src/mainboard/${board_srcdir}/abuild.disabled" return fi - if [ "$quiet" == "false" ]; then printf "Building $MAINBOARD\n"; fi - mkdir -p $TARGET/${MAINBOARD} $TARGET/abuild - ABSPATH=`cd $TARGET/abuild; pwd` - XMLFILE=$ABSPATH/${MAINBOARD}.xml - rm -f ${XMLFILE} + if [ "$quiet" == "false" ]; then echo "Building $BUILD_NAME"; fi + mkdir -p "$TARGET/${BUILD_NAME}" "$TARGET/abuild" + ABSPATH="$(cd "$TARGET/abuild"; pwd)" + XMLFILE="$ABSPATH/${BUILD_NAME}.xml" + rm -f "${XMLFILE}" + + stime=$(perl -e 'print time();' 2>/dev/null || date +%s) + create_buildenv "$BUILD_NAME" "$build_dir" "$config_file" + local BUILDENV_CREATED=$? + + check_config "$build_dir" "mainboard" "CONFIG_BOARD_${MAINBOARD}=y" + local MAINBOARD_OK=$? + + check_config "$build_dir" "vendor" "CONFIG_VENDOR_$(mainboard_vendor "${MAINBOARD}")=y" + local VENDOR_OK=$? + + if [ $BUILDENV_CREATED -ne 0 ] || [ $MAINBOARD_OK -ne 0 ] || [ $VENDOR_OK -ne 0 ]; then + + junit "<failure type='BuildFailed'>" + junitfile "$build_dir/config.log" + junit "</failure>" + printf "failed\n" > compile.status + printf "$BUILD_NAME build configuration FAILED!\nLog excerpt:\n" + tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" + junit "</testcase>" + return + fi - stime=`perl -e 'print time();' 2>/dev/null || date +%s` - create_buildenv $MAINBOARD - required_arches=`egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" $TARGET/${MAINBOARD}/config.build | \ + required_arches=`egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" $TARGET/${BUILD_NAME}/config.build | \ sed "s,^CONFIG_ARCH_[^_]*_$[^=]*$=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z '` missing_arches=`printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -` if [ -n "$missing_arches" ]; then - printf "skipping $MAINBOARD because we're missing compilers for ($missing_arches)\n" + printf "skipping $BUILD_NAME because we're missing compilers for ($missing_arches)\n" return fi if [ $? -eq 0 -a $configureonly -eq 0 ]; then BUILDPREFIX= if [ "$scanbuild" = "true" ]; then - scanbuild_out=$TARGET/${MAINBOARD}-scanbuild + scanbuild_out=$TARGET/${BUILD_NAME}-scanbuild rm -rf ${scanbuild_out} BUILDPREFIX="scan-build -o ${scanbuild_out}tmp" fi - compile_target ${MAINBOARD} + compile_target ${BUILD_NAME} if [ "$scanbuild" = "true" ]; then mv ${scanbuild_out}tmp/* ${scanbuild_out} rmdir ${scanbuild_out}tmp fi fi - # Not calculated here because we still print it in compile_target - #etime=`perl -e 'print time();' 2>/dev/null || date +%s` - #duration=$(( $etime - $stime )) junit "</testcase>" } +# One target may build several configs +function build_target +{ + local MAINBOARD=$1 + local MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]') + + # look for config files in the config directory that match the boardname + if [ -n "$( find "$configdir" -maxdepth 1 -name "config.${MAINBOARD_LC}*" -print -quit )" ]; then + for config in "$configdir"/config."${MAINBOARD_LC}"*; do + BUILD_NAME="${config##*/}" + BUILD_NAME="${BUILD_NAME##config.}" + BUILD_NAME=$(echo "${BUILD_NAME}" | tr '[:lower:]' '[:upper:]') + echo "Building config $BUILD_NAME" + build_dir=$TARGET/${BUILD_NAME} + build_config "$MAINBOARD" "$build_dir" "$BUILD_NAME" "$config" + remove_target "$BUILD_NAME" + + done + else + echo "Building board $MAINBOARD (using default config)" + build_dir=$TARGET/${MAINBOARD} + + build_config "$MAINBOARD" "$build_dir" "$MAINBOARD" + remove_target "$MAINBOARD" + fi + +} + function remove_target { if [ "$remove" != "true" ]; then - return 0 + return fi - local MAINBOARD=$1 + local BUILD_NAME=$1 # Save the generated coreboot.rom file of each board. - if [ -r "$TARGET/${MAINBOARD}/coreboot.rom" ]; then - cp $TARGET/${MAINBOARD}/coreboot.rom \ - ${MAINBOARD}_coreboot.rom + if [ -r "$TARGET/${BUILD_NAME}/coreboot.rom" ]; then + cp "$TARGET/${BUILD_NAME}/coreboot.rom" \ + "${BUILD_NAME}_coreboot.rom" fi - printf "Removing build dir for board $MAINBOARD...\n" - rm -rf $TARGET/${MAINBOARD} + echo "Removing build dir for $BUILD_NAME..." + rm -rf "$TARGET/${BUILD_NAME}" - return 0 + return } function myhelp @@ -391,6 +502,7 @@ Options:\n" [-q|--quiet] print fewer messages [-a|--all] build previously succeeded ports as well [-r|--remove] remove output dir after build + [-d|--dir <dir>] directory containing config files [-t|--target <vendor/board>] attempt to build target vendor/board only [-p|--payloads <dir>] use payloads in <dir> to build images [-V|--version] print version number and exit @@ -457,11 +569,11 @@ cmdline="$* -c 1" getoptbrand="`getopt -V`" if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=`getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K: -- "$@"` || exit 1 + args=`getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@"` || exit 1 eval set -- $args else # Detected non-GNU getopt - args=`getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K: $*` + args=`getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: $*` set -- $args fi @@ -481,6 +593,7 @@ while true ; do -J|--junit) shift; mode=junit; rm -f $XMLFILE ;; -t|--target) shift; target="$1"; shift;; -a|--all) shift; buildall=true;; + -d|--dir) shift; configdir="$1"; shift;; -r|--remove) shift; remove=true;; -v|--verbose) shift; verbose=true; silent='V=1';; -q|--quiet) shift; quiet=true;; @@ -580,7 +693,6 @@ build_targets() local targets=${*-$(get_mainboards)} for MAINBOARD in $targets; do build_target ${MAINBOARD} - remove_target ${MAINBOARD} done } else @@ -657,7 +769,6 @@ if [ "$target" != "" ]; then exit 1 else build_target ${MAINBOARD} - remove_target ${MAINBOARD} test "$mode" != "text" && \ test -f $TARGET/abuild/${MAINBOARD}.xml && \ cat $TARGET/abuild/${MAINBOARD}.xml >> $REAL_XMLFILE

1 0

New patch to review for coreboot: util/kconfig/conf.c: Fix newline in error printf
by Martin Roth 06 Dec '16

06 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17742 -gerrit commit a54b4b45919c949f4c97043fe37f6f28b76fadc0 Author: Martin Roth <martinroth(a)google.com> Date: Tue Dec 6 14:28:44 2016 -0700 util/kconfig/conf.c: Fix newline in error printf For some reason the \n in the defconfig save error was not escaped. Change-Id: I6a76b258f461a194fe17aae2b4fa04326b46d8d6 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/kconfig/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c index c421773..7aae1c7 100644 --- a/util/kconfig/conf.c +++ b/util/kconfig/conf.c @@ -705,7 +705,7 @@ int main(int ac, char **av) } } else if (input_mode == savedefconfig) { if (conf_write_defconfig(defconfig_file)) { - fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), + fprintf(stderr, _("\n*** Error while saving defconfig to: %s\n\n"), defconfig_file); return 1; }

1 0

New patch to review for coreboot: util/abuild: Add more error handling for command line options
by Martin Roth 06 Dec '16

06 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17741 -gerrit commit eb94d3c811a6dc5b7cbccbec81f796016fa81050 Author: Martin Roth <martinroth(a)google.com> Date: Tue Dec 6 09:51:54 2016 -0700 util/abuild: Add more error handling for command line options - Show an error if a directory is added after the command line options to catch scripts using the old parameters. - If an invalid parameter is specified, show the parameter. Change-Id: Ie8948361f1c51e89a99bdb13df8c554747cd521d Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 65f55a0..88787e8 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -679,10 +679,13 @@ while true ; do configoptions="$(cat "$1")${configoptions}\n" shift;; --) shift; break;; - -*) printf "Invalid option\n\n"; myhelp; exit 1;; + -*) printf "Invalid option '%s'\n\n" "$1"; myhelp; exit 1;; *) break;; esac done +if [ -n "$1" ]; then + printf "Invalid option '%s'\n\n" "$1"; myhelp; exit 1; +fi if [ -z "$TARGET" ] || [ "$TARGET" = "/" ]; then echo "Please specify a valid, non-root build directory."

1 0

New patch to review for coreboot: util/abuild: Add argument -R to specify root directory
by Martin Roth 06 Dec '16

06 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17740 -gerrit commit ff79596ee375b448f2a436e5cd2e5df3629c7e5a Author: Martin Roth <martinroth(a)google.com> Date: Tue Dec 6 09:18:36 2016 -0700 util/abuild: Add argument -R to specify root directory cbroot was previously specified by just adding it to the end of the command line with no explicit identifier. This change allows it to go anywhere in the command line and adds the -R or --root identifier. This makes the command line more consistent. Most of the time, this argument isn't even needed, as the automatic detection finds cbroot. Change-Id: I1d6fd8f51765d0d8b29be8af1e8105e06dd44cc8 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 13c419c..65f55a0 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -16,8 +16,8 @@ #set -x # Turn echo on.... -ABUILD_DATE="Nov 23, 2016" -ABUILD_VERSION="0.10.0" +ABUILD_DATE="Dec 6, 2016" +ABUILD_VERSION="0.10.01" TOP=$PWD @@ -508,7 +508,7 @@ function remove_target function myhelp { cat << __END_OF_HELP -Usage: $0 [options] [cbroot] +Usage: $0 [options] $0 [-V|--version] $0 [-h|--help] @@ -528,6 +528,8 @@ Options:\n" [-P|--prefix <name>] File name prefix in CBFS [-q|--quiet] Print fewer messages [-r|--remove] Remove output dir after build + [-R|--root <path>] Absolute path to coreboot sources + (defaults to $ROOT) [--scan-build] Use clang's static analyzer [-s|--silent] Omit compiler calls in logs [-t|--target <vendor/board>] Attempt to build target vendor/board only @@ -541,9 +543,6 @@ Options:\n" [-y|--ccache] Use ccache [-z|--clean] Remove build results when finished - [cbroot] Absolute path to coreboot sources - (defaults to $ROOT) - [-V|--version] Print version number and exit [-h|--help] Print this help and exit @@ -588,12 +587,12 @@ getoptbrand="$(getopt -V)" # shellcheck disable=SC2086 if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@") || exit 1 + args=$(getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir:,root: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d:R: -- "$@") || exit 1 eval set -- $args retval=$? else # Detected non-GNU getopt - args=$(getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: "$@") + args=$(getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d:R: "$@") set -- $args retval=$? fi @@ -621,6 +620,7 @@ while true ; do -V|--version) shift; myversion; exit 0;; -h|--help) shift; myversion; myhelp; exit 0;; -p|--payloads) shift; payloads="$1"; shift;; + -R|--root) shift; ROOT="$1"; shift;; -c|--cpus) shift export MAKEFLAGS="-j $1" cpus=$1 @@ -773,8 +773,6 @@ build_targets() } fi -test -z "$1" || ROOT=$1 - debug "ROOT=$ROOT" junit '<?xml version="1.0" encoding="utf-8"?>'

1 0

Patch set updated for coreboot: util/abuild: Clean up usage
by Martin Roth 06 Dec '16

06 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17724 -gerrit commit f30d4f35b2a0d5c709dbf21f542dec2bf40b8258 Author: Martin Roth <martinroth(a)google.com> Date: Mon Dec 5 09:15:33 2016 -0700 util/abuild: Clean up usage - Indent with spaces for consistency - Change lbroot to cbroot - Remove incomplete list of options from usage line - Capitalize first word of all option text - Alphabetize options other than version and help - Move version and help options to the end Change-Id: Id5bd4db8d7e3705cbbb93895a46a3608cd1b09e2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 58 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index f1029ae..13c419c 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -508,42 +508,44 @@ function remove_target function myhelp { cat << __END_OF_HELP -Usage: $0 [-v] [-a] [-b] [-r] [-t <vendor/board>] [-p <dir>] [lbroot] +Usage: $0 [options] [cbroot] $0 [-V|--version] $0 [-h|--help] Options:\n" - [-v|--verbose] print more messages - [-q|--quiet] print fewer messages - [-a|--all] build previously succeeded ports as well - [-r|--remove] remove output dir after build - [-d|--dir <dir>] directory containing config files - [-t|--target <vendor/board>] attempt to build target vendor/board only - [-p|--payloads <dir>] use payloads in <dir> to build images - [-V|--version] print version number and exit - [-h|--help] print this help and exit - [-J|--junit] write JUnit formatted xml log file - (defaults to $XMLFILE) - [-T|--test] submit image(s) to automated test system - [-c|--cpus <numcpus>] build on <numcpus> at the same time - [-s|--silent] omit compiler calls in logs - [-y|--ccache] use ccache - [-C|--config] configure-only mode - [-l|--loglevel <num>] set loglevel - [-u|--update] update existing image - [-P|--prefix <name>] file name prefix in CBFS + [-a|--all] Build previously succeeded ports as well [-B|--blobs] Allow using binary files - [-z|--clean] Remove build results when finished - [-o|--outdir <path>] store build results in path - (defaults to $TARGET) + [-c|--cpus <numcpus>] Build on <numcpus> at the same time + [-C|--config] Configure-only mode + [-d|--dir <dir>] Directory containing config files + [-J|--junit] Write JUnit formatted xml log file + [-K|--kconfig <name>] Prepend file to generated Kconfig + [-l|--loglevel <num>] Set loglevel [-L|--clang] Use clang - [-K|--kconfig <name>] Prepend file to generated Kconfig + [-o|--outdir <path>] Store build results in path + (defaults to $TARGET) + [-p|--payloads <dir>] Use payloads in <dir> to build images + [-P|--prefix <name>] File name prefix in CBFS + [-q|--quiet] Print fewer messages + [-r|--remove] Remove output dir after build + [--scan-build] Use clang's static analyzer + [-s|--silent] Omit compiler calls in logs + [-t|--target <vendor/board>] Attempt to build target vendor/board only + [-T|--test] Submit image(s) to automated test system + [-u|--update] Update existing image + [-v|--verbose] Print more messages [-x|--chromeos] Build with CHROMEOS enabled Skip boards without Chrome OS support - [-X|--xmlfile <name>] set JUnit XML log file filename - [--scan-build] use clang's static analyzer - [cbroot] absolute path to coreboot sources - (defaults to $ROOT) + [-X|--xmlfile <name>] Set JUnit XML log file filename + (defaults to $XMLFILE) + [-y|--ccache] Use ccache + [-z|--clean] Remove build results when finished + + [cbroot] Absolute path to coreboot sources + (defaults to $ROOT) + + [-V|--version] Print version number and exit + [-h|--help] Print this help and exit __END_OF_HELP }

1 0

Patch set updated for coreboot: util/abuild: Don't set XGCCPATH if it's in the environment
by Martin Roth 06 Dec '16

06 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17723 -gerrit commit 1b5818b5882276f807018091a284ae4e1a4f2fe3 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 30 16:38:25 2016 -0700 util/abuild: Don't set XGCCPATH if it's in the environment Change-Id: I0fa231ca3d33300a671810e994c5be54ac10a18b Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 042a855..f1029ae 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -31,8 +31,10 @@ export KCONFIG_OVERWRITECONFIG=1 # path to payload. Should be more generic PAYLOAD=/dev/null -# path to coreboot XGCC -XGCCPATH="$(pwd)/util/crossgcc/xgcc/bin/" +# get path to coreboot XGCC if it's not already set +if [ -z "$XGCCPATH" ]; then + XGCCPATH="$TOP/util/crossgcc/xgcc/bin/" +fi # Add XGCC to the path. if [ -d "$XGCCPATH" ] && [[ ":$PATH:" != *":$XGCCPATH:"* ]]; then

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2016