Skip to contentSkip to conversation

Fix buildhistory for python function parsing change

PATCH New Paul Eggleton 1 participant 2 messages Feb 14, 2016

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Fix buildhistory for python function parsing change

I wonder how many more of these are lurking...

The following changes since commit bd06944249c3de3f629c013e14f446464441c4da:

lib/oe/terminal: set workdir for konsole terminal (2016-02-13 08:27:18 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-parse
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-parse

Paul Eggleton (1):
classes/buildhistory: fix for python function parsing change

 meta/classes/buildhistory.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 1/1 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.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/buildhistory.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes/buildhistory.bbclass +3 -3
index a5a85ff..4854862 100644
@@ -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))
Signature · 1 line
2.5.0