summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-05-29 00:48:18 +0100
committerLeah Rowe <leah@libreboot.org>2024-05-29 00:48:18 +0100
commit0dd0dfaf3db5082f0256ec376180eb8b4eaab1c3 (patch)
tree8e7bc3e9dc36a21c6eb73ef84165b06627eda48b /include
parenta4bd49ded63ecfcda811bfbeb9a605a4253ec3e3 (diff)
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 <leah@libreboot.org>
Diffstat (limited to 'include')
-rwxr-xr-xinclude/vendor.sh5
1 files changed, 4 insertions, 1 deletions
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"