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

delete include/vendor.sh and merge elsewhere

Browse Source 
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 <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-10-15 11:22:43 +01:00
parent d8c2c24507
commit c14461a56b
9 changed files with 51 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/update/vendor/inject
Vendored
+9 -11
View File
@@ -5,10 +5,11 @@
# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
. "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}"