diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-02-15 09:13:03 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-15 16:28:45 +0000 |
commit | 2eb19cc72370c5643025ddd78d8711e9e9e3415f (patch) | |
tree | 7c2c203bdc5ea6e8577efdf990b98495d0f9bd05 /meta/classes | |
parent | 1a3204c96519071cdee53e6a5d634279e61218c4 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 6 |
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() { | |||
538 | if d.getVar('BB_CURRENTTASK', True) == 'populate_sdk_ext': | 538 | if d.getVar('BB_CURRENTTASK', True) == 'populate_sdk_ext': |
539 | tasksizes = {} | 539 | tasksizes = {} |
540 | filesizes = {} | 540 | filesizes = {} |
541 | for root, _, files in os.walk('${SDK_OUTPUT}/${SDKPATH}/sstate-cache'): | 541 | for root, _, files in os.walk(d.expand('${SDK_OUTPUT}/${SDKPATH}/sstate-cache')): |
542 | for fn in files: | 542 | for fn in files: |
543 | if fn.endswith('.tgz'): | 543 | if fn.endswith('.tgz'): |
544 | fsize = int(math.ceil(float(os.path.getsize(os.path.join(root, fn))) / 1024)) | 544 | fsize = int(math.ceil(float(os.path.getsize(os.path.join(root, fn))) / 1024)) |
@@ -546,11 +546,11 @@ python buildhistory_get_extra_sdkinfo() { | |||
546 | origtotal = tasksizes.get(task, 0) | 546 | origtotal = tasksizes.get(task, 0) |
547 | tasksizes[task] = origtotal + fsize | 547 | tasksizes[task] = origtotal + fsize |
548 | filesizes[fn] = fsize | 548 | filesizes[fn] = fsize |
549 | with open('${BUILDHISTORY_DIR_SDK}/sstate-package-sizes.txt', 'w') as f: | 549 | with open(d.expand('${BUILDHISTORY_DIR_SDK}/sstate-package-sizes.txt'), 'w') as f: |
550 | filesizes_sorted = sorted(filesizes.items(), key=operator.itemgetter(1), reverse=True) | 550 | filesizes_sorted = sorted(filesizes.items(), key=operator.itemgetter(1), reverse=True) |
551 | for fn, size in filesizes_sorted: | 551 | for fn, size in filesizes_sorted: |
552 | f.write('%10d KiB %s\n' % (size, fn)) | 552 | f.write('%10d KiB %s\n' % (size, fn)) |
553 | with open('${BUILDHISTORY_DIR_SDK}/sstate-task-sizes.txt', 'w') as f: | 553 | with open(d.expand('${BUILDHISTORY_DIR_SDK}/sstate-task-sizes.txt'), 'w') as f: |
554 | tasksizes_sorted = sorted(tasksizes.items(), key=operator.itemgetter(1), reverse=True) | 554 | tasksizes_sorted = sorted(tasksizes.items(), key=operator.itemgetter(1), reverse=True) |
555 | for task, size in tasksizes_sorted: | 555 | for task, size in tasksizes_sorted: |
556 | f.write('%10d KiB %s\n' % (size, task)) | 556 | f.write('%10d KiB %s\n' % (size, task)) |