diff options
| author | Josh Horwich <jhorwich@google.com> | 2022-07-28 13:24:14 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-29 04:18:48 +0000 |
| commit | aa4671712ddb54216febc103cc9ff530b586b54a (patch) | |
| tree | c44324f586a475603da55456f539c47c1ffd36e5 | |
| parent | 64dd01225f64d6745a008d91fba3fcac2f1920bd (diff) | |
| download | vboot-aa4671712ddb54216febc103cc9ff530b586b54a.tar.gz | |
signer: continue to use --sb_extract for shellballs
crrev.com/c/3665477 started using `--unpack` rather than
`--sb_extract` for self-extracting firmware update bundles.
Unfortunately, existing prebuilt artifacts used by signer tests are
old and only support `--sb_extract`, and hence fail with recent
vboot_reference that includes this change.
This change simply reverts the option back to `--sb_extract` for
unpacking self-extracting bundles.
BRANCH=None
BUG=b:179170462
BUG=b:202397678
TEST=unittests
Change-Id: I528346a5d593caba7ca822820b9a38e994f0ea94
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3792485
Commit-Queue: Josh Horwich <jhorwich@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Prameet Shah <phshah@chromium.org>
Tested-by: Josh Horwich <jhorwich@chromium.org>
Auto-Submit: Josh Horwich <jhorwich@chromium.org>
| -rw-r--r-- | scripts/image_signing/common.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/image_signing/common.sh b/scripts/image_signing/common.sh index 85475d8b..81bcac3b 100644 --- a/scripts/image_signing/common.sh +++ b/scripts/image_signing/common.sh @@ -146,8 +146,8 @@ extract_firmware_bundle() { return 1 elif grep -q '^##CUTHERE##' "${input}"; then # Bundle supports self-extraction. - "${input}" --unpack "${output_dir}" || - die "Extracting firmware autoupdate (--unpack) failed." + "${input}" --sb_extract "${output_dir}" || + die "Extracting firmware autoupdate (--sb_extract) failed." else # Legacy bundle - try uudecode. uudecode -o - "${input}" | tar -C "${output_dir}" -zxf - 2>/dev/null || |