Skip to content

Commit 6d08031

Browse files
krystian-hebeldaringer
authored andcommitted
Makefile: fix for multiple coreboot CI builds
Another approach at #1449 Signed-off-by: Krystian Hebel <[email protected]>
1 parent fe71f1c commit 6d08031

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,16 @@ define define_module =
303303
elif [ "$$$$(cat "$$@")" != '$($1_repo)|$($1_commit_hash)' ]; then \
304304
echo "Switching $1 to $($1_repo) at $($1_commit_hash)" && \
305305
git -C "$(build)/$($1_base_dir)" reset --hard HEAD^ && \
306-
git -C "$(build)/$($1_base_dir)" remote set-url origin $($1_repo) && \
307-
git -C "$(build)/$($1_base_dir)" checkout origin > /dev/null 2>&1 && \
306+
echo "git fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no" && \
307+
git -C "$(build)/$($1_base_dir)" fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no && \
308+
echo "git reset --hard $($1_commit_hash)" && \
308309
git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash) && \
310+
echo "git clean" && \
309311
git -C "$(build)/$($1_base_dir)" clean -df && \
310312
git -C "$(build)/$($1_base_dir)" clean -dffx payloads util/cbmem && \
313+
echo "git submodule sync" && \
311314
git -C "$(build)/$($1_base_dir)" submodule sync && \
315+
echo "git submodule update" && \
312316
git -C "$(build)/$($1_base_dir)" submodule update --init --checkout && \
313317
echo -n '$($1_repo)|$($1_commit_hash)' > "$$@"; \
314318
fi

0 commit comments

Comments
 (0)