Skip to content

Commit b73fc6c

Browse files
krystian-hebeltlaurion
authored andcommitted
Makefile: fix for multiple coreboot CI builds
Another approach at linuxboot#1449 Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
1 parent 0db1be0 commit b73fc6c

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,16 @@ define define_module =
305305
elif [ "$$$$(cat "$$@")" != '$($1_repo)|$($1_commit_hash)' ]; then \
306306
echo "Switching $1 to $($1_repo) at $($1_commit_hash)" && \
307307
git -C "$(build)/$($1_base_dir)" reset --hard HEAD^ && \
308-
git -C "$(build)/$($1_base_dir)" remote set-url origin $($1_repo) && \
309-
git -C "$(build)/$($1_base_dir)" checkout origin > /dev/null 2>&1 && \
308+
echo "git fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no" && \
309+
git -C "$(build)/$($1_base_dir)" fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no && \
310+
echo "git reset --hard $($1_commit_hash)" && \
310311
git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash) && \
312+
echo "git clean" && \
311313
git -C "$(build)/$($1_base_dir)" clean -df && \
312314
git -C "$(build)/$($1_base_dir)" clean -dffx payloads util/cbmem && \
315+
echo "git submodule sync" && \
313316
git -C "$(build)/$($1_base_dir)" submodule sync && \
317+
echo "git submodule update" && \
314318
git -C "$(build)/$($1_base_dir)" submodule update --init --checkout && \
315319
echo -n '$($1_repo)|$($1_commit_hash)' > "$$@"; \
316320
fi

0 commit comments

Comments
 (0)