diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2017-08-17 11:00:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 23:46:37 +0100 |
commit | 0c733631d69973d24a950cbd5098d326572ce988 (patch) | |
tree | 427368099c23494449227d8002941b2b63f91249 /meta | |
parent | e461f32d6823aeecbe3ee8090588737c9d67e91f (diff) | |
download | poky-0c733631d69973d24a950cbd5098d326572ce988.tar.gz |
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 <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/report-error.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
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 () { | |||
29 | import json | 29 | import json |
30 | import codecs | 30 | import codecs |
31 | 31 | ||
32 | def nativelsb(): | ||
33 | nativelsbstr = e.data.getVar("NATIVELSBSTRING") | ||
34 | # provide a bit more host info in case of uninative build | ||
35 | if e.data.getVar('UNINATIVE_URL') != 'unset': | ||
36 | return '/'.join([nativelsbstr, lsb_distro_identifier(e.data)]) | ||
37 | return nativelsbstr | ||
38 | |||
32 | logpath = e.data.getVar('ERR_REPORT_DIR') | 39 | logpath = e.data.getVar('ERR_REPORT_DIR') |
33 | datafile = os.path.join(logpath, "error-report.txt") | 40 | datafile = os.path.join(logpath, "error-report.txt") |
34 | 41 | ||
@@ -38,7 +45,7 @@ python errorreport_handler () { | |||
38 | machine = e.data.getVar("MACHINE") | 45 | machine = e.data.getVar("MACHINE") |
39 | data['machine'] = machine | 46 | data['machine'] = machine |
40 | data['build_sys'] = e.data.getVar("BUILD_SYS") | 47 | data['build_sys'] = e.data.getVar("BUILD_SYS") |
41 | data['nativelsb'] = e.data.getVar("NATIVELSBSTRING") | 48 | data['nativelsb'] = nativelsb() |
42 | data['distro'] = e.data.getVar("DISTRO") | 49 | data['distro'] = e.data.getVar("DISTRO") |
43 | data['target_sys'] = e.data.getVar("TARGET_SYS") | 50 | data['target_sys'] = e.data.getVar("TARGET_SYS") |
44 | data['failures'] = [] | 51 | data['failures'] = [] |