coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-24 21:54:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

vendor.sh: unified reading of board configs

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2024-06-28 13:33:50 +01:00
parent a2f4eba581
commit 473f277845
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lib.sh
+1 -1
View File
@@ -37,7 +37,7 @@ chkvars()
done done
} }
eval `setvars "" _nogit board boarddir relname versiondate projectsite \ eval `setvars "" _nogit board relname versiondate projectsite \
projectname aur_notice cfgsdir datadir version xbmk_parent` projectname aur_notice cfgsdir datadir version xbmk_parent`
for fv in projectname projectsite version versiondate; do for fv in projectname projectsite version versiondate; do
include/vendor.sh
+10 -10
View File
@@ -24,22 +24,18 @@ eval `setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 release DL_url \ CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 release DL_url \
CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE nukemode \ CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE nukemode \
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB cbfstoolref \ CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB cbfstoolref \
CONFIG_REFCODE_BLOB_FILE cbdir` CONFIG_REFCODE_BLOB_FILE cbdir boarddir`
vendor_download() vendor_download()
{ {
export PATH="$PATH:/sbin" export PATH="$PATH:/sbin"
[ $# -gt 0 ] || $err "No argument given" [ $# -gt 0 ] || $err "No argument given"
board="$1"; boarddir="$cbcfgsdir/$board" board="$1" && readcfg && getcfg && bootstrap && getfiles; return 0
getcfg && bootstrap && getfiles; return 0
} }
getcfg() getcfg()
{ {
eval `setcfg "$boarddir/target.cfg"`
chkvars vcfg tree
check_defconfig "$boarddir" 1>"$TMPDIR/vendorcfg.list" && return 1 check_defconfig "$boarddir" 1>"$TMPDIR/vendorcfg.list" && return 1
while read -r cbcfgfile; do while read -r cbcfgfile; do
set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e
@@ -269,10 +265,7 @@ check_board()
release="y" release="y"
board="$(detect_board "$archive")" board="$(detect_board "$archive")"
fi fi
readcfg
boarddir="$cbcfgsdir/$board"
eval `setcfg "$boarddir/target.cfg"`
[ -z "$tree" ] && $err "check_board $board: tree undefined"; return 0
} }
check_release() check_release()
@@ -302,6 +295,13 @@ detect_board()
printf "%s\n" "$board" printf "%s\n" "$board"
} }
readcfg()
{
boarddir="$cbcfgsdir/$board"
eval `setcfg "$boarddir/target.cfg"`
chkvars vcfg tree
}
build_dependencies_inject() build_dependencies_inject()
{ {
cbdir="src/coreboot/$tree" cbdir="src/coreboot/$tree"