From f4e91404f8722b4fb1700e4c9fe13f0dfd7ebda3 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 2 Dec 2013 18:50:45 +0000 Subject: classes/package: record PKGSIZE as total file size in pkgdata We were using "du -sk" to collect the total size of all files in each package for writing out to PKGSIZE in each pkgdata file; however this reports the total space used on disk not the total size of all files, which means it is dependent on the block size and filesystem being used for TMPDIR on the build host. Instead, take the total of the size reported by lstat() for each packaged file, which we are already collecting for FILES_INFO in any case. Note: this changes PKGSIZE to be reported in bytes instead of kilobytes since this is what lstat reports, but this is really what we should be storing anyway so that we have the precision if we need it. Fixes [YOCTO #5334] (From OE-Core rev: 29615b36fca696822a715ece2afbe0bf9a43ed61) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'meta') diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index cce2499122..2eb970dac5 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1127,14 +1127,6 @@ python emit_pkgdata() { f.write('%s: %s\n' % (var, encode(val))) return - def get_directory_size(dir): - if os.listdir(dir): - with os.popen('du -sk %s' % dir) as f: - size = int(f.readlines()[0].split('\t')[0]) - else: - size = 0 - return size - def write_extra_pkgs(variants, pn, packages, pkgdatadir): for variant in variants: with open("%s/%s-%s" % (pkgdatadir, variant, pn), 'w') as fd: @@ -1181,9 +1173,11 @@ python emit_pkgdata() { pkgdestpkg = os.path.join(pkgdest, pkg) files = {} + total_size = 0 for f in pkgfiles[pkg]: relpth = os.path.relpath(f, pkgdestpkg) fstat = os.lstat(f) + total_size += fstat.st_size files[os.sep + relpth] = fstat.st_size d.setVar('FILES_INFO', json.dumps(files)) @@ -1220,7 +1214,7 @@ python emit_pkgdata() { for dfile in (d.getVar('FILERDEPENDSFLIST_' + pkg, True) or "").split(): write_if_exists(sf, pkg, 'FILERDEPENDS_' + dfile) - sf.write('%s_%s: %s\n' % ('PKGSIZE', pkg, get_directory_size(pkgdest + "/%s" % pkg))) + sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) sf.close() # Symlinks needed for reverse lookups (from the final package name) -- cgit v1.2.3-54-g00ecf