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

Merge "Avoid repeated building of erofs image"

Browse Source
This commit is contained in:
Yifan Hong
2021-09-11 00:05:45 +00:00
committed by Gerrit Code Review
parent 08472a6b4b ffa1d57819
commit 1ab1c2ff96
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/releasetools/build_image.py
View File

@@ -451,18 +451,19 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
verity_image_builder = verity_utils.CreateVerityImageBuilder(prop_dict) verity_image_builder = verity_utils.CreateVerityImageBuilder(prop_dict)
disable_sparse = "disable_sparse" in prop_dict disable_sparse = "disable_sparse" in prop_dict
mkfs_output = None
if (prop_dict.get("use_dynamic_partition_size") == "true" and if (prop_dict.get("use_dynamic_partition_size") == "true" and
"partition_size" not in prop_dict): "partition_size" not in prop_dict):
# If partition_size is not defined, use output of `du' + reserved_size. # If partition_size is not defined, use output of `du' + reserved_size.
# For compressed file system, it's better to use the compressed size to avoid wasting space. # For compressed file system, it's better to use the compressed size to avoid wasting space.
if fs_type.startswith("erofs"): if fs_type.startswith("erofs"):
tmp_dict = prop_dict.copy() mkfs_output = BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config)
if "erofs_sparse_flag" in tmp_dict: if "erofs_sparse_flag" in prop_dict and not disable_sparse:
tmp_dict.pop("erofs_sparse_flag") image_path = UnsparseImage(out_file, replace=False)
BuildImageMkfs(in_dir, tmp_dict, out_file, target_out, fs_config) size = GetDiskUsage(image_path)
size = GetDiskUsage(out_file) os.remove(image_path)
os.remove(out_file) else:
size = GetDiskUsage(out_file)
else: else:
size = GetDiskUsage(in_dir) size = GetDiskUsage(in_dir)
logger.info( logger.info(
@@ -550,7 +551,8 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
max_image_size = verity_image_builder.CalculateMaxImageSize() max_image_size = verity_image_builder.CalculateMaxImageSize()
prop_dict["image_size"] = str(max_image_size) prop_dict["image_size"] = str(max_image_size)
mkfs_output = BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config) if not mkfs_output:
mkfs_output = BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config)
# Check if there's enough headroom space available for ext4 image. # Check if there's enough headroom space available for ext4 image.
if "partition_headroom" in prop_dict and fs_type.startswith("ext4"): if "partition_headroom" in prop_dict and fs_type.startswith("ext4"):