From 0dd0dfaf3db5082f0256ec376180eb8b4eaab1c3 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 29 May 2024 00:48:18 +0100 Subject: vendor.sh: don't error on main targets e.g. coreboot/default contains no config directory, so the old logic would be trying to do: . which is obviously invalid now for example: $ ./vendor download default Vendor files not needed for: default and it will exit with zero status the only thing that should ever return non-zero status is when you define a target that does not exist, config or no. Signed-off-by: Leah Rowe --- include/vendor.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/vendor.sh b/include/vendor.sh index 9c3e294e..96631618 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -46,7 +46,10 @@ vendor_download() detect_firmware() { [ -d "$boarddir" ] || $err "Target '$board' not defined." - . "$(check_defconfig "$boarddir")" 2>/dev/null || exit 0 + check_defconfig "$boarddir" 1>"$tmpdir/vendorcfg.list" && return 0 + while read -r cbcfgfile; do + . "$cbcfgfile" 2>/dev/null + done < "$tmpdir/vendorcfg.list" . "$boarddir/target.cfg" 2>/dev/null [ -z "$tree" ] && $err "detect_firmware $boarddir: tree undefined" -- cgit v1.2.1