diff options
| author | Daichi Hirono <hirono@chromium.org> | 2022-05-18 05:58:29 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-18 13:22:16 +0000 |
| commit | 523e7f1dde9193a68714ca5d8a70511f56577fae (patch) | |
| tree | e6a7d10466d3c9455990f9573cb11feac274bc4e | |
| parent | 1928a657d475c1ab243185627a28cdf4dd36823e (diff) | |
| download | vboot-523e7f1dde9193a68714ca5d8a70511f56577fae.tar.gz | |
Revert "signer: Check the list of android image files"
This reverts commit 48532e571bf79f32af972f6096681c11674c3825.
Reason for revert: Stable roll blocked due to unit test failures in platform/signing.
https://ci.chromium.org/ui/p/chromeos/builders/cq/fullcheckout-presubmit/b8813887760837459473/overview
Original change's description:
> signer: Check the list of android image files
>
> BUG=b:230434967
> BRANCH=None
> TEST=Run ./sign_official_build.sh locally
>
> Signed-off-by: Daichi Hirono <hirono@chromium.org>
>
> Change-Id: I5e8b4d848f30f53fae58c721c9b7ddcfbfea9852
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3607891
> Tested-by: Daichi Hirono <hirono@chromium.org>
> Commit-Queue: Daichi Hirono <hirono@chromium.org>
> Reviewed-by: Shao-Chuan Lee <shaochuan@chromium.org>
Bug: b:230434967
Change-Id: I185562d6dcbac4fd30b6dc4c331bd0b1508d58e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3644484
Commit-Queue: Daichi Hirono <hirono@chromium.org>
Tested-by: Daichi Hirono <hirono@chromium.org>
Reviewed-by: Shao-Chuan Lee <shaochuan@chromium.org>
Auto-Submit: Daichi Hirono <hirono@chromium.org>
| -rwxr-xr-x | scripts/image_signing/sign_android_image.sh | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh index f8a1ed4d..5af1aa69 100755 --- a/scripts/image_signing/sign_android_image.sh +++ b/scripts/image_signing/sign_android_image.sh @@ -265,12 +265,6 @@ image_content_integrity_check() { return 0 } -list_image_files() { - local unsquashfs=$1 - local system_img=$2 - sudo "${unsquashfs}" -l "${system_img}" | grep ^squashfs-root -} - sign_android_internal() { local root_fs_dir=$1 local key_dir=$2 @@ -338,8 +332,6 @@ sign_android_internal() { local system_mnt="${working_dir}/mnt" info "Unpacking squashfs system image to ${system_mnt}" - list_image_files "${unsquashfs}" "${system_img}" > \ - "${working_dir}/image_file_list.orig" sudo "${unsquashfs}" -no-xattrs -f -no-progress -d "${system_mnt}" "${system_img}" snapshot_file_properties "${system_mnt}" > "${working_dir}/properties.orig" @@ -416,14 +408,6 @@ sign_android_internal() { -no-progress local new_size=$(stat -c '%s' "${system_img}") info "Android system image size change: ${old_size} -> ${new_size}" - - list_image_files "${unsquashfs}" "${system_img}" > \ - "${working_dir}/image_file_list.new" - if ! d=$(diff "${working_dir}"/image_file_list.{orig,new}); then - # Here we have already deleted the original Android image so cannot retry. - die "Unexpected change of file list\n${d}" - fi - return 0 } |