coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-17 08:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

vendor.sh: remove check_vcfg()

Browse Source 
We don't need it. The vfile variable is only used in
one place, and only once, for use with setcfg.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-12 14:47:43 +01:00
parent 97d4d020d9
commit 76f81697e6
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vendor.sh
+4 -11
View File
@@ -39,8 +39,8 @@ eval "`setvars "" has_hashes EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
E6400_VGA_romname SCH5545EC_DL_url_bkup SCH5545EC_DL_hash _dest mecleaner \ E6400_VGA_romname SCH5545EC_DL_url_bkup SCH5545EC_DL_hash _dest mecleaner \
kbc1126_ec_dump MRC_refcode_cbtree _dl SCH5545EC_DL_url EC_url rom DL_url \ kbc1126_ec_dump MRC_refcode_cbtree _dl SCH5545EC_DL_url EC_url rom DL_url \
nukemode cbfstoolref FSPFD_hash _7ztest ME11bootguard ME11delta xromsize \ nukemode cbfstoolref FSPFD_hash _7ztest ME11bootguard ME11delta xromsize \
ME11version ME11sku ME11pch _me _metmp mfs TBFW_url_bkup TBFW_url vfile \ ME11version ME11sku ME11pch _me _metmp mfs TBFW_url_bkup TBFW_url cbdir \
TBFW_hash TBFW_size hashfile xchanged EC_url_bkup cbdir`" TBFW_hash TBFW_size hashfile xchanged EC_url_bkup`"
download() download()
{ {
@@ -215,22 +215,15 @@ extract_fsp()
setvfile() setvfile()
{ {
[ -n "$vcfg" ] && check_vcfg && for c in $cvchk; do [ -n "$vcfg" ] && for c in $cvchk; do
vcmd="[ \"\${$c}\" != \"/dev/null\" ] && [ -n \"\${$c}\" ]" vcmd="[ \"\${$c}\" != \"/dev/null\" ] && [ -n \"\${$c}\" ]"
eval "$vcmd && getvfile \"\$@\" && return 0" eval "$vcmd && getvfile \"\$@\" && return 0"
done && return 1; : done && return 1; :
} }
check_vcfg()
{
vfile="config/vendor/$vcfg/pkg.cfg"
[ -L "$vfile" ] && err "'$archive', '$board': $vfile is a symlink"; :
[ -f "$vfile" ] || err "'$archive', '$board': $vfile missing"; :
}
getvfile() getvfile()
{ {
eval "`setcfg "$vfile"`" eval "`setcfg "config/vendor/$vcfg/pkg.cfg" 1`"
bootstrap && [ $# -gt 0 ] && getfiles && return 0 # download bootstrap && [ $# -gt 0 ] && getfiles && return 0 # download
fx_ prep x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" fx_ prep x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
( check_vendor_hashes ) || err "$archive: Can't verify hashes"; : ( check_vendor_hashes ) || err "$archive: Can't verify hashes"; :