diff options
| author | Mike Frysinger <vapier@chromium.org> | 2015-01-16 06:28:19 -0500 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-16 18:12:04 +0000 |
| commit | 4edc75daa696f9e6fa39205117233ed68dcbed43 (patch) | |
| tree | 569b13baab4cfdfb8c9b41fc3c6875fedac3965e | |
| parent | c8c87b3264e02df2842e20866f717607a07c5ab4 (diff) | |
| download | vboot-4edc75daa696f9e6fa39205117233ed68dcbed43.tar.gz | |
image_signing: work around shar invocation changing
The shar utility changed the flag name and newer versions no longer
accept -w. Mung the shellball on the fly to use the newer flag.
BUG=chrome-os-partner:33719
TEST=signing old firmware shellball inside chroot passes
BRANCH=none
Change-Id: If5c2da3062bd72062baa779bb26ea56304c31558
Reviewed-on: https://chromium-review.googlesource.com/241064
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
| -rwxr-xr-x | scripts/image_signing/sign_official_build.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index e728d2a4..f6126878 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -389,6 +389,10 @@ repack_firmware_bundle() { return 1 elif grep -q '^##CUTHERE##' "${target}"; then # Bundle supports repacking. + # Workaround issue crosbug.com/p/33719 + sed -i \ + 's/shar -Q -q -x -m -w/shar -Q -q -x -m --no-character-count/' \ + "${target}" "$target" --sb_repack "${input_dir}" || die "Updating firmware autoupdate (--sb_repack) failed." else |