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

Merge "releasetools: Support replacing the signing keys for chained vbmeta."

Browse Source
This commit is contained in:
Tao Bao
2019-05-07 03:10:35 +00:00
committed by Gerrit Code Review
parent 38809bdf99 d6085d6834
commit 32d69c6b74
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tools/releasetools/sign_target_files_apks.py
View File

@@ -91,12 +91,15 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files
Replace the veritykeyid in BOOT/cmdline of input_target_file_zip Replace the veritykeyid in BOOT/cmdline of input_target_file_zip
with keyid of the cert pointed by <path_to_X509_PEM_cert_file>. with keyid of the cert pointed by <path_to_X509_PEM_cert_file>.
--avb_{boot,system,system_other,vendor,dtbo,vbmeta}_algorithm <algorithm> --avb_{boot,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
--avb_{boot,system,system_other,vendor,dtbo,vbmeta}_key <key> vbmeta_vendor}_algorithm <algorithm>
--avb_{boot,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
vbmeta_vendor}_key <key>
Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign
the specified image. Otherwise it uses the existing values in info dict. the specified image. Otherwise it uses the existing values in info dict.
--avb_{apex,boot,system,system_other,vendor,dtbo,vbmeta}_extra_args <args> --avb_{apex,boot,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
vbmeta_vendor}_extra_args <args>
Specify any additional args that are needed to AVB-sign the image Specify any additional args that are needed to AVB-sign the image
(e.g. "--signing_helper /path/to/helper"). The args will be appended to (e.g. "--signing_helper /path/to/helper"). The args will be appended to
the existing ones in info dict. the existing ones in info dict.
@@ -966,6 +969,8 @@ def ReplaceAvbSigningKeys(misc_info):
'system_other' : 'avb_system_other_add_hashtree_footer_args', 'system_other' : 'avb_system_other_add_hashtree_footer_args',
'vendor' : 'avb_vendor_add_hashtree_footer_args', 'vendor' : 'avb_vendor_add_hashtree_footer_args',
'vbmeta' : 'avb_vbmeta_args', 'vbmeta' : 'avb_vbmeta_args',
'vbmeta_system' : 'avb_vbmeta_system_args',
'vbmeta_vendor' : 'avb_vbmeta_vendor_args',
} }
def ReplaceAvbPartitionSigningKey(partition): def ReplaceAvbPartitionSigningKey(partition):
@@ -1193,6 +1198,18 @@ def main(argv):
OPTIONS.avb_algorithms['vendor'] = a OPTIONS.avb_algorithms['vendor'] = a
elif o == "--avb_vendor_extra_args": elif o == "--avb_vendor_extra_args":
OPTIONS.avb_extra_args['vendor'] = a OPTIONS.avb_extra_args['vendor'] = a
elif o == "--avb_vbmeta_system_key":
OPTIONS.avb_keys['vbmeta_system'] = a
elif o == "--avb_vbmeta_system_algorithm":
OPTIONS.avb_algorithms['vbmeta_system'] = a
elif o == "--avb_vbmeta_system_extra_args":
OPTIONS.avb_extra_args['vbmeta_system'] = a
elif o == "--avb_vbmeta_vendor_key":
OPTIONS.avb_keys['vbmeta_vendor'] = a
elif o == "--avb_vbmeta_vendor_algorithm":
OPTIONS.avb_algorithms['vbmeta_vendor'] = a
elif o == "--avb_vbmeta_vendor_extra_args":
OPTIONS.avb_extra_args['vbmeta_vendor'] = a
elif o == "--avb_apex_extra_args": elif o == "--avb_apex_extra_args":
OPTIONS.avb_extra_args['apex'] = a OPTIONS.avb_extra_args['apex'] = a
else: else:
@@ -1232,6 +1249,12 @@ def main(argv):
"avb_vendor_algorithm=", "avb_vendor_algorithm=",
"avb_vendor_key=", "avb_vendor_key=",
"avb_vendor_extra_args=", "avb_vendor_extra_args=",
"avb_vbmeta_system_algorithm=",
"avb_vbmeta_system_key=",
"avb_vbmeta_system_extra_args=",
"avb_vbmeta_vendor_algorithm=",
"avb_vbmeta_vendor_key=",
"avb_vbmeta_vendor_extra_args=",
], ],
extra_option_handler=option_handler) extra_option_handler=option_handler)