StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Consider search_path to locate avb_*_key_path files"

Browse Source
This commit is contained in:
Daniel Mentz
2019-08-26 18:17:29 +00:00
committed by Gerrit Code Review
parent bca3111cfa 25478181b9
commit 11dc247ba9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/common.py
View File

@@ -616,6 +616,10 @@ def AppendAVBSigningArgs(cmd, partition):
"""Append signing arguments for avbtool.""" """Append signing arguments for avbtool."""
# e.g., "--key path/to/signing_key --algorithm SHA256_RSA4096" # e.g., "--key path/to/signing_key --algorithm SHA256_RSA4096"
key_path = OPTIONS.info_dict.get("avb_" + partition + "_key_path") key_path = OPTIONS.info_dict.get("avb_" + partition + "_key_path")
if key_path and not os.path.exists(key_path) and OPTIONS.search_path:
new_key_path = os.path.join(OPTIONS.search_path, key_path)
if os.path.exists(new_key_path):
key_path = new_key_path
algorithm = OPTIONS.info_dict.get("avb_" + partition + "_algorithm") algorithm = OPTIONS.info_dict.get("avb_" + partition + "_algorithm")
if key_path and algorithm: if key_path and algorithm:
cmd.extend(["--key", key_path, "--algorithm", algorithm]) cmd.extend(["--key", key_path, "--algorithm", algorithm])
@@ -668,6 +672,10 @@ def GetAvbChainedPartitionArg(partition, info_dict, key=None):
""" """
if key is None: if key is None:
key = info_dict["avb_" + partition + "_key_path"] key = info_dict["avb_" + partition + "_key_path"]
if key and not os.path.exists(key) and OPTIONS.search_path:
new_key_path = os.path.join(OPTIONS.search_path, key)
if os.path.exists(new_key_path):
key = new_key_path
pubkey_path = ExtractAvbPublicKey(info_dict["avb_avbtool"], key) pubkey_path = ExtractAvbPublicKey(info_dict["avb_avbtool"], key)
rollback_index_location = info_dict[ rollback_index_location = info_dict[
"avb_" + partition + "_rollback_index_location"] "avb_" + partition + "_rollback_index_location"]