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

Merge "Merges dynamic partition misc_info.txt keys from both system and other."

Browse Source
This commit is contained in:
Daniel Norman
2019-03-25 23:15:09 +00:00
committed by Gerrit Code Review
parent b455273444 19b9fe9fdf
commit c21a8448d1
1 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/releasetools/merge_target_files.py
View File

@@ -204,13 +204,19 @@ def read_config_list(config_file_path):
return config_file.read().splitlines() return config_file.read().splitlines()
def validate_config_lists(system_item_list, other_item_list): def validate_config_lists(
system_item_list,
system_misc_info_keys,
other_item_list):
"""Performs validations on the merge config lists. """Performs validations on the merge config lists.
Args: Args:
system_item_list: The list of items to extract from the partial system_item_list: The list of items to extract from the partial
system target files package as is. system target files package as is.
system_misc_info_keys: A list of keys to obtain from the system instance
of META/misc_info.txt. The remaining keys from the other instance.
other_item_list: The list of items to extract from the partial other_item_list: The list of items to extract from the partial
other target files package as is. other target files package as is.
@@ -233,6 +239,12 @@ def validate_config_lists(system_item_list, other_item_list):
'this script.') 'this script.')
return False return False
if ('dynamic_partition_list' in system_misc_info_keys) or (
'super_partition_groups' in system_misc_info_keys):
logger.error('Dynamic partition misc info keys should come from '
'the other instance of META/misc_info.txt.')
return False
return True return True
@@ -331,6 +343,25 @@ def process_misc_info_txt(
for key in system_misc_info_keys: for key in system_misc_info_keys:
merged_info_dict[key] = system_info_dict[key] merged_info_dict[key] = system_info_dict[key]
# Merge misc info keys used for Dynamic Partitions.
if (merged_info_dict.get('use_dynamic_partitions') == 'true') and (
system_info_dict.get('use_dynamic_partitions') == 'true'):
merged_info_dict['dynamic_partition_list'] = '%s %s' % (
system_info_dict.get('dynamic_partition_list', ''),
merged_info_dict.get('dynamic_partition_list', ''))
# Partition groups and group sizes are defined by the other (non-system)
# misc info file because these values may vary for each board that uses
# a shared system image.
for partition_group in merged_info_dict['super_partition_groups'].split(' '):
if ('super_%s_group_size' % partition_group) not in merged_info_dict:
raise common.ExternalError(
'Other META/misc_info.txt does not contain required key '
'super_%s_group_size.' % partition_group)
key = 'super_%s_partition_list' % partition_group
merged_info_dict[key] = '%s %s' % (
system_info_dict.get(key, ''),
merged_info_dict.get(key, ''))
output_misc_info_txt = os.path.join( output_misc_info_txt = os.path.join(
output_target_files_temp_dir, output_target_files_temp_dir,
'META', 'misc_info.txt') 'META', 'misc_info.txt')
@@ -717,6 +748,7 @@ def main():
if not validate_config_lists( if not validate_config_lists(
system_item_list=system_item_list, system_item_list=system_item_list,
system_misc_info_keys=system_misc_info_keys,
other_item_list=other_item_list): other_item_list=other_item_list):
sys.exit(1) sys.exit(1)