libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

git.sh: fix regression: patches before submodulse 

there isn't really a problem right now, but a desired
and implemented behavioural change was that patches are
to be applied *before* updating submodules. well, the
previous commit reversed this change, under certain
conditions, such that submodules were applied first.
this patch fixes it, so that patches are done first.

Signed-off-by: Leah Rowe <leah@libreboot.org>
9020vga
Leah Rowe 2024-01-01 11:06:06 +00:00
parent f4a14bd908
commit d819403a0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/git.sh
View File

@ -115,9 +115,9 @@ clone_project()
git_patch() git_patch()
{ {
git -C "${1}" reset --hard ${rev} || err "!git reset ${1} <- ${rev}" git -C "${1}" reset --hard ${rev} || err "!git reset ${1} <- ${rev}"
[ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && \
git_submodule_update "${1}"
git_am_patches "$1" "$2" || err "git_patch $project: patch fail" git_am_patches "$1" "$2" || err "git_patch $project: patch fail"
[ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && \
git_submodule_update "${1}"; return 0
} }
git_submodule_update() git_submodule_update()