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

Add blocklist support for EROFS.

Browse Source 
This also fixes argument ordering for mkerofsimage.sh.

Bug: 201685920
Test: build OTA with erofs
Change-Id: Ic2ba794e37a0feb73a1028eb7522d35bffbf3af6
This commit is contained in:
David Anderson
2021-10-08 18:33:43 -07:00
parent 271dab6ceb
commit d29e5371e1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/build_image.py
View File

@@ -330,10 +330,6 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config):
build_command.extend(["-C", fs_config]) build_command.extend(["-C", fs_config])
if "selinux_fc" in prop_dict: if "selinux_fc" in prop_dict:
build_command.extend(["-c", prop_dict["selinux_fc"]]) build_command.extend(["-c", prop_dict["selinux_fc"]])
if "timestamp" in prop_dict:
build_command.extend(["-T", str(prop_dict["timestamp"])])
if "uuid" in prop_dict:
build_command.extend(["-U", prop_dict["uuid"]])
compressor = None compressor = None
if "erofs_default_compressor" in prop_dict: if "erofs_default_compressor" in prop_dict:
compressor = prop_dict["erofs_default_compressor"] compressor = prop_dict["erofs_default_compressor"]
@@ -341,6 +337,12 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config):
compressor = prop_dict["erofs_compressor"] compressor = prop_dict["erofs_compressor"]
if compressor: if compressor:
build_command.extend(["-z", compressor]) build_command.extend(["-z", compressor])
if "timestamp" in prop_dict:
build_command.extend(["-T", str(prop_dict["timestamp"])])
if "uuid" in prop_dict:
build_command.extend(["-U", prop_dict["uuid"]])
if "block_list" in prop_dict:
build_command.extend(["-B", prop_dict["block_list"]])
elif fs_type.startswith("squash"): elif fs_type.startswith("squash"):
build_command = ["mksquashfsimage.sh"] build_command = ["mksquashfsimage.sh"]
build_command.extend([in_dir, out_file]) build_command.extend([in_dir, out_file])