coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-17 18:34:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

git.sh: clean up git submodule/am handling

Browse Source 
unify all of the logic, where git am and submodule is handled

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2024-01-01 10:30:19 +00:00
parent 11a821637d
commit f4a14bd908
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/git.sh
+14 -15
View File
@@ -62,12 +62,8 @@ prepare_new_tree()
remkdir "${tmp_git_dir%/*}" remkdir "${tmp_git_dir%/*}"
cp -R "src/${project}/${project}" "${tmp_git_dir}" || \ cp -R "src/${project}/${project}" "${tmp_git_dir}" || \
err "prepare_new_tree ${project}/${tree}: can't make tmpclone" err "prepare_new_tree ${project}/${tree}: can't make tmpclone"
git_reset_rev "${tmp_git_dir}" "${rev}" git_patch "$tmp_git_dir" "$PWD/$cfgsdir/$tree/patches"
git_am_patches "${tmp_git_dir}" "$PWD/$cfgsdir/$tree/patches" || \ git_submodule_update "${tmp_git_dir}"
err "prepare_new_tree ${project}/${tree}: patch fail"
[ ! -f "${tmp_git_dir}/.gitmodules" ] || \
git -C "${tmp_git_dir}" submodule update --init --checkout \
|| err "prepare_new_tree ${project}/${tree}: !submodules"
[ "${patchfail}" = "y" ] && err "PATCH FAIL" [ "${patchfail}" = "y" ] && err "PATCH FAIL"
mv "${tmp_git_dir}" "src/${project}/${tree}" || \ mv "${tmp_git_dir}" "src/${project}/${tree}" || \
@@ -107,9 +103,7 @@ clone_project()
git clone ${url} "${tmp_git_dir}" || \ git clone ${url} "${tmp_git_dir}" || \
git clone ${bkup_url} "${tmp_git_dir}" || \ git clone ${bkup_url} "${tmp_git_dir}" || \
err "clone_project: could not download ${project}" err "clone_project: could not download ${project}"
git_reset_rev "${tmp_git_dir}" "${rev}" git_patch "${tmp_git_dir}" "${PWD}/config/${project}/patches"
git_am_patches "${tmp_git_dir}" "${PWD}/config/${project}/patches" \
|| err "clone_project ${project} ${loc}: patch fail"
[ "${patchfail}" = "y" ] && err "PATCH FAIL" [ "${patchfail}" = "y" ] && err "PATCH FAIL"
x_ rm -Rf "${loc}" x_ rm -Rf "${loc}"
@@ -118,14 +112,19 @@ clone_project()
err "clone_project: !mv ${tmp_git_dir} ${loc}" err "clone_project: !mv ${tmp_git_dir} ${loc}"
} }
git_reset_rev() git_patch()
{ {
git -C "${1}" reset --hard ${2} || err "!git reset ${1} <- ${2}" git -C "${1}" reset --hard ${rev} || err "!git reset ${1} <- ${rev}"
if [ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && \ [ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && \
[ -f "${1}/.gitmodules" ]; then git_submodule_update "${1}"
git_am_patches "$1" "$2" || err "git_patch $project: patch fail"
}
git_submodule_update()
{
[ ! -f "${1}/.gitmodules" ] || \
git -C "${1}" submodule update --init --checkout || \ git -C "${1}" submodule update --init --checkout || \
err "git_reset_rev ${1}: can't download submodules" err "git_sub ${1}: can't download submodules"; return 0
fi
} }
git_am_patches() git_am_patches()