From 9f3681dca555c1520ca33ca25ff75e8ba3caee80 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Dec 2015 13:50:04 +0000 Subject: 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 --- meta/classes/buildstats-summary.bbclass | 3 +-- meta/classes/toaster.bbclass | 4 +--- 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 () { import collections import os.path - bn = get_bn(e) - bsdir = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), bn) + bsdir = e.data.expand("${BUILDSTATS_BASE}/${BUILDNAME}") if not os.path.exists(bsdir): return 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() { lock = bb.utils.lockfile(e.data.expand("${TOPDIR}/toaster.lock"), False, True) with open(os.path.join(e.data.getVar('BUILDSTATS_BASE', True), "toasterstatlist"), "a") as fout: - bn = get_bn(e) - bsdir = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), bn) - taskdir = os.path.join(bsdir, e.data.expand("${PF}")) + taskdir = e.data.expand("${BUILDSTATS_BASE}/${BUILDNAME}/${PF}") fout.write("%s::%s::%s::%s\n" % (e.taskfile, e.taskname, os.path.join(taskdir, e.task), e.data.expand("${PN}"))) bb.utils.unlockfile(lock) -- cgit v1.2.3-54-g00ecf