coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-14 15:29:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
this fixes a regression caused by a previous revision

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-10-20 08:03:45 +01:00
parent 54eb347a30
commit 182ee8e416
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/git.sh
+8 -5
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"
}