From cfbc083efed99bf4edb53013bc5ab7583278691b Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Mon, 27 Mar 2017 14:59:53 -0700 Subject: [PATCH] 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 Tested-by: Victor Hsieh Reviewed-by: Mike Frysinger --- scripts/image_signing/sign_android_image.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh index d81556dcb9..92e4b65d04 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}" }