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

Merge changes Ic8ef968e,I6665bd6f

Browse Source 
am: e093534aba

Change-Id: Id1fb5375a22ba12c748b4ec99a04e4860697a751
This commit is contained in:
Mark Salyzyn
2019-01-11 09:34:51 -08:00
committed by android-build-merger
parent 4b8374322b e093534aba
commit 2907f67255
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/releasetools/build_image.py
View File

@@ -79,22 +79,26 @@ def GetInodeUsage(path):
return output.count('\n') * 2 return output.count('\n') * 2
def GetFilesystemCharacteristics(sparse_image_path): def GetFilesystemCharacteristics(image_path, sparse_image=True):
"""Returns various filesystem characteristics of "sparse_image_path". """Returns various filesystem characteristics of "image_path".
Args: Args:
sparse_image_path: The file to analyze. image_path: The file to analyze.
sparse_image: Image is sparse
Returns: Returns:
The characteristics dictionary. The characteristics dictionary.
""" """
unsparse_image_path = UnsparseImage(sparse_image_path, replace=False) unsparse_image_path = image_path
if sparse_image:
unsparse_image_path = UnsparseImage(image_path, replace=False)
cmd = ["tune2fs", "-l", unsparse_image_path] cmd = ["tune2fs", "-l", unsparse_image_path]
try: try:
output = common.RunAndCheckOutput(cmd, verbose=False) output = common.RunAndCheckOutput(cmd, verbose=False)
finally: finally:
os.remove(unsparse_image_path) if sparse_image:
os.remove(unsparse_image_path)
fs_dict = {} fs_dict = {}
for line in output.splitlines(): for line in output.splitlines():
fields = line.split(":") fields = line.split(":")
@@ -414,7 +418,10 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
"First Pass based on estimates of %d MB and %s inodes.", "First Pass based on estimates of %d MB and %s inodes.",
size // BYTES_IN_MB, prop_dict["extfs_inode_count"]) size // BYTES_IN_MB, prop_dict["extfs_inode_count"])
BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config) BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config)
fs_dict = GetFilesystemCharacteristics(out_file) sparse_image = False
if "extfs_sparse_flag" in prop_dict:
sparse_image = True
fs_dict = GetFilesystemCharacteristics(out_file, sparse_image)
os.remove(out_file) os.remove(out_file)
block_size = int(fs_dict.get("Block size", "4096")) block_size = int(fs_dict.get("Block size", "4096"))
free_size = int(fs_dict.get("Free blocks", "0")) * block_size free_size = int(fs_dict.get("Free blocks", "0")) * block_size
@@ -428,16 +435,21 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
else: else:
size -= free_size size -= free_size
size += reserved_size size += reserved_size
if reserved_size == 0:
# add .2% margin
size = size * 1002 // 1000
# Use a minimum size, otherwise we will fail to calculate an AVB footer
# or fail to construct an ext4 image.
size = max(size, 256 * 1024)
if block_size <= 4096: if block_size <= 4096:
size = common.RoundUpTo4K(size) size = common.RoundUpTo4K(size)
else: else:
size = ((size + block_size - 1) // block_size) * block_size size = ((size + block_size - 1) // block_size) * block_size
# Use a minimum size, otherwise we will fail to calculate an AVB footer
# or fail to construct an ext4 image.
size = max(size, 256 * 1024)
extfs_inode_count = prop_dict["extfs_inode_count"] extfs_inode_count = prop_dict["extfs_inode_count"]
inodes = int(fs_dict.get("Inode count", extfs_inode_count)) inodes = int(fs_dict.get("Inode count", extfs_inode_count))
inodes -= int(fs_dict.get("Free inodes", "0")) inodes -= int(fs_dict.get("Free inodes", "0"))
# add .2% margin
inodes = inodes * 1002 // 1000
prop_dict["extfs_inode_count"] = str(inodes) prop_dict["extfs_inode_count"] = str(inodes)
prop_dict["partition_size"] = str(size) prop_dict["partition_size"] = str(size)
logger.info( logger.info(