diff options
Diffstat (limited to 'script/trees')
| -rwxr-xr-x | script/trees | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/script/trees b/script/trees index 7f6f2f25..4ab0d406 100755 --- a/script/trees +++ b/script/trees @@ -10,16 +10,17 @@ set -u -e . "include/git.sh" cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" -eval `setvars "" xarch cdir config config_name xlang mode makeargs \ - listfile project target target_dir targets tree _f target1 bootstrapargs \ - autoconfargs cmakedir elfdir autogenargs xtree` +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` main() { while getopts f:b:m:u:c:x:s:l:n: option; do + [ -n "$_f" ] && $err "only one flag is permitted" _f="$1" case "$1" in - -b) : ;; + -b) mode="" ;; -u) mode="oldconfig" ;; -m) mode="menuconfig" ;; -c) mode="distclean" ;; @@ -30,10 +31,15 @@ main() -n) mode="nconfig" ;; *) $err "invalid option '-$option'" ;; esac - shift; project="${OPTARG#src/}"; shift + [ -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" @@ -44,33 +50,25 @@ main() remkdir "${tmpgit%/*}" - _cmd="build_projects" - singletree "$project" || _cmd="build_targets" - $_cmd $@ + cmd="build_targets" && singletree "$project" && cmd="build_project" + $cmd $@ [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0 [ -f "$listfile" ] || return 0 - [ -z "$mode" ] && printf "\n\nDone! Check %s/\n\n" "$elfdir"; return 0 + [ -z "$mode" ] && printf "\n\nOK! Check %s/\n\n" "$elfdir"; return 0 } -build_projects() +build_project() { - [ $# -gt 0 ] && x_ ./update trees $_f $@ - - if [ "$mode" = "fetch" ]; then - [ -f "CHANGELOG" ] && return 0 - fetch_project_repo; return 0 - fi - - load_project_config "$cfgsdir" + load_target_config "$cfgsdir" || return 0 [ -f "$listfile" ] || listfile="" # optional on single-tree dest_dir="$elfdir" [ ! -f "$listfile" ] || elfcheck || return 0 cdir="src/${project}" - [ -d "$cdir" ] || x_ ./update trees -f "$project" + x_ ./update trees -f "$project" [ "$mode" = "distclean" ] && mode="clean" run_make_command || return 0 @@ -114,47 +112,58 @@ 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" - if [ "$mode" = "fetch" ]; then - [ -f "CHANGELOG" ] && return 1 - fetch_project_trees; return 1 - fi - load_project_config "$target_dir" + [ -f "CHANGELOG" ] || fetch_project "$project" + load_target_config "$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 "Directory %s missing; skip\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() +load_target_config() { - eval `setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \ - tree_depend makeargs` - eval `setcfg "$1/target.cfg" 0`; return 0 + eval `setvars "" xarch xlang bootstrapargs autoconfargs xtree \ + tree_depend makeargs btype mkhelper` + [ -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 + eval `setvars "" rev tree` + + printf "Loading %s config: %s\n" "$project" "$_tcfg" + eval `setcfg "$_tcfg"` + [ "$cmd" = "build_project" ] && break + [ "$mode" = "fetch" ] || break + + [ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] \ + && break; _tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg" + done + + [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1 + + [ "$mode" = "fetch" ] || return 0 + [ -f "CHANGELOG" ] && return 1; fetch_${cmd#build_}; return 1 } check_cross_compiler() @@ -183,21 +192,20 @@ check_coreboot_utils() utilelfdir="elf/$util/$1" utilsrcdir="src/coreboot/$1/util/$util" - utilmode="" - [ -z "$mode" ] || utilmode="clean" + utilmode="" && [ -n "$mode" ] && utilmode="clean" x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ x_ mkdir -p "$utilelfdir" && \ x_ cp "$utilsrcdir/$util" "elf/$util/$1" [ -z "$mode" ] || x_ rm -Rf "$utilelfdir" - done + 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" @@ -207,25 +215,21 @@ elfcheck() { # TODO: very hacky check. do it properly (based on build.list) for elftest in "$dest_dir"/*; do - [ -e "$elftest" ] || continue - e "$elftest" f && return 1 - done + [ -e "$elftest" ] && e "$elftest" f && return 1 + done; return 0 } handle_makefile() { - [ "$project" = "grub" ] && [ "${mode%config}" != "$mode" ] && return 0 - check_makefile "$cdir" && x_ make clean -C "$cdir" - x_ cp "$config" "$cdir/.config" - [ -n "$mode" ] || [ "$project" = "grub" ] || make -C "$cdir" \ + 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 @@ -241,11 +245,9 @@ run_make_command() && makeargs="$makeargs $cbmakeargs" make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode" + [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper" - [ "$project" = "grub" ] && [ -z "$mode" ] && mkpayload_grub - - [ "$mode" != "clean" ] && return 0 - make -C "$cdir" distclean 2>/dev/null || : + [ "$mode" = "clean" ] && make -C "$cdir" distclean || :; return 0 } check_cmake() @@ -276,7 +278,6 @@ mkpayload_grub() { eval `setvars "" grub_modules grub_install_modules` eval `setcfg "$grubdata/module/$tree"` - chkvars "grub_install_modules" "grub_modules" x_ rm -f "$cdir/grub.elf" @@ -294,8 +295,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 $@ |