mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-22 05:00:08 +02:00
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>
This commit is contained in:
+8
-5
@@ -13,9 +13,11 @@ fetch_project_trees()
|
|||||||
[ -d "src/${project}/${project}" ] || fetch_from_upstream
|
[ -d "src/${project}/${project}" ] || fetch_from_upstream
|
||||||
fetch_config
|
fetch_config
|
||||||
[ -z "${rev}" ] && err "fetch_project_trees $target: undefined rev"
|
[ -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" \
|
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
|
prepare_new_tree
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,9 +62,10 @@ prepare_new_tree()
|
|||||||
git_reset_rev "src/${project}/${tree}" "${rev}"
|
git_reset_rev "src/${project}/${tree}" "${rev}"
|
||||||
(
|
(
|
||||||
x_ cd "src/${project}/${tree}"
|
x_ cd "src/${project}/${tree}"
|
||||||
[ ! -f ".gitmodules" ] || \
|
if [ -f ".gitmodules" ]; then
|
||||||
git submodule update --init --checkout || \
|
git submodule update --init --checkout || \
|
||||||
err "prepare_new_tree ${project}/${tree}: can't update git modules"
|
err "prepare_new_tree ${project}/${tree}: !submodules"
|
||||||
|
fi
|
||||||
)
|
)
|
||||||
git_am_patches "$PWD/src/$project/$tree" "$PWD/$cfgsdir/$tree/patches"
|
git_am_patches "$PWD/src/$project/$tree" "$PWD/$cfgsdir/$tree/patches"
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-3
@@ -45,7 +45,10 @@ build_projects()
|
|||||||
{
|
{
|
||||||
[ $# -gt 0 ] && x_ ./update trees ${_f} ${@}
|
[ $# -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}"
|
codedir="src/${project}"
|
||||||
[ -d "${codedir}" ] || x_ ./update trees -f "${project}"
|
[ -d "${codedir}" ] || x_ ./update trees -f "${project}"
|
||||||
@@ -131,7 +134,10 @@ handle_src_tree()
|
|||||||
romtype="normal"
|
romtype="normal"
|
||||||
target_dir="${cfgsdir}/${target}"
|
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}"
|
x_ mkdir -p "${elfdir}/${target}"
|
||||||
eval "$(setvars "" arch tree)"
|
eval "$(setvars "" arch tree)"
|
||||||
@@ -159,7 +165,7 @@ handle_src_tree()
|
|||||||
[ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && return 0
|
[ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && return 0
|
||||||
|
|
||||||
# u-boot and coreboot are both compiled with coreboot's crossgcc
|
# u-boot and coreboot are both compiled with coreboot's crossgcc
|
||||||
[ -z ${mode} ] || return 0
|
[ -z "${mode}" ] || return 0
|
||||||
check_cross_compiler
|
check_cross_compiler
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user