summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@chromium.org>2017-03-27 14:59:53 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-03-28 17:16:52 -0700
commitcfbc083efed99bf4edb53013bc5ab7583278691b (patch)
treef954e4501b88f6ed27d77c97bc3a40e3b2d5b871
parenta1c5f7c006b7bb3d5894f132f70ba3bbadfd9d6b (diff)
downloadvboot-cfbc083efed99bf4edb53013bc5ab7583278691b.tar.gz
Preserve compress method when re-sign Android image
TEST=sign_android_image.sh rootfs /path/to/tests/devkeys/android # unsquash -s still shows gzip (previous script always use lzo) BUG=chromium:705247 BRANCH=none Change-Id: If95686d293123a069ce36bc53cbea3a08aa3e7ab Reviewed-on: https://chromium-review.googlesource.com/461205 Commit-Ready: Victor Hsieh <victorhsieh@chromium.org> Tested-by: Victor Hsieh <victorhsieh@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
-rwxr-xr-xscripts/image_signing/sign_android_image.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh
index d81556dc..92e4b65d 100755
--- a/scripts/image_signing/sign_android_image.sh
+++ b/scripts/image_signing/sign_android_image.sh
@@ -211,6 +211,8 @@ main() {
local working_dir=$(make_temp_dir)
local system_mnt="${working_dir}/mnt"
+ local compression_method=$(sudo unsquashfs -s "${system_img}" | \
+ awk '$1 == "Compression" { print $2 }')
info "Unpacking squashfs image to ${system_img}"
sudo "${unsquashfs}" -x -f -no-progress -d "${system_mnt}" "${system_img}"
@@ -233,7 +235,7 @@ main() {
local old_size=$(stat -c '%s' "${system_img}")
# Overwrite the original image.
sudo "${mksquashfs}" "${system_mnt}" "${system_img}" \
- -no-progress -comp lzo -noappend
+ -no-progress -comp "${compression_method}" -noappend
local new_size=$(stat -c '%s' "${system_img}")
info "Android system image size change: ${old_size} -> ${new_size}"
}