From ba36f26d6266ef6f980ddd9db5237db29d1c7c66 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 6 Jun 2024 02:35:36 +0100 Subject: handle build.list from config/data/, not config/ certain code checks for build.list, to skip it, for example in items() we already use config/data/grub to store grub config data that applied to all trees create these directories too: config/data/coreboot config/data/u-boot config/data/seabios move the respective build.list files in here, and also to config/data/grub now multi-tree projects contain, per directory, just the target.cfg file and the patches directory. this is much cleaner, because some of the logic can be simplified more Signed-off-by: Leah Rowe --- script/trees | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'script/trees') diff --git a/script/trees b/script/trees index 897c6ed3..d681a870 100755 --- a/script/trees +++ b/script/trees @@ -11,7 +11,7 @@ set -u -e eval "$(setvars "" xarch cfgsdir cdir config config_name xlang mode makeargs \ listfile project target target_dir targets tree _f target1 bootstrapargs \ - autoconfargs cmakedir elfdir autogenargs xtree)" + autoconfargs cmakedir elfdir autogenargs xtree datadir)" main() { @@ -34,6 +34,7 @@ main() [ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)" [ -z "$project" ] && $err "project name not specified" elfdir="elf/$project" + datadir="config/data/$project" cfgsdir="config/$project" remkdir "${tmpgit%/*}" @@ -66,7 +67,7 @@ build_targets() [ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist" - listfile="$cfgsdir/build.list" + listfile="$datadir/build.list" [ -f "$listfile" ] || $err "list file, $listfile, does not exist" # Build for all targets if no argument is given -- cgit v1.2.1