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

Merge "Switch from minigzip to gzip." into main

Browse Source
This commit is contained in:
Elliott Hughes
2023-07-11 15:52:27 +00:00
committed by Gerrit Code Review
parent db2c2d2377 97ad120adb
commit c1577ff58b
8 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/common.py
View File

@@ -985,7 +985,7 @@ class PartitionBuildProps(object):
each of the variables.
ramdisk_format: If name is "boot", the format of ramdisk inside the
boot image. Otherwise, its value is ignored.
Use lz4 to decompress by default. If its value is gzip, use minigzip.
Use lz4 to decompress by default. If its value is gzip, use gzip.
"""
def __init__(self, input_file, name, placeholder_values=None):
@@ -1638,9 +1638,9 @@ def _MakeRamdisk(sourcedir, fs_config_file=None,
p2 = Run(["lz4", "-l", "-12", "--favor-decSpeed"], stdin=p1.stdout,
stdout=ramdisk_img.file.fileno())
elif ramdisk_format == RamdiskFormat.GZ:
p2 = Run(["minigzip"], stdin=p1.stdout, stdout=ramdisk_img.file.fileno())
p2 = Run(["gzip"], stdin=p1.stdout, stdout=ramdisk_img.file.fileno())
else:
raise ValueError("Only support lz4 or minigzip ramdisk format.")
raise ValueError("Only support lz4 or gzip ramdisk format.")
p2.wait()
p1.wait()
@@ -4075,7 +4075,7 @@ def GetBootImageBuildProp(boot_img, ramdisk_format=RamdiskFormat.LZ4):
Get build.prop from ramdisk within the boot image
Args:
boot_img: the boot image file. Ramdisk must be compressed with lz4 or minigzip format.
boot_img: the boot image file. Ramdisk must be compressed with lz4 or gzip format.
Return:
An extracted file that stores properties in the boot image.
@@ -4094,11 +4094,11 @@ def GetBootImageBuildProp(boot_img, ramdisk_format=RamdiskFormat.LZ4):
elif ramdisk_format == RamdiskFormat.GZ:
with open(ramdisk, 'rb') as input_stream:
with open(uncompressed_ramdisk, 'wb') as output_stream:
p2 = Run(['minigzip', '-d'], stdin=input_stream.fileno(),
p2 = Run(['gzip', '-d'], stdin=input_stream.fileno(),
stdout=output_stream.fileno())
p2.wait()
else:
logger.error('Only support lz4 or minigzip ramdisk format.')
logger.error('Only support lz4 or gzip ramdisk format.')
return None
abs_uncompressed_ramdisk = os.path.abspath(uncompressed_ramdisk)