openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

releasetools: Support verity signer args. 

system/extras/verity/build_verity_metadata.py now accepts
"--signer_args" to specify verity signer args.

Also remove the duplicate "--verity_signer_args" in
add_img_to_target_files.py, as we already have that in common.py.

Bug: 31500665
Test: Building and signing work w/ and w/o --signer_args.

Change-Id: I02f59c50a1ebf15c5505e9fffd5b9bbbbaa785be
(cherry picked from commit 458104266f)
This commit is contained in:
Tao Bao 2016-10-17 16:20:12 -07:00
parent c07ff401f2
commit c7814837a0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/releasetools/build_image.py
View File

@ -68,7 +68,7 @@ def GetVerityTreeSize(partition_size):
return True, int(output) return True, int(output)
def GetVerityMetadataSize(partition_size): def GetVerityMetadataSize(partition_size):
cmd = "system/extras/verity/build_verity_metadata.py -s %d" cmd = "system/extras/verity/build_verity_metadata.py size %d"
cmd %= partition_size cmd %= partition_size
status, output = commands.getstatusoutput(cmd) status, output = commands.getstatusoutput(cmd)
@ -163,11 +163,14 @@ def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict):
return True return True
def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt, def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
block_device, signer_path, key): block_device, signer_path, key, signer_args):
cmd_template = ( cmd_template = (
"system/extras/verity/build_verity_metadata.py %s %s %s %s %s %s %s") "system/extras/verity/build_verity_metadata.py build " +
"%s %s %s %s %s %s %s")
cmd = cmd_template % (image_size, verity_metadata_path, root_hash, salt, cmd = cmd_template % (image_size, verity_metadata_path, root_hash, salt,
block_device, signer_path, key) block_device, signer_path, key)
if signer_args:
cmd += " --signer_args=\"%s\"" % (' '.join(signer_args),)
print cmd print cmd
status, output = commands.getstatusoutput(cmd) status, output = commands.getstatusoutput(cmd)
if status: if status:
@ -254,10 +257,10 @@ def MakeVerityEnabledImage(out_file, fec_supported, prop_dict):
block_dev = prop_dict["verity_block_device"] block_dev = prop_dict["verity_block_device"]
signer_key = prop_dict["verity_key"] + ".pk8" signer_key = prop_dict["verity_key"] + ".pk8"
if OPTIONS.verity_signer_path is not None: if OPTIONS.verity_signer_path is not None:
signer_path = OPTIONS.verity_signer_path + ' ' signer_path = OPTIONS.verity_signer_path
signer_path += ' '.join(OPTIONS.verity_signer_args)
else: else:
signer_path = prop_dict["verity_signer_cmd"] signer_path = prop_dict["verity_signer_cmd"]
signer_args = OPTIONS.verity_signer_args
# make a tempdir # make a tempdir
tempdir_name = tempfile.mkdtemp(suffix="_verity_images") tempdir_name = tempfile.mkdtemp(suffix="_verity_images")
@ -276,7 +279,7 @@ def MakeVerityEnabledImage(out_file, fec_supported, prop_dict):
root_hash = prop_dict["verity_root_hash"] root_hash = prop_dict["verity_root_hash"]
salt = prop_dict["verity_salt"] salt = prop_dict["verity_salt"]
if not BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt, if not BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
block_dev, signer_path, signer_key): block_dev, signer_path, signer_key, signer_args):
shutil.rmtree(tempdir_name, ignore_errors=True) shutil.rmtree(tempdir_name, ignore_errors=True)
return False return False