From 0c733631d69973d24a950cbd5098d326572ce988 Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Thu, 17 Aug 2017 11:00:36 -0700 Subject: report-error: provide distro identifier string in case of uninative build Besides providing the NATIVELSBSTRING, include distro info when creating the (json) error report. This information provides better info than the standard 'universal*' string for uninative builds. [YOCTO #11824] (From OE-Core rev: fdfbfc954a3e0ad79dc2bed9828f9f5dc40d506f) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/classes/report-error.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index d6fdd364ad..1c55abfbf3 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -29,6 +29,13 @@ python errorreport_handler () { import json import codecs + def nativelsb(): + nativelsbstr = e.data.getVar("NATIVELSBSTRING") + # provide a bit more host info in case of uninative build + if e.data.getVar('UNINATIVE_URL') != 'unset': + return '/'.join([nativelsbstr, lsb_distro_identifier(e.data)]) + return nativelsbstr + logpath = e.data.getVar('ERR_REPORT_DIR') datafile = os.path.join(logpath, "error-report.txt") @@ -38,7 +45,7 @@ python errorreport_handler () { machine = e.data.getVar("MACHINE") data['machine'] = machine data['build_sys'] = e.data.getVar("BUILD_SYS") - data['nativelsb'] = e.data.getVar("NATIVELSBSTRING") + data['nativelsb'] = nativelsb() data['distro'] = e.data.getVar("DISTRO") data['target_sys'] = e.data.getVar("TARGET_SYS") data['failures'] = [] -- cgit v1.2.3-54-g00ecf