From c14461a56b5203893466eaede7747047668693d8 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 15 Oct 2023 11:22:43 +0100 Subject: delete include/vendor.sh and merge elsewhere move it all to other files where items are used, and not used anywhere else. this reduces the size of vendor.sh. also remove a few redundant variables, or variables that are not meaningfully used. a few items have been moved to include/option.sh Signed-off-by: Leah Rowe --- script/update/vendor/inject | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'script/update/vendor/inject') diff --git a/script/update/vendor/inject b/script/update/vendor/inject index 10692196..c4a7f702 100755 --- a/script/update/vendor/inject +++ b/script/update/vendor/inject @@ -5,10 +5,11 @@ # SPDX-FileCopyrightText: 2023 Leah Rowe . "include/err.sh" -. "include/vendor.sh" . "include/option.sh" -release_archive="n" +nvmutil="util/nvmutil/nvm" + +eval "$(setvars "" archive rom modifygbe nukemode release new_mac)" main() { @@ -46,8 +47,7 @@ check_board() [ ! -z ${board+x} ] || \ board=$(detect_board "${rom}") else - release=true - releasearchive="${archive}" + release="y" board=$(detect_board "${archive}") fi @@ -98,10 +98,8 @@ build_dependencies() inject_vendorfiles() { - release_archive="n" - [ "${release}" != "true" ] && x_ patch_rom "${rom}" && return 0 - printf "patching release file\n" - release_archive="y" + [ "${release}" != "y" ] && x_ patch_rom "${rom}" && return 0 + printf "patching release images\n" patch_release_roms } @@ -110,7 +108,7 @@ patch_release_roms() _tmpdir="tmp/romdir" x_ rm -Rf "${_tmpdir}" x_ mkdir -p "${_tmpdir}" - x_ tar -xf "${releasearchive}" -C "${_tmpdir}" + x_ tar -xf "${archive}" -C "${_tmpdir}" for x in "${_tmpdir}"/bin/*/*.rom ; do printf "patching rom: %s\n" "$x" @@ -162,7 +160,7 @@ patch_rom() # (unless nomicrocode is the only config provided) [ "${rom}" != "${rom%_nomicrocode.rom}.rom" ] && \ [ -f "${rom%_nomicrocode.rom}.rom" ] && \ - [ "${release_archive}" = "y" ] && return 0 + [ "${release}" = "y" ] && return 0 x_ check_defconfig "${boarddir}" @@ -185,7 +183,7 @@ patch_rom() [ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" = "y" ] && \ [ ! -z "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" ] && \ inject "sch5545_ecfw.bin" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw - [ "${modifygbe}" = "true" ] && ! [ "${release}" = "true" ] && \ + [ "${modifygbe}" = "true" ] && ! [ "${release}" = "y" ] && \ inject "IFD" "${CONFIG_GBE_BIN_PATH}" "GbE" printf "ROM image successfully patched: %s\n" "${rom}" -- cgit v1.2.1