mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
report-error.bbclass: add local.conf/auto.conf into error report
sometimes, it is not enough to reproduce a failed build with current info on error reports web, add local.conf/auto.conf into error report to make it more easier to reproduce failed build Note: this need work together with change in repo error-report-web, which will display local.conf and auto.conf as Error Details [YOCTO #13252] (From OE-Core rev: 7adf9707c04d8ef6bcd8d8bda555687f705e6ee6) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9a6cfc0fee
commit
0f866a92e1
@@ -25,6 +25,19 @@ def errorreport_savedata(e, newdata, file):
|
|||||||
json.dump(newdata, f, indent=4, sort_keys=True)
|
json.dump(newdata, f, indent=4, sort_keys=True)
|
||||||
return datafile
|
return datafile
|
||||||
|
|
||||||
|
def get_conf_data(e, filename):
|
||||||
|
builddir = e.data.getVar('TOPDIR')
|
||||||
|
filepath = os.path.join(builddir, "conf", filename)
|
||||||
|
jsonstring = ""
|
||||||
|
if os.path.exists(filepath):
|
||||||
|
with open(filepath, 'r') as f:
|
||||||
|
for line in f.readlines():
|
||||||
|
if line.startswith("#") or len(line.strip()) == 0:
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
jsonstring=jsonstring + line
|
||||||
|
return jsonstring
|
||||||
|
|
||||||
python errorreport_handler () {
|
python errorreport_handler () {
|
||||||
import json
|
import json
|
||||||
import codecs
|
import codecs
|
||||||
@@ -51,6 +64,8 @@ python errorreport_handler () {
|
|||||||
data['failures'] = []
|
data['failures'] = []
|
||||||
data['component'] = " ".join(e.getPkgs())
|
data['component'] = " ".join(e.getPkgs())
|
||||||
data['branch_commit'] = str(base_detect_branch(e.data)) + ": " + str(base_detect_revision(e.data))
|
data['branch_commit'] = str(base_detect_branch(e.data)) + ": " + str(base_detect_revision(e.data))
|
||||||
|
data['local_conf'] = get_conf_data(e, 'local.conf')
|
||||||
|
data['auto_conf'] = get_conf_data(e, 'auto.conf')
|
||||||
lock = bb.utils.lockfile(datafile + '.lock')
|
lock = bb.utils.lockfile(datafile + '.lock')
|
||||||
errorreport_savedata(e, data, "error-report.txt")
|
errorreport_savedata(e, data, "error-report.txt")
|
||||||
bb.utils.unlockfile(lock)
|
bb.utils.unlockfile(lock)
|
||||||
|
|||||||
Reference in New Issue
Block a user