diff options
Diffstat (limited to 'script/trees')
| -rwxr-xr-x | script/trees | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/script/trees b/script/trees index b5cf13f0..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 config cmakedir xlang mode makeargs elfdir xtree \ - project target target_dir targets tree _f target1 bootstrapargs mkhelper \ - autoconfargs config_name listfile autogenargs btype cmd` +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 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_project_config "$cfgsdir" || return 0 + configure_project "$cfgsdir" || return 0 [ -f "$listfile" ] || listfile="" # optional on single-tree dest_dir="$elfdir" @@ -108,48 +111,43 @@ handle_defconfig() for y in "$target_dir/config"/*; do [ -f "$y" ] || continue - config="$y" - config_name="${config#"$target_dir/config/"}" + defconfig="$y" - [ -n "$mode" ] || check_config || continue + [ -n "$mode" ] || check_defconfig || continue handle_makefile [ -n "$mode" ] || copy_elf - done + done; return 0 } handle_src_tree() { target_dir="$cfgsdir/$target" - load_project_config "$target_dir" || return 1 + [ -f "CHANGELOG" ] || fetch_project "$project" + configure_project "$target_dir" || return 1 x_ mkdir -p "$elfdir/$target" chkvars tree cdir="src/$project/$tree" - if [ ! -d "$cdir" ]; then - if [ "$mode" = "distclean" ] || \ - [ "$mode" = "crossgcc-clean" ]; then - printf "Dir '%s' missing; skip clean\n" "$cdir" 1>&2 - return 1 - fi - x_ ./update trees -f "$project" "$target" + if [ "$mode" = "distclean" ] || [ "$mode" = "crossgcc-clean" ]; then + [ -d "$cdir" ] || return 1 fi + x_ ./update trees -f "$project" "$target" [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0 [ -z "$mode" ] && check_cross_compiler; return 0 } -load_project_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 - # target.cfg optional on single-tree so return if missing. - # target.cfg mandatory on multi-tree so err if missing. eval `setvars "" rev tree` printf "Loading %s config: %s\n" "$project" "$_tcfg" @@ -163,6 +161,14 @@ load_project_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 } @@ -181,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 } @@ -194,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" @@ -202,11 +208,11 @@ check_coreboot_utils() done; return 0 } -check_config() +check_defconfig() { - [ -f "$config" ] || $err "check_config $project/$target: no config" + [ -f "$defconfig" ] || $err "$project/$target: missing defconfig" - dest_dir="$elfdir/$target/$config_name" + dest_dir="$elfdir/$target/${defconfig#"$target_dir/config/"}" elfcheck || return 1 # skip build if a previous one exists x_ mkdir -p "$dest_dir" @@ -223,15 +229,14 @@ elfcheck() handle_makefile() { check_makefile "$cdir" && x_ make clean -C "$cdir" - x_ cp "$config" "$cdir/.config" + x_ cp "$defconfig" "$cdir/.config" [ -n "$mode" ] || [ -n "$btype" ] || make -C "$cdir" \ silentoldconfig || make -C "$cdir" oldconfig || : run_make_command || $err "handle_makefile $cdir: no makefile!" - _copy=".config" - [ "$mode" = "savedefconfig" ] && _copy="defconfig" - [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$config" + _copy=".config" && [ "$mode" = "savedefconfig" ] && _copy="defconfig" + [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$defconfig" [ -e "$cdir/.git" ] && [ "$project" = "u-boot" ] && \ [ "$mode" = "distclean" ] && x_ git -C "$cdir" clean -fdx; return 0 @@ -243,16 +248,12 @@ 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" - [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || \ - $err "$cdir: helper command failed: $mkhelper" # eg mkpayload_grub - - [ "$mode" != "clean" ] && return 0 - make -C "$cdir" distclean 2>/dev/null || : + [ "$mode" = "clean" ] && make -C "$cdir" distclean || :; return 0 } check_cmake() @@ -300,8 +301,7 @@ copy_elf() { [ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do [ -f "$cdir/$f" ] && x_ cp "$cdir/$f" "$dest_dir" - done < "$listfile" - x_ make clean -C "$cdir" + done < "$listfile"; x_ make clean -C "$cdir" } main $@ |