From 53b53ddd1cb917c86dd68f5716ec00f6a0349192 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 9 Mar 2025 20:49:27 -0500 Subject: [PATCH] util/chromeos/crosfirmware: Increase lookahead when parsing bios_image Newer recovery images change the manifest format yet again, so increase the lookhead when parsing the bios_image field to ensure we can find it. TEST=run `./crosfirmware.sh craaskbowl` without erroring out Change-Id: Idb1862e38a82f3cec8db55993ccf421cf3572c6f Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/86777 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- util/chromeos/crosfirmware.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/chromeos/crosfirmware.sh b/util/chromeos/crosfirmware.sh index 22fd6117ab..6dbac40394 100755 --- a/util/chromeos/crosfirmware.sh +++ b/util/chromeos/crosfirmware.sh @@ -116,8 +116,8 @@ extract_coreboot() { elif [ -f "$_unpacked/manifest.json" ]; then _version=$(grep -m1 -A4 "$BOARD\":" "$_unpacked/manifest.json" | grep -m1 "rw" | sed 's/.*\(rw.*\)/\1/' | sed 's/.*\("Google.*\)/\1/' | cut -f2 -d'"') - _bios_image=$(grep -m1 -A7 "$BOARD\":" "$_unpacked/manifest.json" | grep -m1 "image" | - sed 's/.*"image": //' | cut -f2 -d'"') + _bios_image=$(grep -m1 -A10 "$BOARD\":" "$_unpacked/manifest.json" | + grep -m1 "image" | sed 's/.*"image": //' | cut -f2 -d'"') else _version=$(cat $_unpacked/VERSION | grep BIOS\ version: | cut -f2 -d: | tr -d \ )