From c44ff5ac4768231165f0f0e56ed924e893c09f4d Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Wed, 17 Jul 2024 13:20:51 +0100
Subject: [PATCH] git.sh: don't download to src/project/project/
re-use repo/project/
this means that single- and multi-tree projects now
have a unified cached git repo location, as per the
new rules, thus saving on disk space usage.
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
include/git.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/git.sh b/include/git.sh
index 25db40b..27b79c1 100644
--- a/include/git.sh
+++ b/include/git.sh
@@ -13,7 +13,7 @@ fetch_targets()
printf "Creating %s tree %s\n" "$project" "$tree"
git_prep "$loc" "$loc" "$PWD/$configdir/$tree/patches" \
- "${loc%/*}/$tree" u; nuke "$project/$tree" "$project/$tree"
+ "src/$project/$tree" u; nuke "$project/$tree" "$project/$tree"
}
fetch_project()
@@ -37,7 +37,7 @@ fetch_project()
clone_project()
{
- loc="src/$project/$project" && singletree "$project" && loc="${loc%/*}"
+ loc="repo/$project" && singletree "$project" && loc="src/$project"
printf "Downloading project '%s' to '%s'\n" "$project" "$loc"
e "$loc" d && return 0
@@ -61,7 +61,7 @@ git_prep()
[ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \
[ "$xtree" != "$tree" ] && link_crossgcc "$_loc"
- [ "$XBMK_RELEASE" = "y" ] && [ "$_loc" != "src/$project/$project" ] \
+ [ "$XBMK_RELEASE" = "y" ] && [ "$_loc" != "repo/$project" ] \
&& rmgit "$tmpgit"
move_repo "$_loc"
--
GitLab