git.sh: clean up handling of tmp_git_dir
delete it once once, and delete it much sooner, right at the start of script/update/trees main() Signed-off-by: Leah Rowe <leah@libreboot.org>9020vga
parent
d819403a0b
commit
e6953dc4f0
|
@ -5,7 +5,6 @@
|
|||
# This file is only used by update/project/trees
|
||||
|
||||
eval "$(setvars "" _target rev _xm loc url bkup_url depend patchfail)"
|
||||
tmp_git_dir="${PWD}/tmp/gitclone"
|
||||
|
||||
fetch_project_trees()
|
||||
{
|
||||
|
@ -59,7 +58,6 @@ prepare_new_tree()
|
|||
{
|
||||
printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
|
||||
|
||||
remkdir "${tmp_git_dir%/*}"
|
||||
cp -R "src/${project}/${project}" "${tmp_git_dir}" || \
|
||||
err "prepare_new_tree ${project}/${tree}: can't make tmpclone"
|
||||
git_patch "$tmp_git_dir" "$PWD/$cfgsdir/$tree/patches"
|
||||
|
@ -91,8 +89,6 @@ verify_config()
|
|||
|
||||
clone_project()
|
||||
{
|
||||
remkdir "${tmp_git_dir%/}"
|
||||
|
||||
loc="${loc#src/}"
|
||||
loc="src/${loc}"
|
||||
if [ -d "${loc}" ]; then
|
||||
|
|
|
@ -12,6 +12,7 @@ cbfstool="cbutils/default/cbfstool"
|
|||
grubcfgsdir="config/grub"
|
||||
layoutdir="/boot/grub/layouts"
|
||||
. "${grubcfgsdir}/modules.list"
|
||||
tmp_git_dir="${PWD}/tmp/gitclone"
|
||||
|
||||
eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
|
||||
CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \
|
||||
|
|
|
@ -37,6 +37,7 @@ main()
|
|||
elfdir="elf/${project}"
|
||||
cfgsdir="config/${project}"
|
||||
|
||||
remkdir "${tmp_git_dir%/*}"
|
||||
check_project
|
||||
|
||||
_cmd="build_projects"
|
||||
|
|
Loading…
Reference in New Issue