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

xbmk: rename cv variables, for clarity

Browse Source 
the new names are still a bit crap, but a bit better.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-10-04 08:41:25 +01:00
parent 1943dba608
commit 2cfaba181b
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/init.sh
+2 -2
View File
@@ -30,8 +30,8 @@ xbtmp=""
python="" python=""
pyver="" pyver=""
xbmklock="" xbmklock=""
cvxbmk="" checkvarsxbmk=""
cvchk="" checkvarschk=""
is_child="" is_child=""
basetmp="" basetmp=""
include/inject.sh
+7 -7
View File
@@ -9,12 +9,12 @@ tmpromdel="$XBMK_CACHE/DO_NOT_FLASH"
nvm="util/nvmutil/nvm" nvm="util/nvmutil/nvm"
ifdtool="elf/coreboot/default/ifdtool" ifdtool="elf/coreboot/default/ifdtool"
cv="CONFIG_GBE_BIN_PATH" checkvars="CONFIG_GBE_BIN_PATH"
if [ -n "$cvxbmk" ]; then if [ -n "$checkvarsxbmk" ]; then
cv="$cv $cvxbmk" checkvars="$checkvars $checkvarsxbmk"
fi fi
if [ -n "$cvchk" ]; then if [ -n "$checkvarschk" ]; then
cv="$cv $cvchk" checkvars="$checkvars $checkvarschk"
fi fi
archive="" archive=""
@@ -27,7 +27,7 @@ tmpromdir=""
board="" board=""
xchanged="" xchanged=""
eval "`setvars "" $cv`" eval "`setvars "" $checkvars`"
inject() inject()
{ {
@@ -188,7 +188,7 @@ readkconfig()
scankconfig() scankconfig()
{ {
for cbc in $cv; do for cbc in $checkvars; do
grep "$cbc" "$1" 2>/dev/null 1>>"$xbtmp/cbcfg" || : grep "$cbc" "$1" 2>/dev/null 1>>"$xbtmp/cbcfg" || :
done done
} }
include/vendor.sh
+5 -5
View File
@@ -23,13 +23,13 @@ vendir="vendorfiles"
appdir="$vendir/app" appdir="$vendir/app"
vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
# lbmk-specific extension to the "cv" variable (not suitable for cbmk) # lbmk-specific extension to the "checkvars" variable (not suitable for cbmk)
cvchk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ checkvarschk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE CONFIG_FSP_M_FILE \ CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE CONFIG_FSP_M_FILE \
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 "checkvars" variable (not suitable for cbmk)
cvxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_FSP_FULL_FD \ checkvarsxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_FSP_FULL_FD \
CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET CONFIG_FSP_USE_REPO \ 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 \
@@ -490,7 +490,7 @@ extract_fsp()
setvfile() setvfile()
{ {
[ -n "$vcfg" ] && for c in $cvchk; do [ -n "$vcfg" ] && for c in $checkvarschk; do
vcmd="[ \"\${$c}\" = \"/dev/null\" ] || [ -z \"\${$c}\" ]" vcmd="[ \"\${$c}\" = \"/dev/null\" ] || [ -z \"\${$c}\" ]"
eval "$vcmd || return 0" eval "$vcmd || return 0"