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

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
Leah Rowe 2024-01-01 12:41:43 +00:00
parent d819403a0b
commit e6953dc4f0
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/git.sh
View File

@ -5,7 +5,6 @@
# This file is only used by update/project/trees # This file is only used by update/project/trees
eval "$(setvars "" _target rev _xm loc url bkup_url depend patchfail)" eval "$(setvars "" _target rev _xm loc url bkup_url depend patchfail)"
tmp_git_dir="${PWD}/tmp/gitclone"
fetch_project_trees() fetch_project_trees()
{ {
@ -59,7 +58,6 @@ prepare_new_tree()
{ {
printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target" printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
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_patch "$tmp_git_dir" "$PWD/$cfgsdir/$tree/patches" git_patch "$tmp_git_dir" "$PWD/$cfgsdir/$tree/patches"
@ -91,8 +89,6 @@ verify_config()
clone_project() clone_project()
{ {
remkdir "${tmp_git_dir%/}"
loc="${loc#src/}" loc="${loc#src/}"
loc="src/${loc}" loc="src/${loc}"
if [ -d "${loc}" ]; then if [ -d "${loc}" ]; then

1
include/option.sh
View File

@ -12,6 +12,7 @@ cbfstool="cbutils/default/cbfstool"
grubcfgsdir="config/grub" grubcfgsdir="config/grub"
layoutdir="/boot/grub/layouts" layoutdir="/boot/grub/layouts"
. "${grubcfgsdir}/modules.list" . "${grubcfgsdir}/modules.list"
tmp_git_dir="${PWD}/tmp/gitclone"
eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \ CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \

1
script/update/trees
View File

@ -37,6 +37,7 @@ main()
elfdir="elf/${project}" elfdir="elf/${project}"
cfgsdir="config/${project}" cfgsdir="config/${project}"
remkdir "${tmp_git_dir%/*}"
check_project check_project
_cmd="build_projects" _cmd="build_projects"