From 22fc34613bb5d2a5b1713de6ff0fe1fafb4949a7 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 19 Apr 2023 13:30:09 +0800 Subject: report-error: make it catch ParseError error Make the report-error catch ParseError error as below and then we can check it directly via error report web. ParseError at /build/layers/oe-core/meta/recipes-support/curl/curl_7.88.1.bb:32: unparsed line: 'PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver' (From OE-Core rev: dc22ac8b20cafbc517b7750dc3381c1a9a42cda4) Signed-off-by: Mingli Yu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/classes/report-error.bbclass | 52 +++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 2b2ad56514..1452513a66 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -39,6 +39,19 @@ def get_conf_data(e, filename): jsonstring=jsonstring + line return jsonstring +def get_common_data(e): + data = {} + data['machine'] = e.data.getVar("MACHINE") + data['build_sys'] = e.data.getVar("BUILD_SYS") + data['distro'] = e.data.getVar("DISTRO") + data['target_sys'] = e.data.getVar("TARGET_SYS") + data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data)) + data['bitbake_version'] = e.data.getVar("BB_VERSION") + data['layer_version'] = get_layers_branch_rev(e.data) + data['local_conf'] = get_conf_data(e, 'local.conf') + data['auto_conf'] = get_conf_data(e, 'auto.conf') + return data + python errorreport_handler () { import json import codecs @@ -56,19 +69,10 @@ python errorreport_handler () { if isinstance(e, bb.event.BuildStarted): bb.utils.mkdirhier(logpath) data = {} - machine = e.data.getVar("MACHINE") - data['machine'] = machine - data['build_sys'] = e.data.getVar("BUILD_SYS") + data = get_common_data(e) data['nativelsb'] = nativelsb() - data['distro'] = e.data.getVar("DISTRO") - data['target_sys'] = e.data.getVar("TARGET_SYS") data['failures'] = [] data['component'] = " ".join(e.getPkgs()) - data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data)) - data['bitbake_version'] = e.data.getVar("BB_VERSION") - data['layer_version'] = get_layers_branch_rev(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') errorreport_savedata(e, data, "error-report.txt") bb.utils.unlockfile(lock) @@ -110,19 +114,10 @@ python errorreport_handler () { elif isinstance(e, bb.event.NoProvider): bb.utils.mkdirhier(logpath) data = {} - machine = e.data.getVar("MACHINE") - data['machine'] = machine - data['build_sys'] = e.data.getVar("BUILD_SYS") + data = get_common_data(e) data['nativelsb'] = nativelsb() - data['distro'] = e.data.getVar("DISTRO") - data['target_sys'] = e.data.getVar("TARGET_SYS") data['failures'] = [] data['component'] = str(e._item) - data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data)) - data['bitbake_version'] = e.data.getVar("BB_VERSION") - data['layer_version'] = get_layers_branch_rev(e.data) - data['local_conf'] = get_conf_data(e, 'local.conf') - data['auto_conf'] = get_conf_data(e, 'auto.conf') taskdata={} taskdata['log'] = str(e) taskdata['package'] = str(e._item) @@ -132,6 +127,21 @@ python errorreport_handler () { errorreport_savedata(e, data, "error-report.txt") bb.utils.unlockfile(lock) + elif isinstance(e, bb.event.ParseError): + bb.utils.mkdirhier(logpath) + data = {} + data = get_common_data(e) + data['nativelsb'] = nativelsb() + data['failures'] = [] + data['component'] = "parse" + taskdata={} + taskdata['log'] = str(e._msg) + taskdata['task'] = str(e._msg) + data['failures'].append(taskdata) + lock = bb.utils.lockfile(datafile + '.lock') + errorreport_savedata(e, data, "error-report.txt") + bb.utils.unlockfile(lock) + elif isinstance(e, bb.event.BuildCompleted): lock = bb.utils.lockfile(datafile + '.lock') jsondata = json.loads(errorreport_getdata(e)) @@ -145,4 +155,4 @@ python errorreport_handler () { } addhandler errorreport_handler -errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider" +errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider bb.event.ParseError" -- cgit v1.2.3-54-g00ecf