coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-20 05:36:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

vendor.sh: tidy up extract_intel_me

Browse Source 
too many chained commands. break it out a bit.

this makes it more readable, without changing behaviour.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-08-26 07:01:35 +01:00
parent 9fb707b49b
commit 50a0bac01c
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vendor.sh
+23 -11
View File
@@ -149,21 +149,23 @@ extract_intel_me()
_metmp="$xbloc/me.bin" _metmp="$xbloc/me.bin"
x_ rm -f "$_metmp" "$xbloc/a" x_ rm -f "$_metmp" "$xbloc/a"
mfs="" && [ "$ME11bootguard" = "y" ] && mfs="--whitelist MFS" && \ mfs=""
chkvars ME11delta ME11version ME11sku ME11pch if [ "$ME11bootguard" = "y" ]; then
[ "$ME11bootguard" = "y" ] && x_ ./mk -f deguard mfs="--whitelist MFS"
chkvars ME11delta ME11version ME11sku ME11pch
x_ ./mk -f deguard
fi
set +u +e set +u +e
x_ rm -Rf "$xbmkpwd/metmp" x_ rm -Rf "$xbmkpwd/metmp"
( fx_ find_me x_ find "$xbmkpwd/$appdir" -type f ) || :
[ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_pre_dest" && return 0
( ( fx_ find_me x_ find "$xbmkpwd/$appdir" -type f ) || :; :
x_ cd src/deguard/
x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \ if [ "$ME11bootguard" = "y" ]; then
"$ME11version" --pch "$ME11pch" --sku "$ME11sku" \ apply_deguard_hack
--fake-fpfs data/fpfs/zero --input "$_metmp" --output "$_pre_dest" else
) || err "Error running deguard for $_dest"; : x_ mv "$_metmp" "$_pre_dest"
fi; :
} }
find_me() find_me()
@@ -181,6 +183,16 @@ find_me()
( fx_ find_me x_ find "$_7ztest" -type f ) || exit 1; : ( fx_ find_me x_ find "$_7ztest" -type f ) || exit 1; :
} }
apply_deguard_hack()
{
(
x_ cd src/deguard/
x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \
"$ME11version" --pch "$ME11pch" --sku "$ME11sku" \
--fake-fpfs data/fpfs/zero --input "$_metmp" --output "$_pre_dest"
) || err "Error running deguard for $_dest"; :
}
extract_archive() extract_archive()
{ {
innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \ innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \