From d621e58a53c72b64aea88df19fd29560d635e956 Mon Sep 17 00:00:00 2001 From: George Engelbrecht Date: Fri, 30 Oct 2020 16:18:04 -0600 Subject: sign_android: don't use xattrs from unsquashfs We've moved to applying a file based set of selinux policies instead of taking the ones that were snagged from the image. Remove the policy attributes and let unsquash do whatever it would do by default. See https://chat.google.com/room/AAAA45hbdCQ/jkXYe7jMEDk. BUG=chromium:1141907 TEST=unittests Change-Id: I0a976fb216e0a07c00c4bb2fb68df6fa1ea00d79 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2511121 Reviewed-by: Yury Khmel Reviewed-by: Julius Werner Reviewed-by: Yury Khmel Commit-Queue: George Engelbrecht Commit-Queue: Yury Khmel Tested-by: George Engelbrecht Auto-Submit: George Engelbrecht --- scripts/image_signing/sign_android_image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh index 28534fca..bd107899 100755 --- a/scripts/image_signing/sign_android_image.sh +++ b/scripts/image_signing/sign_android_image.sh @@ -231,7 +231,7 @@ replace_ota_cert() { # Snapshot file properties in a directory recursively. snapshot_file_properties() { local dir=$1 - sudo find "${dir}" -exec stat -c '%n:%u:%g:%a:%C' {} + | sort + sudo find "${dir}" -exec stat -c '%n:%u:%g:%a' {} + | sort } main() { @@ -289,7 +289,7 @@ main() { local system_mnt="${working_dir}/mnt" info "Unpacking squashfs system image to ${system_mnt}" - sudo "${unsquashfs}" -x -f -no-progress -d "${system_mnt}" "${system_img}" + sudo "${unsquashfs}" -no-xattrs -f -no-progress -d "${system_mnt}" "${system_img}" snapshot_file_properties "${system_mnt}" > "${working_dir}/properties.orig" -- cgit v1.2.1