summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-18 13:50:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-18 13:50:57 +0000
commit9f3681dca555c1520ca33ca25ff75e8ba3caee80 (patch)
tree875196258d634e58418287a1cce707a68426b927
parent522dcaa0cb6e099665a29ea1c585270563d33e94 (diff)
downloadpoky-9f3681dca555c1520ca33ca25ff75e8ba3caee80.tar.gz
buildstats-summary/toaster: Cope with removal of get_bn()
The buildstats changes removed the no longer needed get_bn() function, replace this with references to BUILDNAME. (From OE-Core rev: e1a37899da56014693f08d1c39cb6ec0a4ed2bf4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/buildstats-summary.bbclass3
-rw-r--r--meta/classes/toaster.bbclass4
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/buildstats-summary.bbclass b/meta/classes/buildstats-summary.bbclass
index 05ead9fdbf..d73350b940 100644
--- a/meta/classes/buildstats-summary.bbclass
+++ b/meta/classes/buildstats-summary.bbclass
@@ -3,8 +3,7 @@ python buildstats_summary () {
3 import collections 3 import collections
4 import os.path 4 import os.path
5 5
6 bn = get_bn(e) 6 bsdir = e.data.expand("${BUILDSTATS_BASE}/${BUILDNAME}")
7 bsdir = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), bn)
8 if not os.path.exists(bsdir): 7 if not os.path.exists(bsdir):
9 return 8 return
10 9
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index 7af495ed7c..4fb52a969e 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -189,9 +189,7 @@ python toaster_collect_task_stats() {
189 lock = bb.utils.lockfile(e.data.expand("${TOPDIR}/toaster.lock"), False, True) 189 lock = bb.utils.lockfile(e.data.expand("${TOPDIR}/toaster.lock"), False, True)
190 190
191 with open(os.path.join(e.data.getVar('BUILDSTATS_BASE', True), "toasterstatlist"), "a") as fout: 191 with open(os.path.join(e.data.getVar('BUILDSTATS_BASE', True), "toasterstatlist"), "a") as fout:
192 bn = get_bn(e) 192 taskdir = e.data.expand("${BUILDSTATS_BASE}/${BUILDNAME}/${PF}")
193 bsdir = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), bn)
194 taskdir = os.path.join(bsdir, e.data.expand("${PF}"))
195 fout.write("%s::%s::%s::%s\n" % (e.taskfile, e.taskname, os.path.join(taskdir, e.task), e.data.expand("${PN}"))) 193 fout.write("%s::%s::%s::%s\n" % (e.taskfile, e.taskname, os.path.join(taskdir, e.task), e.data.expand("${PN}")))
196 194
197 bb.utils.unlockfile(lock) 195 bb.utils.unlockfile(lock)