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

vendor.sh: general code cleanup

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2024-06-28 22:49:59 +01:00
parent a8f272536d
commit 85c2eb0f7c
1 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vendor.sh
+14 -27
View File
@@ -243,8 +243,7 @@ vendor_inject()
[ "$nukemode" = "nuke" ] && return 0 [ "$nukemode" = "nuke" ] && return 0
printf "Friendly reminder (this is *not* an error message):\n" printf "Friendly reminder (this is *not* an error message):\n"
printf "Please ensure that the files were inserted correctly. ALSO:\n" printf "Make sure the files were inserted. ALSO:\n%s\n" "$kbnotice"
printf "%s\n" "$kbnotice"
} }
check_board() check_board()
@@ -255,8 +254,7 @@ check_board()
[ -z "${rom+x}" ] && $err "check_board: no rom specified" [ -z "${rom+x}" ] && $err "check_board: no rom specified"
[ -n "${board+x}" ] || board="$(detect_board "$rom")" [ -n "${board+x}" ] || board="$(detect_board "$rom")"
else else
vrelease="y" vrelease="y"; board="$(detect_board "$archive")"
board="$(detect_board "$archive")"
fi; readcfg fi; readcfg
} }
@@ -305,19 +303,16 @@ build_dependencies_inject()
patch_release_roms() patch_release_roms()
{ {
_tmpdir="tmp/romdir" remkdir "tmp/romdir"
remkdir "$_tmpdir" tar -xf "$archive" -C "tmp/romdir" || \
tar -xf "$archive" -C "$_tmpdir" || \ $err "patch_release_roms: !tar -xf \"$archive\" -C \"tmp/romdir\""
$err "patch_release_roms: !tar -xf \"$archive\" -C \"$_tmpdir\""
for x in "$_tmpdir"/bin/*/*.rom ; do for x in "tmp/romdir/bin/"*/*.rom ; do
printf "patching rom: %s\n" "$x"
patch_rom "$x" patch_rom "$x"
done done
( (
cd "$_tmpdir/bin/"* || \ cd "tmp/romdir/bin/"* || $err "patch roms: !cd tmp/romdir/bin/*"
$err "patch_release_roms: !cd $_tmpdir/bin/*"
# NOTE: For compatibility with older rom releases, defer to sha1 # NOTE: For compatibility with older rom releases, defer to sha1
[ "$nukemode" = "nuke" ] || sha512sum --status -c vendorhashes || \ [ "$nukemode" = "nuke" ] || sha512sum --status -c vendorhashes || \
@@ -326,16 +321,12 @@ patch_release_roms()
$err "patch_release_roms: ROMs did not match expected hashes" $err "patch_release_roms: ROMs did not match expected hashes"
) || $err "can't verify vendor hashes" ) || $err "can't verify vendor hashes"
[ -n "$new_mac" ] && \ [ -n "$new_mac" ] && for x in "tmp/romdir/bin/"*/*.rom ; do
for x in "$_tmpdir"/bin/*/*.rom ; do [ -f "$x" ] && modify_gbe "$x"
[ -f "$x" ] && modify_gbe "$x" done
done
[ -d "bin/release" ] || x_ mkdir -p bin/release x_ mkdir -p bin/release
x_ mv "$_tmpdir"/bin/* bin/release/ mv tmp/romdir/bin/* bin/release/ || $err "$board: !mv release roms"
x_ rm -Rf "$_tmpdir"
printf "Success! Your ROMs are in bin/release\n"
} }
patch_rom() patch_rom()
@@ -369,9 +360,8 @@ inject()
[ $# -lt 3 ] && $err "$@, $rom: usage: inject name path type (offset)" [ $# -lt 3 ] && $err "$@, $rom: usage: inject name path type (offset)"
eval `setvars "" cbfsname _dest _t _offset` eval `setvars "" cbfsname _dest _t _offset`
cbfsname="$1" cbfsname="$1"; _dest="${2##*../}"; _t="$3"
_dest="${2##*../}"
_t="$3"
[ $# -gt 3 ] && _offset="-b $4" && [ -z "$4" ] && \ [ $# -gt 3 ] && _offset="-b $4" && [ -z "$4" ] && \
$err "inject $@, $rom: offset passed, but empty (not defined)" $err "inject $@, $rom: offset passed, but empty (not defined)"
@@ -379,9 +369,6 @@ inject()
[ ! -f "$_dest" ] && [ "$nukemode" != "nuke" ] && \ [ ! -f "$_dest" ] && [ "$nukemode" != "nuke" ] && \
$err "inject_$dl_type: file missing, $_dest" $err "inject_$dl_type: file missing, $_dest"
[ "$nukemode" = "nuke" ] || \
printf "Inserting %s/%s into: %s\n" "$cbfsname" "$_t" "$rom"
if [ "$_t" = "GbE" ]; then if [ "$_t" = "GbE" ]; then
x_ mkdir -p tmp x_ mkdir -p tmp
cp "$_dest" "tmp/gbe.bin" || \ cp "$_dest" "tmp/gbe.bin" || \