aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-02-15 09:13:03 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-15 16:28:45 +0000
commit2eb19cc72370c5643025ddd78d8711e9e9e3415f (patch)
tree7c2c203bdc5ea6e8577efdf990b98495d0f9bd05
parent1a3204c96519071cdee53e6a5d634279e61218c4 (diff)
downloadopenembedded-core-contrib-2eb19cc72370c5643025ddd78d8711e9e9e3415f.tar.gz
classes/buildhistory: fix for python function parsing change
Variable expressions are no longer expanded in python functions as of BitBake commit 8bf33a8e92c0e188fa392030025756196c96fcbb, so we've now got to do this explicitly here. (From OE-Core rev: 60fd4ff61a4ad240a89d48553002901c10e93178) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/buildhistory.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index a5a85ff4fc..4854862a6e 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -538,7 +538,7 @@ python buildhistory_get_extra_sdkinfo() {
if d.getVar('BB_CURRENTTASK', True) == 'populate_sdk_ext':
tasksizes = {}
filesizes = {}
- for root, _, files in os.walk('${SDK_OUTPUT}/${SDKPATH}/sstate-cache'):
+ for root, _, files in os.walk(d.expand('${SDK_OUTPUT}/${SDKPATH}/sstate-cache')):
for fn in files:
if fn.endswith('.tgz'):
fsize = int(math.ceil(float(os.path.getsize(os.path.join(root, fn))) / 1024))
@@ -546,11 +546,11 @@ python buildhistory_get_extra_sdkinfo() {
origtotal = tasksizes.get(task, 0)
tasksizes[task] = origtotal + fsize
filesizes[fn] = fsize
- with open('${BUILDHISTORY_DIR_SDK}/sstate-package-sizes.txt', 'w') as f:
+ with open(d.expand('${BUILDHISTORY_DIR_SDK}/sstate-package-sizes.txt'), 'w') as f:
filesizes_sorted = sorted(filesizes.items(), key=operator.itemgetter(1), reverse=True)
for fn, size in filesizes_sorted:
f.write('%10d KiB %s\n' % (size, fn))
- with open('${BUILDHISTORY_DIR_SDK}/sstate-task-sizes.txt', 'w') as f:
+ with open(d.expand('${BUILDHISTORY_DIR_SDK}/sstate-task-sizes.txt'), 'w') as f:
tasksizes_sorted = sorted(tasksizes.items(), key=operator.itemgetter(1), reverse=True)
for task, size in tasksizes_sorted:
f.write('%10d KiB %s\n' % (size, task))