diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-09-11 11:26:19 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-09-11 11:26:19 +0100 |
| commit | 0deac58e418f97b9701b585dc5bdfbaab526e6e4 (patch) | |
| tree | 63fbe5cbe30e597a0b81f092ddce62a9d06b34e0 | |
| parent | c738698ccab4a3bc38f37397019cae8e876318ea (diff) | |
vendor.sh: tidy up apply_deguard_hack()
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/vendor.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index d2f8ec26..7e3e99ae 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -157,8 +157,8 @@ extract_intel_me() ( fx_ find_me x_ find "$xbmkpwd/$appdir" -type f ) || :; : set -u -e - [ "$ME11bootguard" = "y" ] || x_ mv "$_metmp" "$_pre_dest" - [ "$ME11bootguard" = "y" ] && apply_deguard_hack; : + [ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_pre_dest" && return 0 + ( apply_deguard_hack ) || err "Error running deguard for $_dest"; : } find_me() @@ -178,12 +178,9 @@ find_me() apply_deguard_hack() { - ( - x_ cd src/deguard/ - x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \ - "$ME11version" --pch "$ME11pch" --sku "$ME11sku" \ + 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() |