summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-12-30 16:46:49 +0000
committerLeah Rowe <leah@libreboot.org>2023-12-30 16:46:49 +0000
commit30337b8fa5d1ab909a158924187c3f02d1fc501c (patch)
tree4c495e4bf8a584164d48eaf519d9c5277df9a573
parentb06155810406513123130e5e2046151a5b6ae890 (diff)
update/trees: avoid namespace clash in function
the logic of the previous commit was correct, but one of the functions was named the same as another function used in this file, causing a namespace conflict, and a build error Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xscript/update/trees8
1 files changed, 4 insertions, 4 deletions
diff --git a/script/update/trees b/script/update/trees
index 1c309894..6f4786d9 100755
--- a/script/update/trees
+++ b/script/update/trees
@@ -49,7 +49,7 @@ build_projects()
[ $# -gt 0 ] && x_ ./update trees $_f $@
[ "$mode" = "fetch" ] && eval "fetch_project_repo; return 0;"
- load_target_config "$cfgsdir"
+ load_project_config "$cfgsdir"
codedir="src/${project}"
[ -d "$codedir" ] || x_ ./update trees -f "$project"
@@ -130,7 +130,7 @@ handle_src_tree()
target_dir="${cfgsdir}/${target}"
[ "$mode" = "fetch" ] && eval "fetch_project_trees; return 1;"
- load_target_config "$target_dir"
+ load_project_config "$target_dir"
x_ mkdir -p "${elfdir}/${target}"
@@ -152,13 +152,13 @@ handle_src_tree()
[ -z "$mode" ] && check_cross_compiler; return 0
}
-load_target_config()
+load_project_config()
{
eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs)"
[ -f "${1}/target.cfg" ] || return 0
. "${1}/target.cfg" || \
- err "load_target_config ${1}: cannot load target.cfg"; return 0
+ err "load_project_config ${1}: cannot load target.cfg"; return 0
}
check_cross_compiler()