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

Merge "Fix custom image OTA generation with extracted target files" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-27 16:56:17 +00:00
committed by Gerrit Code Review
parent dd1ebe9300 0fda62973b
commit aad75f8f1b
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/releasetools/ota_from_target_files.py
View File

@@ -728,47 +728,33 @@ def GetTargetFilesZipForRetrofitDynamicPartitions(input_file,
return input_file return input_file
def GetTargetFilesZipForCustomImagesUpdates(input_file, custom_images): def GetTargetFilesZipForCustomImagesUpdates(input_file, custom_images: dict):
"""Returns a target-files.zip for custom partitions update. """Returns a target-files.zip for custom partitions update.
This function modifies ab_partitions list with the desired custom partitions This function modifies ab_partitions list with the desired custom partitions
and puts the custom images into the target target-files.zip. and puts the custom images into the target target-files.zip.
Args: Args:
input_file: The input target-files.zip filename. input_file: The input target-files extracted directory
custom_images: A map of custom partitions and custom images. custom_images: A map of custom partitions and custom images.
Returns: Returns:
The filename of a target-files.zip which has renamed the custom images in The extracted dir of a target-files.zip which has renamed the custom images
the IMAGES/ to their partition names. in the IMAGES/ to their partition names.
""" """
for custom_image in custom_images.values():
if not os.path.exists(os.path.join(input_file, "IMAGES", custom_image)):
raise ValueError("Specified custom image {} not found in target files {}, available images are {}",
custom_image, input_file, os.listdir(os.path.join(input_file, "IMAGES")))
# First pass: use zip2zip to copy the target files contents, excluding
# the "custom" images that will be replaced.
target_file = common.MakeTempFile(prefix="targetfiles-", suffix=".zip")
cmd = ['zip2zip', '-i', input_file, '-o', target_file]
images = {}
for custom_partition, custom_image in custom_images.items(): for custom_partition, custom_image in custom_images.items():
default_custom_image = '{}.img'.format(custom_partition) default_custom_image = '{}.img'.format(custom_partition)
if default_custom_image != custom_image: if default_custom_image != custom_image:
src = 'IMAGES/' + custom_image src = os.path.join(input_file, 'IMAGES', custom_image)
dst = 'IMAGES/' + default_custom_image dst = os.path.join(input_file, 'IMAGES', default_custom_image)
cmd.extend(['-x', dst]) os.rename(src, dst)
images[dst] = src
common.RunAndCheckOutput(cmd) return input_file
# Second pass: write {custom_image}.img as {custom_partition}.img.
with zipfile.ZipFile(input_file, allowZip64=True) as input_zip:
with zipfile.ZipFile(target_file, 'a', allowZip64=True) as output_zip:
for dst, src in images.items():
data = input_zip.read(src)
logger.info("Update custom partition '%s'", dst)
common.ZipWriteStr(output_zip, dst, data)
output_zip.close()
return target_file
def GeneratePartitionTimestampFlags(partition_state): def GeneratePartitionTimestampFlags(partition_state):
@@ -1238,7 +1224,7 @@ def main(argv):
if len(words) == 2: if len(words) == 2:
if not words[1].isdigit(): if not words[1].isdigit():
raise ValueError("Cannot parse value %r for option $COMPRESSION_LEVEL - only " raise ValueError("Cannot parse value %r for option $COMPRESSION_LEVEL - only "
"integers are allowed." % words[1]) "integers are allowed." % words[1])
elif o == "--security_patch_level": elif o == "--security_patch_level":
OPTIONS.security_patch_level = a OPTIONS.security_patch_level = a
elif o in ("--max_threads"): elif o in ("--max_threads"):