diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-10-04 08:41:25 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-10-04 08:41:25 +0100 |
| commit | 2cfaba181b3c68761871fa47b32725c934423c14 (patch) | |
| tree | 3e7b9bd4f6e5d8df394ba9772da50c1d09717564 | |
| parent | 1943dba60836abc9446df64dbc3aac881dfdd285 (diff) | |
xbmk: rename cv variables, for clarity
the new names are still a bit crap, but a bit better.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/init.sh | 4 | ||||
| -rw-r--r-- | include/inject.sh | 14 | ||||
| -rw-r--r-- | include/vendor.sh | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/include/init.sh b/include/init.sh index 03e33e74..0fd758c2 100644 --- a/include/init.sh +++ b/include/init.sh @@ -30,8 +30,8 @@ xbtmp="" python="" pyver="" xbmklock="" -cvxbmk="" -cvchk="" +checkvarsxbmk="" +checkvarschk="" is_child="" basetmp="" diff --git a/include/inject.sh b/include/inject.sh index 19a2716e..90528ac0 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -9,12 +9,12 @@ tmpromdel="$XBMK_CACHE/DO_NOT_FLASH" nvm="util/nvmutil/nvm" ifdtool="elf/coreboot/default/ifdtool" -cv="CONFIG_GBE_BIN_PATH" -if [ -n "$cvxbmk" ]; then - cv="$cv $cvxbmk" +checkvars="CONFIG_GBE_BIN_PATH" +if [ -n "$checkvarsxbmk" ]; then + checkvars="$checkvars $checkvarsxbmk" fi -if [ -n "$cvchk" ]; then - cv="$cv $cvchk" +if [ -n "$checkvarschk" ]; then + checkvars="$checkvars $checkvarschk" fi archive="" @@ -27,7 +27,7 @@ tmpromdir="" board="" xchanged="" -eval "`setvars "" $cv`" +eval "`setvars "" $checkvars`" inject() { @@ -188,7 +188,7 @@ readkconfig() scankconfig() { - for cbc in $cv; do + for cbc in $checkvars; do grep "$cbc" "$1" 2>/dev/null 1>>"$xbtmp/cbcfg" || : done } diff --git a/include/vendor.sh b/include/vendor.sh index 1751ed74..99884bfb 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -23,13 +23,13 @@ vendir="vendorfiles" appdir="$vendir/app" vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" -# lbmk-specific extension to the "cv" variable (not suitable for cbmk) -cvchk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ +# lbmk-specific extension to the "checkvars" variable (not suitable for cbmk) +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_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2" -# lbmk-specific extensions to the "cv" variable (not suitable for cbmk) -cvxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_FSP_FULL_FD \ +# lbmk-specific extensions to the "checkvars" variable (not suitable for cbmk) +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_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 CONFIG_FSP_S_CBFS \ CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH \ @@ -490,7 +490,7 @@ extract_fsp() setvfile() { - [ -n "$vcfg" ] && for c in $cvchk; do + [ -n "$vcfg" ] && for c in $checkvarschk; do vcmd="[ \"\${$c}\" = \"/dev/null\" ] || [ -z \"\${$c}\" ]" eval "$vcmd || return 0" |