update/trees: don't run make if mode=fetch

this fixes a regression caused by a previous revision

Signed-off-by: Leah Rowe <leah@libreboot.org>
btrfsvols
Leah Rowe 2023-10-20 08:03:45 +01:00
parent 54eb347a30
commit 182ee8e416
3 changed files with 17 additions and 8 deletions

View File

@ -13,9 +13,11 @@ fetch_project_trees()
[ -d "src/${project}/${project}" ] || fetch_from_upstream
fetch_config
[ -z "${rev}" ] && err "fetch_project_trees $target: undefined rev"
[ -d "src/${project}/${tree}" ] && \
if [ -d "src/${project}/${tree}" ]; then
printf "download/%s %s (%s): exists\n" \
"${project}" "${tree}" "${_target}" 1>&2 && return 0
"${project}" "${tree}" "${_target}" 1>&2
return 0
fi
prepare_new_tree
}
@ -60,9 +62,10 @@ prepare_new_tree()
git_reset_rev "src/${project}/${tree}" "${rev}"
(
x_ cd "src/${project}/${tree}"
[ ! -f ".gitmodules" ] || \
git submodule update --init --checkout || \
err "prepare_new_tree ${project}/${tree}: can't update git modules"
if [ -f ".gitmodules" ]; then
git submodule update --init --checkout || \
err "prepare_new_tree ${project}/${tree}: !submodules"
fi
)
git_am_patches "$PWD/src/$project/$tree" "$PWD/$cfgsdir/$tree/patches"
}

View File

@ -45,7 +45,10 @@ build_projects()
{
[ $# -gt 0 ] && x_ ./update trees ${_f} ${@}
[ "${mode}" = "fetch" ] && fetch_project_repo && return 0
if [ "${mode}" = "fetch" ]; then
fetch_project_repo
return 0
fi
codedir="src/${project}"
[ -d "${codedir}" ] || x_ ./update trees -f "${project}"
@ -131,7 +134,10 @@ handle_src_tree()
romtype="normal"
target_dir="${cfgsdir}/${target}"
[ "${mode}" = "fetch" ] && fetch_project_trees && return 1
if [ "${mode}" = "fetch" ]; then
fetch_project_trees
return 1
fi
x_ mkdir -p "${elfdir}/${target}"
eval "$(setvars "" arch tree)"
@ -159,7 +165,7 @@ handle_src_tree()
[ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && return 0
# u-boot and coreboot are both compiled with coreboot's crossgcc
[ -z ${mode} ] || return 0
[ -z "${mode}" ] || return 0
check_cross_compiler
}