summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-09-25 12:46:54 +0100
committerLeah Rowe <leah@libreboot.org>2023-09-25 12:46:54 +0100
commit36b7f01a8a1bf2d31f3163d64a96aa49a98d0d62 (patch)
tree3e4f1e425400df09028e2e980cdb202c077c5063 /script
parent81d073d5a193f2a07ca8efbb1a337a69c1c6d778 (diff)
only update git submodules in project/trees
do not update them in project/repos - despite what the previous commit message says, this behaviour is error prone and should be avoided. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
-rwxr-xr-xscript/update/project/trees7
1 files changed, 7 insertions, 0 deletions
diff --git a/script/update/project/trees b/script/update/project/trees
index af8e4ed0..084ef1e3 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -146,6 +146,13 @@ prepare_new_tree()
git_reset_rev "${project}/${tree}" "${rev}" "err" || \
err "prepare_new_trees ${project}/${tree}: cannot reset <- ${rev}"
+ (
+ cd "${project}/${tree}" || \
+ err "prepare_new_tree: !cd \"${project}/${tree}\""
+ git submodule update --init --checkout || \
+ err "prepare_new_tree ${project}/${tree}: can't update git modules"
+ )
+
git_am_patches "${PWD}/${project}/${tree}" \
"${PWD}/${cfgsdir}/${tree}/patches" "err" || \
err "prepare_new_trees ${project}/${tree}: cannot apply patches"