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>audit2-merge1
parent
a61794dfca
commit
7d99786a1a
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue