summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2025-01-03 17:06:14 +0000
committerLeah Rowe <leah@libreboot.org>2025-01-03 17:08:05 +0000
commit818f3d630c268742cf046523e24c7b000e06ec69 (patch)
treecac109794b71a1bcee6cb2cb779af4317e54dcfe /include
parent432a1a5bca71dfc1b5e5f97240b84545fbe6d1fd (diff)
vendor.sh: Don't error if vcfg is unset
It should return 1 instead, in readcfg(), because this is not an error condition; vcfg not being set means that the board doesn't use vendor files, which is perfectly normal and should not yield an error. This fixes a build error under certain conditions, found during release-build testing. This bug was exposed when I fixed double quoting issues as per shellcheck tests. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rw-r--r--include/vendor.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/vendor.sh b/include/vendor.sh
index 15d4e5cb..7fc283b8 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -407,7 +407,9 @@ readcfg()
[ "$board" = "serprog_pico" ]; then
return 1
fi; boarddir="$cbcfgsdir/$board"
- eval "`setcfg "$boarddir/target.cfg"`"; chkvars vcfg tree
+ eval "`setcfg "$boarddir/target.cfg"`"
+ [ -z "$vcfg" ] && return 1
+ chkvars tree
cbdir="src/coreboot/$tree"
cbfstool="elf/cbfstool/$tree/cbfstool"