diff options
Diffstat (limited to 'script/trees')
| -rwxr-xr-x | script/trees | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/script/trees b/script/trees index 2b7dfaf0..ab321869 100755 --- a/script/trees +++ b/script/trees @@ -9,10 +9,9 @@ set -u -e . "include/lib.sh" . "include/git.sh" -cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f target1 bootstrapargs mkhelper \ - autoconfargs listfile autogenargs btype tree rev tree_depend` + autoconfargs listfile autogenargs btype tree rev tree_depend build_depend` main() { @@ -31,11 +30,15 @@ main() -n) mode="nconfig" ;; *) $err "invalid option '-$option'" ;; esac - [ -n "${OPTARG+x}" ] || $err "OPTARG not set" + [ -z "${OPTARG+x}" ] && shift 1 && break project="${OPTARG#src/}"; shift 2 done [ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)" - [ -z "$project" ] && $err "project name not specified" + [ -z "$project" ] && for p in $(ls -1 config/git); do + ./update trees $_f "$p" || $err "!./update trees $_f $p" + [ "$XBMK_RELEASE" != "y" ] || singletree "$p" || \ + x_ rm -Rf "src/$p/$p"; continue + done && return 0 [ -f "config/git/$project/pkg.cfg" ] || $err "'$project' not defined" @@ -57,7 +60,7 @@ main() build_project() { - load_target_config "$cfgsdir" || return 0 + configure_project "$cfgsdir" || return 0 [ -f "$listfile" ] || listfile="" # optional on single-tree dest_dir="$elfdir" @@ -121,7 +124,7 @@ handle_src_tree() target_dir="$cfgsdir/$target" [ -f "CHANGELOG" ] || fetch_project "$project" - load_target_config "$target_dir" || return 1 + configure_project "$target_dir" || return 1 x_ mkdir -p "$elfdir/$target" chkvars tree @@ -136,11 +139,12 @@ handle_src_tree() [ -z "$mode" ] && check_cross_compiler; return 0 } -load_target_config() +configure_project() { eval `setvars "" xarch xlang bootstrapargs autoconfargs xtree \ - tree_depend makeargs btype mkhelper` + tree_depend makeargs btype mkhelper build_depend` [ -f "$1/target.cfg" ] || btype="auto" + [ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"` _tcfg="$1/target.cfg" while [ -f "$_tcfg" ] || [ "$cmd" = "build_targets" ]; do @@ -157,6 +161,14 @@ load_target_config() [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1 + [ -z "$mode" ] && for bd in $build_depend; do + bd_project="${bd%%/*}"; bd_tree="${bd##*/}" + [ -z "$bd_project" ] && $err "$project/$tree: bad bd: '$bd'" + [ "${bd##*/}" = "$bd" ] && bd_tree="" + [ -z "$bd_project" ] || ./update trees -b $bd_project \ + $bd_tree || $err "$project/$tree: !bd $bd"; continue + done + [ "$mode" = "fetch" ] || return 0 [ -f "CHANGELOG" ] && return 1; fetch_${cmd#build_}; return 1 } @@ -175,9 +187,9 @@ check_cross_compiler() [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" # sometimes buildgcc fails for like no reason. try twice. - make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ - make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ - $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$cbmakeargs'" + make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ + make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ + $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$makeargs'" done; return 0 } @@ -188,7 +200,7 @@ check_coreboot_utils() utilsrcdir="src/coreboot/$1/util/$util" utilmode="" && [ -n "$mode" ] && utilmode="clean" - x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs + x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $makeargs [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ x_ mkdir -p "$utilelfdir" && \ x_ cp "$utilsrcdir/$util" "elf/$util/$1" @@ -236,8 +248,7 @@ run_make_command() check_makefile "$cdir" || return 1 [ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \ - printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \ - && makeargs="$makeargs $cbmakeargs" + printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode" [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper" |