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

releasetools: Fix image size checking

Browse Source 
A block of code that should be evaluated for all
image types was instead only being run for yaffs
partitions.

Change-Id: I83ccbd7fa3c1bc02b9bba0832701ecc258e40a7d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie
2012-02-14 09:32:52 -08:00
committed by Doug Zongker
parent 6bfa911394
commit 0f9aec837f
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tools/releasetools/common.py
View File

@@ -390,24 +390,27 @@ def CheckSize(data, target, info_dict):
if mount_point == "/userdata": mount_point = "/data" if mount_point == "/userdata": mount_point = "/data"
p = info_dict["fstab"][mount_point] p = info_dict["fstab"][mount_point]
fs_type = p.fs_type fs_type = p.fs_type
limit = info_dict.get(p.device + "_size", None) device = p.device
if "/" in device:
device = device[device.rfind("/")+1:]
limit = info_dict.get(device + "_size", None)
if not fs_type or not limit: return if not fs_type or not limit: return
if fs_type == "yaffs2": if fs_type == "yaffs2":
# image size should be increased by 1/64th to account for the # image size should be increased by 1/64th to account for the
# spare area (64 bytes per 2k page) # spare area (64 bytes per 2k page)
limit = limit / 2048 * (2048+64) limit = limit / 2048 * (2048+64)
size = len(data) size = len(data)
pct = float(size) * 100.0 / limit pct = float(size) * 100.0 / limit
msg = "%s size (%d) is %.2f%% of limit (%d)" % (target, size, pct, limit) msg = "%s size (%d) is %.2f%% of limit (%d)" % (target, size, pct, limit)
if pct >= 99.0: if pct >= 99.0:
raise ExternalError(msg) raise ExternalError(msg)
elif pct >= 95.0: elif pct >= 95.0:
print print
print " WARNING: ", msg print " WARNING: ", msg
print print
elif OPTIONS.verbose: elif OPTIONS.verbose:
print " ", msg print " ", msg
def ReadApkCerts(tf_zip): def ReadApkCerts(tf_zip):