diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-06 02:35:36 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-06 02:35:36 +0100 |
| commit | ba36f26d6266ef6f980ddd9db5237db29d1c7c66 (patch) | |
| tree | 3e8adc2e20967c1b361b8f2076f2893f692851b1 | |
| parent | bea089bbe4a720e39ba78850f015c67dbe3d1a43 (diff) | |
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 <leah@libreboot.org>
| -rw-r--r-- | config/data/coreboot/build.list (renamed from config/coreboot/build.list) | 0 | ||||
| -rw-r--r-- | config/data/grub/build.list (renamed from config/grub/build.list) | 0 | ||||
| -rw-r--r-- | config/data/seabios/build.list (renamed from config/seabios/build.list) | 0 | ||||
| -rw-r--r-- | config/data/u-boot/build.list (renamed from config/u-boot/build.list) | 0 | ||||
| -rwxr-xr-x | include/lib.sh | 1 | ||||
| -rwxr-xr-x | script/trees | 5 |
6 files changed, 3 insertions, 3 deletions
diff --git a/config/coreboot/build.list b/config/data/coreboot/build.list index f6535149..f6535149 100644 --- a/config/coreboot/build.list +++ b/config/data/coreboot/build.list diff --git a/config/grub/build.list b/config/data/grub/build.list index 5b891e5a..5b891e5a 100644 --- a/config/grub/build.list +++ b/config/data/grub/build.list diff --git a/config/seabios/build.list b/config/data/seabios/build.list index d6fefb4e..d6fefb4e 100644 --- a/config/seabios/build.list +++ b/config/data/seabios/build.list diff --git a/config/u-boot/build.list b/config/data/u-boot/build.list index 8d9a5cf0..8d9a5cf0 100644 --- a/config/u-boot/build.list +++ b/config/data/u-boot/build.list diff --git a/include/lib.sh b/include/lib.sh index bc2232ad..3ef3e3fe 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -122,7 +122,6 @@ items() for x in "$1/"*; do # -e used because this is for files *or* directories [ -e "$x" ] || continue - [ "${x##*/}" = "build.list" ] && continue printf "%s\n" "${x##*/}" 2>/dev/null rval=0 done 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 |