canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git.sh: move xgcc linking to a new function 

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-05-22 18:50:42 +01:00 committed by Leah Rowe
parent 24934e6569
commit 1300f09e67
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/git.sh
View File

@ -99,15 +99,8 @@ git_prep()
prep_submodules "$_loc" prep_submodules "$_loc"
fi fi
if [ "$project" = "coreboot" ] && [ -n "$xtree" ] && \ [ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \
[ "$xtree" != "$tree" ] && [ $# -gt 2 ]; then [ "$xtree" != "$tree" ] && link_crossgcc "$_loc"
(
cd "$tmpgit/util" || $err "prep $1: !cd $tmpgit/util"
rm -Rf crossgcc || $err "prep $1: !rm xgcc"
ln -s "../../$xtree/util/crossgcc" crossgcc || \
$err "prep $1: can't create xgcc symlink"
) || $err "prep $1: can't create xgcc symlink"
fi
[ "$xbmk_release" = "y" ] && [ "$_loc" != "src/$project/$project" ] \ [ "$xbmk_release" = "y" ] && [ "$_loc" != "src/$project/$project" ] \
&& rmgit "$tmpgit" && rmgit "$tmpgit"
@ -134,6 +127,15 @@ prep_submodules()
done < "$tmpdir/modules" done < "$tmpdir/modules"
} }
link_crossgcc()
{
(
cd "$tmpgit/util" || $err "prep $1: !cd $tmpgit/util"
rm -Rf crossgcc || $err "prep $1: !rm xgcc"
ln -s "../../$xtree/util/crossgcc" crossgcc || $err "$1: !xgcc link"
) || $err "$1: !xgcc link"
}
git_am_patches() git_am_patches()
{ {
for _patch in "$2/"*; do for _patch in "$2/"*; do