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

Revert "Add modules partition."

Browse Source 
Revert submission 1413808-modules_partition

Reason for revert: modules partition no longer needed
Reverted Changes:
Iceafebd85:Add modules partition
I2fa96199a:rootdir: Add modules directory
Ie397b9ec6:Add modules partition.
I4200d0cf5:fastboot: add modules partition

Bug: 163543381

Change-Id: Iec1d9421bbfeb114fb705f85d910c6def1f211b6
This commit is contained in:
Yifan Hong
2020-09-15 19:07:39 +00:00
parent c0f187f5f9
commit c08cbf0f4a
10 changed files with 5 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/releasetools/build_image.py
View File

@@ -754,22 +754,6 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
d["extfs_rsv_pct"] = "0"
copy_prop("odm_dlkm_reserved_size", "partition_reserved_size")
copy_prop("odm_dlkm_selinux_fc", "selinux_fc")
elif mount_point == "modules":
# modules partition has no AVB.
copy_prop("modules_fs_type", "fs_type")
copy_prop("modules_size", "partition_size")
if not copy_prop("modules_journal_size", "journal_size"):
d["journal_size"] = "0"
# not setting ext4_share_dup_blocks because modules partition is writable.
copy_prop("modules_squashfs_compressor", "squashfs_compressor")
copy_prop("modules_squashfs_compressor_opt", "squashfs_compressor_opt")
copy_prop("modules_squashfs_block_size", "squashfs_block_size")
copy_prop("modules_squashfs_disable_4k_align", "squashfs_disable_4k_align")
copy_prop("modules_extfs_inode_count", "extfs_inode_count")
if not copy_prop("modules_extfs_rsv_pct", "extfs_rsv_pct"):
d["extfs_rsv_pct"] = "0"
copy_prop("modules_reserved_size", "partition_reserved_size")
copy_prop("modules_selinux_fc", "selinux_fc")
elif mount_point == "oem":
copy_prop("fs_type", "fs_type")
copy_prop("oem_size", "partition_size")
@@ -822,8 +806,6 @@ def GlobalDictFromImageProp(image_prop, mount_point):
copy_prop("partition_size", "product_size")
elif mount_point == "system_ext":
copy_prop("partition_size", "system_ext_size")
elif mount_point == "modules":
copy_prop("partition_size", "modules_size")
return d
@@ -869,8 +851,6 @@ def main(argv):
mount_point = "product"
elif image_filename == "system_ext.img":
mount_point = "system_ext"
elif image_filename == "modules.img":
mount_point = "modules"
else:
logger.error("Unknown image file name %s", image_filename)
sys.exit(1)