diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-08-26 07:01:35 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-08-26 07:01:35 +0100 |
| commit | 50a0bac01ce23a569fa7bfea3a8553173aa61448 (patch) | |
| tree | a001ce90d21d1893f89dc6aee7096a5bf1ed5973 /include/vendor.sh | |
| parent | 9fb707b49bbf9e56a850562b09f37fcf017b078c (diff) | |
vendor.sh: tidy up extract_intel_me
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>
Diffstat (limited to 'include/vendor.sh')
| -rw-r--r-- | include/vendor.sh | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index da23b145..9f1a6ecf 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -149,21 +149,23 @@ extract_intel_me() _metmp="$xbloc/me.bin" x_ rm -f "$_metmp" "$xbloc/a" - mfs="" && [ "$ME11bootguard" = "y" ] && mfs="--whitelist MFS" && \ - chkvars ME11delta ME11version ME11sku ME11pch - [ "$ME11bootguard" = "y" ] && x_ ./mk -f deguard + mfs="" + if [ "$ME11bootguard" = "y" ]; then + mfs="--whitelist MFS" + chkvars ME11delta ME11version ME11sku ME11pch + x_ ./mk -f deguard + fi set +u +e x_ rm -Rf "$xbmkpwd/metmp" - ( fx_ find_me x_ find "$xbmkpwd/$appdir" -type f ) || : - [ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_pre_dest" && return 0 - ( - 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"; : + ( fx_ find_me x_ find "$xbmkpwd/$appdir" -type f ) || :; : + + if [ "$ME11bootguard" = "y" ]; then + apply_deguard_hack + else + x_ mv "$_metmp" "$_pre_dest" + fi; : } find_me() @@ -181,6 +183,16 @@ find_me() ( 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() { innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \ |