inject.sh: tidy up intel me handling

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-05 05:43:38 +01:00
parent 64a91acc43
commit 5829a185d0
+6 -12
View File
@@ -142,8 +142,12 @@ extract_intel_me()
[ "$ME11bootguard" = "y" ] && x_ ./mk -f deguard [ "$ME11bootguard" = "y" ] && x_ ./mk -f deguard
extract_intel_me_bruteforce extract_intel_me_bruteforce
if [ "$ME11bootguard" = "y" ]; then if [ "$ME11bootguard" = "y" ]; then (
apply_me11_deguard_mod 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 "$_me"
) || err "Error running deguard for $_me - $dontflash"
else else
mv "$_metmp" "$_me" || err "!mv $_metmp $_me - $dontflash" mv "$_metmp" "$_me" || err "!mv $_metmp $_me - $dontflash"
fi fi
@@ -185,16 +189,6 @@ extract_intel_me_bruteforce()
rm -Rf "$sdir" || err "extract_intel_me: !rm -Rf $sdir - $dontflash" rm -Rf "$sdir" || err "extract_intel_me: !rm -Rf $sdir - $dontflash"
} }
apply_me11_deguard_mod()
{
(
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 "$_me"
) || err "Error running deguard for $_me - $dontflash"
}
extract_archive() extract_archive()
{ {
[ $# -gt 2 ] && [ "$3" = "fsp" ] && x_ python \ [ $# -gt 2 ] && [ "$3" = "fsp" ] && x_ python \