From 62ec3dac07584d6ab8e7f86587e730b3d159e8ef Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 5 May 2025 15:31:33 +0100 Subject: git.sh: move singletree() to lib.sh it's also used by mk, to determine which build function to use (build_project or build_targets). Signed-off-by: Leah Rowe --- include/git.sh | 9 --------- include/lib.sh | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/git.sh b/include/git.sh index ded12625..7995df06 100644 --- a/include/git.sh +++ b/include/git.sh @@ -66,15 +66,6 @@ git_prep() mv "$tmpgit" "$_loc" || err "git_prep: !mv $tmpgit $_loc" } -# return 0 if project is single-tree, otherwise 1 -# e.g. coreboot is multi-tree, so 1 -singletree() -{ - for targetfile in "config/${1}/"*/target.cfg; do - [ -e "$targetfile" ] && [ -f "$targetfile" ] && return 1; : - done; : -} - fetch_submodule() { mcfgdir="$mdir/${1##*/}"; eval \ diff --git a/include/lib.sh b/include/lib.sh index 43b1a318..1830356e 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -144,6 +144,15 @@ chkvars() done; : } +# return 0 if project is single-tree, otherwise 1 +# e.g. coreboot is multi-tree, so 1 +singletree() +{ + for targetfile in "config/${1}/"*/target.cfg; do + [ -e "$targetfile" ] && [ -f "$targetfile" ] && return 1; : + done; : +} + fe_() { find_ex "x_" "$@" -- cgit v1.2.1