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

Merge "Make output of MakeVbmeta consistent" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-04-15 22:27:36 +00:00
committed by Gerrit Code Review
parent 8f9ca8075f 1d9b3daad2
commit 8b1e29ae7e
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/releasetools/add_img_to_target_files.py
View File

@@ -1055,20 +1055,6 @@ def AddImagesToTargetFiles(filename):
for call in add_partition_calls:
add_partition(*call)
else:
# When calling avbtool make_vbmeta_image, it uses the `partitions`
# dictionary to include the options for --include_descriptors_from_image.
# The vbmeta image is different if the order of the
# --include_descriptors_from_image changes. As the images are generated
# parallelly and entries are added on completion of image creation,
# this `partitions` dict might be indeterministic as the order of
# completion of image creation cannot be predicted.
# To address this issue, add keys to the dict `partitions` with null values
# in the order they are listed in the variable `add_partition_calls`, and
# then the values are updated by `add_partition` keeping the order of the
# items. This ensures generated vbmeta.img is the same for the same input.
for call in add_partition_calls:
if call[1]:
partitions[call[0]] = None
with ThreadPoolExecutor(max_workers=len(add_partition_calls)) as executor:
for future in [executor.submit(add_partition, *call) for call in add_partition_calls]:
future.result()

4
tools/releasetools/common.py
View File

@@ -1524,7 +1524,7 @@ def GetAvbPartitionsArg(partitions,
AVB_ARG_NAME_CHAIN_PARTITION: []
}
for partition, path in partitions.items():
for partition, path in sorted(partitions.items()):
avb_partition_arg = GetAvbPartitionArg(partition, path, info_dict)
if not avb_partition_arg:
continue
@@ -1612,7 +1612,7 @@ def BuildVBMeta(image_path, partitions, name, needed_partitions,
"avb_custom_vbmeta_images_partition_list", "").strip().split()]
avb_partitions = {}
for partition, path in partitions.items():
for partition, path in sorted(partitions.items()):
if partition not in needed_partitions:
continue
assert (partition in AVB_PARTITIONS or