From 818f3d630c268742cf046523e24c7b000e06ec69 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 3 Jan 2025 17:06:14 +0000 Subject: 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 --- include/vendor.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') 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" -- cgit v1.2.1