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

git.sh: simplify prep_submodules() 

copying the module list into tmpdir/ no longer makes sense,
because it was only done before when we supported either
running the list from "git submodule update", or module.list.

since we only support handling of module.list, we can
greatly simplify this function.

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-06-07 16:21:43 +01:00 committed by Leah Rowe
parent 7c8173ebd4
commit 7ac2264f53
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/git.sh
View File

@ -106,13 +106,9 @@ prep_submodules()
mdir="$PWD/config/submodule/$project"
[ -n "$tree" ] && mdir="$mdir/$tree"
[ -f "$mdir/module.list" ] || return 0
cat "$mdir/module.list" > "$tmpdir/modules" || \
$err "!cp $mdir/module.list $tmpdir/modules"
while read -r msrcdir; do
[ -f "$mdir/module.list" ] && while read -r msrcdir; do
fetch_submodule "$msrcdir"
done < "$tmpdir/modules"
done < "$mdir/module.list"; return 0
}
fetch_submodule()
@ -128,6 +124,7 @@ fetch_submodule()
done
rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'"
tmpclone "$subrepo" "$subrepo_bkup" "$tmpdir/$1" "$subrev" \
"$mdir/${1##*/}/patches"
}