lbmk scripts: general code cleanup

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-12-22 13:05:32 +00:00
parent b111f4840a
commit b0e5fc9d9c
6 changed files with 79 additions and 115 deletions
+5 -11
View File
@@ -120,32 +120,26 @@ clone_project()
git_reset_rev()
{
(
cd "${1}" || err "git_reset_rev: !cd ${1}"
git reset --hard ${2} || err "!git reset ${1} <- ${2}"
git -C "${1}" reset --hard ${2} || err "!git reset ${1} <- ${2}"
if [ "${project}" != "coreboot" ] && [ "${project}" != "u-boot" ] && \
[ -f ".gitmodules" ]; then
git submodule update --init --checkout || \
[ -f "${1}/.gitmodules" ]; then
git -C "${1}" submodule update --init --checkout || \
err "git_reset_rev ${1}: can't download submodules"
fi
) || err "git reset fail"
}
git_am_patches()
{
sdir="${1}" # assumed to be absolute path
patchdir="${2}" # ditto
(
cd "${sdir}" || err "git_am_patches: !cd ${sdir}"
for patch in "${patchdir}/"*; do
[ -L "${patch}" ] && continue
[ -f "${patch}" ] || continue
git am "${patch}" || patchfail="y"
git -C "${sdir}" am "${patch}" || patchfail="y"
[ "${patchfail}" != "y" ] && continue
git am --abort || err "${sdir}: !git am --abort"
git -C "${sdir}" am --abort || err "${sdir}: !git am --abort"
err "!git am ${patch} -> ${sdir}"
done
) || err "PATCH FAILURE"
for patches in "${patchdir}/"*; do
[ -L "${patches}" ] && continue
[ ! -d "${patches}" ] && continue
+1 -2
View File
@@ -58,9 +58,8 @@ EOF
check_defconfig()
{
for x in "${1}"/config/*; do
[ -f "${x}" ] && return 0
[ -f "${x}" ] && return 1
done
return 1
}
handle_coreboot_utils()