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

general cleanup in get.sh and vendor.sh

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-26 01:30:33 +01:00
parent 18dacd4c22
commit 09b6e91803
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/get.sh
+5 -5
View File
@@ -46,7 +46,7 @@ git_prep()
_loc="$4" # $1 and $2 are gitrepo and gitrepo_backup _loc="$4" # $1 and $2 are gitrepo and gitrepo_backup
chkvars rev chkvars rev
xbmkget git "$1" "$2" "$tmpgit" "$rev" "$_patchdir" xbget git "$1" "$2" "$tmpgit" "$rev" "$_patchdir"
if singletree "$project" || [ $# -gt 4 ]; then if singletree "$project" || [ $# -gt 4 ]; then
dx_ fetch_submodule "$mdir/module.list" dx_ fetch_submodule "$mdir/module.list"
fi fi
@@ -71,19 +71,19 @@ fetch_submodule()
chkvars "sub${st}" "sub${st}_bkup" "subhash" chkvars "sub${st}" "sub${st}_bkup" "subhash"
[ "$st" = "git" ] && x_ rm -Rf "$tmpgit/$1" [ "$st" = "git" ] && x_ rm -Rf "$tmpgit/$1"
eval xbmkget "$st" "\$sub$st" "\$sub${st}_bkup" "$tmpgit/$1" \ eval xbget "$st" "\$sub$st" "\$sub${st}_bkup" "$tmpgit/$1" \
"$subhash" "$mdir/${1##*/}/patches" "$subhash" "$mdir/${1##*/}/patches"
} }
xbmkget() xbget()
{ {
[ "$1" = "curl" ] || [ "$1" = "copy" ] || [ "$1" = "git" ] || \ [ "$1" = "curl" ] || [ "$1" = "copy" ] || [ "$1" = "git" ] || \
err "Bad dlop (arg 1): xbmkget $*" err "Bad dlop (arg 1): xbget $*"
echk="f" && [ "$1" = "git" ] && echk="d" echk="f" && [ "$1" = "git" ] && echk="d"
for url in "$2" "$3"; do for url in "$2" "$3"; do
[ -n "$url" ] || err "empty URL given in: xbmkget $*" [ -n "$url" ] || err "empty URL given in: xbget $*"
try_file "$url" "$@" || continue try_file "$url" "$@" || continue
eval "[ -$echk \"$4\" ] || continue" eval "[ -$echk \"$4\" ] || continue"
return 0 # successful download/copy return 0 # successful download/copy
include/vendor.sh
+8 -13
View File
@@ -26,12 +26,11 @@ cvchk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
CONFIG_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2" CONFIG_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2"
# lbmk-specific extensions to the "cv" variable (not suitable for cbmk) # lbmk-specific extensions to the "cv" variable (not suitable for cbmk)
cvxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE \ cvxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_FSP_FULL_FD \
CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET \ CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET CONFIG_FSP_USE_REPO \
CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 CONFIG_FSP_S_CBFS \ CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 CONFIG_FSP_S_CBFS \
CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH \ CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH \
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS \ CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS"
CONFIG_FSP_USE_REPO CONFIG_FSP_FULL_FD"
# lbmk-specific extensions; mostly used for downloading vendor files # lbmk-specific extensions; mostly used for downloading vendor files
eval "`setvars "" has_hashes EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \ eval "`setvars "" has_hashes EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
@@ -54,17 +53,14 @@ download()
getfiles() getfiles()
{ {
[ -z "$CONFIG_HAVE_ME_BIN" ] || fetch intel_me "$DL_url" \ [ -z "$CONFIG_HAVE_ME_BIN" ] || fetch intel_me "$DL_url" \
"$DL_url_bkup" "$DL_hash" "$CONFIG_ME_BIN_PATH" "curl" \ "$DL_url_bkup" "$DL_hash" "$CONFIG_ME_BIN_PATH" curl "$ME_bin_hash"
"$ME_bin_hash"
[ -z "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" ] || fetch sch5545ec \ [ -z "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" ] || fetch sch5545ec \
"$SCH5545EC_DL_url" "$SCH5545EC_DL_url_bkup" "$SCH5545EC_DL_hash" \ "$SCH5545EC_DL_url" "$SCH5545EC_DL_url_bkup" "$SCH5545EC_DL_hash" \
"$CONFIG_SMSC_SCH5545_EC_FW_FILE" "curl" "$SCH5545EC_bin_hash" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" "curl" "$SCH5545EC_bin_hash"
[ -z "$CONFIG_KBC1126_FW1" ] || fetch kbc1126ec "$EC_url" \ [ -z "$CONFIG_KBC1126_FW1" ] || fetch kbc1126ec "$EC_url" \
"$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW1" "curl" \ "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW1" curl "$EC_FW1_hash"
"$EC_FW1_hash"
[ -z "$CONFIG_KBC1126_FW2" ] || fetch kbc1126ec "$EC_url" \ [ -z "$CONFIG_KBC1126_FW2" ] || fetch kbc1126ec "$EC_url" \
"$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW2" "curl" \ "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW2" curl "$EC_FW2_hash"
"$EC_FW2_hash"
[ -z "$CONFIG_VGA_BIOS_FILE" ] || fetch e6400vga "$E6400_VGA_DL_url" \ [ -z "$CONFIG_VGA_BIOS_FILE" ] || fetch e6400vga "$E6400_VGA_DL_url" \
"$E6400_VGA_DL_url_bkup" "$E6400_VGA_DL_hash" \ "$E6400_VGA_DL_url_bkup" "$E6400_VGA_DL_hash" \
"$CONFIG_VGA_BIOS_FILE" "curl" "$E6400_VGA_bin_hash" "$CONFIG_VGA_BIOS_FILE" "curl" "$E6400_VGA_bin_hash"
@@ -111,12 +107,11 @@ fetch()
done; : done; :
# download the file (from the internet) to extract from # download the file (from the internet) to extract from
xbmkget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum" xbget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum"
x_ rm -Rf "${_dl}_extracted" x_ rm -Rf "${_dl}_extracted"
# skip extraction if a cached extracted file exists # skip extraction if a cached extracted file exists
( xbmkget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) \ ( xbget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) || :
|| :
[ -f "$_dest" ] && return 0 [ -f "$_dest" ] && return 0
x_ mkdir -p "${_dest%/*}" x_ mkdir -p "${_dest%/*}"