From bea089bbe4a720e39ba78850f015c67dbe3d1a43 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 6 Jun 2024 01:01:22 +0100 Subject: don't use build.list to detect multi-tree projects instead, check for the presence of target.cfg files not in config/project/ but config/project/tree/ the way this check is done, it merely returns 1 if config/project/*/target.cfg is detected, and returns 0 in all other cases, even if config/project/target.cfg exists that way, if the maintainer accidentally adds a target.cfg in the main directory, the given multi-tree project will not break Signed-off-by: Leah Rowe --- build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'build') diff --git a/build b/build index 748ff4f0..74ea1de6 100755 --- a/build +++ b/build @@ -117,10 +117,7 @@ fetch_trees() { for x in $(items config/git); do ./update trees -f "$x" || $err "$_xm: fetch $x" - done - for x in config/*/build.list; do - [ -f "$x" ] && xp="${x#*/}" && xp="${xp%/*}" - [ ! -f "$x" ] || [ -L "$xp" ] || x_ rm -Rf "src/$xp/$xp" + singletree "$x" || x_ rm -Rf "src/$x/$x" done rmgit . } -- cgit v1.2.1