libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

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>
20241206_branch
Leah Rowe 2025-01-03 17:06:14 +00:00
parent 432a1a5bca
commit 818f3d630c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vendor.sh
View File

@ -407,7 +407,9 @@ readcfg()
[ "$board" = "serprog_pico" ]; then [ "$board" = "serprog_pico" ]; then
return 1 return 1
fi; boarddir="$cbcfgsdir/$board" 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" cbdir="src/coreboot/$tree"
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/cbfstool/$tree/cbfstool"