diff options
author | Cole Faust <colefaust@google.com> | 2022-04-06 02:13:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-06 02:13:21 +0000 |
commit | 21a6129ff70c49d2601cf9e9846de050be24dc27 (patch) | |
tree | f8724b1d6e6ae120e8bda7cf645a7fdaf6272e60 | |
parent | acaf6f448cd19dd8a75706b05722e4c901a271a2 (diff) | |
parent | dc5616335b99ee1740be13e88cdd27578c77e519 (diff) | |
download | extras-21a6129ff70c49d2601cf9e9846de050be24dc27.tar.gz |
Merge "Convert build_verify_metadata to python 3" am: fbc4fb21ed am: a6c30f6aa9 am: 88c5339b43 am: a016c0eb41 am: dc5616335b
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529
Change-Id: I31bea33dbfd00a0443ec42bcfca46d502c6084d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | ext4_utils/mkuserimg_mke2fs.py | 4 | ||||
-rw-r--r-- | verity/Android.bp | 7 | ||||
-rw-r--r-- | verity/build_verity_metadata.py | 12 |
3 files changed, 9 insertions, 14 deletions
diff --git a/ext4_utils/mkuserimg_mke2fs.py b/ext4_utils/mkuserimg_mke2fs.py index 599e40ee..41ae8cd7 100644 --- a/ext4_utils/mkuserimg_mke2fs.py +++ b/ext4_utils/mkuserimg_mke2fs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018 The Android Open Source Project # @@ -165,7 +165,7 @@ def ConstructE2fsCommands(args): if args.flash_erase_block_size: mke2fs_extended_opts.append("stripe_width={}".format( - int(args.flash_erase_block_size) / BLOCKSIZE)) + int(args.flash_erase_block_size) // BLOCKSIZE)) if args.flash_logical_block_size: # stride should be the max of 8kb and the logical block size stride = max(int(args.flash_logical_block_size), 8192) diff --git a/verity/Android.bp b/verity/Android.bp index fc2b827c..ef09528c 100644 --- a/verity/Android.bp +++ b/verity/Android.bp @@ -154,13 +154,8 @@ python_binary_host { name: "build_verity_metadata", srcs: ["build_verity_metadata.py"], version: { - py2: { - enabled: true, - embedded_launcher: true, - }, py3: { - enabled: false, - embedded_launcher: false, + embedded_launcher: true, }, }, } diff --git a/verity/build_verity_metadata.py b/verity/build_verity_metadata.py index 5a7d7d27..52388716 100644 --- a/verity/build_verity_metadata.py +++ b/verity/build_verity_metadata.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2013 The Android Open Source Project # @@ -29,9 +29,9 @@ BLOCK_SIZE = 4096 METADATA_SIZE = BLOCK_SIZE * 8 def run(cmd): - p = subprocess.Popen(cmd, stdout=subprocess.PIPE) + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, text=True) output, _ = p.communicate() - print output + print(output) if p.returncode: exit(-1) @@ -56,7 +56,7 @@ def sign_verity_table(table, signer_path, key_path, signer_args=None): else: args_list = shlex.split(signer_args) cmd = [signer_path] + args_list + [table_file.name, key_path, signature_file.name] - print cmd + print(cmd) run(cmd) return signature_file.read() @@ -109,9 +109,9 @@ if __name__ == "__main__": args = parser.parse_args() if args.dest == 'size': - print get_verity_metadata_size(args.partition_size) + print(get_verity_metadata_size(args.partition_size)) else: - build_verity_metadata(args.blocks / 4096, args.metadata_image, + build_verity_metadata(args.blocks // 4096, args.metadata_image, args.root_hash, args.salt, args.block_device, args.signer_path, args.signing_key, args.signer_args, args.verity_disable) |