diff options
5 files changed, 246 insertions, 5 deletions
diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 2b2ad56514..85b7a182ae 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -8,6 +8,12 @@ # ERR_REPORT_DIR ?= "${LOG_DIR}/error-report" +ERR_REPORT_PORT ?= "80" + +ERR_REPORT_UPLOAD_FAILURES[type] = "boolean" +ERR_REPORT_UPLOAD_FAILURES ?= "0" +ERR_REPORT_UPLOAD_ALL[type] = "boolean" +ERR_REPORT_UPLOAD_ALL ?= "0" def errorreport_getdata(e): import codecs @@ -37,8 +43,100 @@ def get_conf_data(e, filename): continue else: jsonstring=jsonstring + line + jsonstring = jsonstring.replace("<", "<").replace(">", ">") return jsonstring +def errorreport_get_user_info(e): + """ + Read user info from variables or from git config + """ + import subprocess + username = e.data.getVar('ERR_REPORT_USERNAME') + email = e.data.getVar('ERR_REPORT_EMAIL') + if not username or not email: + # try to read them from git config + username = str(subprocess.check_output(['git', 'config', '--get', 'user.name']).decode("utf-8")).strip() + email = str(subprocess.check_output(['git', 'config', '--get', 'user.email']).decode("utf-8")).strip() + return (username, email) + +def errorreport_get_submit_info(e): + """ + Read submit info from ~/.oe-send-error or ask interactively and save it there. + """ + home = os.path.expanduser("~") + userfile = os.path.join(home, ".oe-send-error") + if os.path.isfile(userfile): + with open(userfile) as g: + username = g.readline() + email = g.readline() + else: + print("Please enter your name and your email (optionally), they'll be saved in the file you send.") + username = raw_input("Name: ") + email = raw_input("E-mail (not required): ") + server = raw_input("Server: ") + port = raw_input("Port: ") + if len(username) > 0 and len(username) < 50: + with open(userfile, "w") as g: + g.write(username + "\n") + g.write(email + "\n") + g.write(server + "\n") + g.write(port + "\n") + else: + print("Invalid inputs, try again.") + return errorreport_get_submit_info() + return (username, email, server, port) + +def errorreport_senddata(e, json_file): + """ + From scripts/send-error-report to automate report submissions. + """ + + import os, json + + if os.path.isfile(json_file): + server = e.data.getVar('ERR_REPORT_SERVER') + port = e.data.getVar('ERR_REPORT_PORT') + bb.note("Uploading the report %s to %s:%s" % (json_file, server, port)) + + with open(json_file) as f: + data = f.read() + + try: + jsondata = json.loads(data) + if not jsondata['username'] or not server: + (username, email, server, port) = errorreport_get_submit_info(e) + jsondata['username'] = username.strip() + jsondata['email'] = email.strip() + jsondata['link_back'] = "" + #json.dump(jsondata, json_file, indent=4, sort_keys=True) + # data = json.dumps(jsondata, indent=4, sort_keys=True) + except Exception as e: + bb.error("Invalid json data: %s" % e) + return + + try: + url = "http://%s/ClientPost/" % (server) + import urllib.request, urllib.error + version = "0.3" + headers={'Content-type': 'application/json', 'User-Agent': "send-error-report/"+version} + #headers={'Content-type': 'application/json', 'User-Agent': "report-error.bbclass/"+version} + with open(json_file, 'r') as json_fp: + data = json_fp.read().encode('utf-8') + req = urllib.request.Request(url, data=data, headers=headers) + try: + response = urllib.request.urlopen(req) + if response.getcode() == 200: + bb.note("Report submitted: %s %s" % (response.getcode(), response.read().decode('utf-8'))) + else: + bb.warn("There was a problem submiting your data: %s" % response.read()) + except urllib.error.HTTPError as e: + bb.warn("There was a problem submiting your data: %s" % e) + except Exception as e: + bb.warn("Server connection failed %s" % e) + + else: + bb.warn("No data file found.") + python errorreport_handler () { import json import codecs @@ -70,6 +168,9 @@ python errorreport_handler () { data['local_conf'] = get_conf_data(e, 'local.conf') data['auto_conf'] = get_conf_data(e, 'auto.conf') lock = bb.utils.lockfile(datafile + '.lock') + (username, email) = errorreport_get_user_info(e) + data['username'] = username.strip() + data['email'] = email.strip() errorreport_savedata(e, data, "error-report.txt") bb.utils.unlockfile(lock) @@ -136,12 +237,17 @@ python errorreport_handler () { lock = bb.utils.lockfile(datafile + '.lock') jsondata = json.loads(errorreport_getdata(e)) bb.utils.unlockfile(lock) + upload_failures = oe.data.typed_value('ERR_REPORT_UPLOAD_FAILURES', e.data) + upload_all = oe.data.typed_value('ERR_REPORT_UPLOAD_ALL', e.data) failures = jsondata['failures'] - if(len(failures) > 0): + if(len(failures) > 0 or upload_all): filename = "error_report_" + e.data.getVar("BUILDNAME")+".txt" datafile = errorreport_savedata(e, jsondata, filename) - bb.note("The errors for this build are stored in %s\nYou can send the errors to a reports server by running:\n send-error-report %s [-s server]" % (datafile, datafile)) - bb.note("The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending.") + if upload_all or (failures and upload_failures): + errorreport_senddata(e, datafile) + else: + bb.note("The errors for this build are stored in %s\nYou can send the errors to a reports server by running:\n send-error-report %s [-s server]" % (datafile, datafile)) + bb.note("The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending.") } addhandler errorreport_handler diff --git a/meta/conf/templates/default/local.conf.sample.extended b/meta/conf/templates/default/local.conf.sample.extended index a898b18d59..454010aaf0 100644 --- a/meta/conf/templates/default/local.conf.sample.extended +++ b/meta/conf/templates/default/local.conf.sample.extended @@ -387,3 +387,23 @@ # Set PS1 for SDK # #SDK_PS1 ?= "${SDK_NAME}${SDK_VENDOR}:\$ " + +# Uploading reports with report-error.bbclass +# +# Allow to automatically upload the reports without developer calling extra script to upload them. +# +# ERR_REPORT_SERVER = "errors.test.ltd" +# ERR_REPORT_PORT = "8000" +# +# Username if you don't want to use "git config --get user.name" +# ERR_REPORT_USERNAME = "Tester" +# E-mail if you don't want to use "git config --get user.email" +# ERR_REPORT_EMAIL = "tester@test.ltd" +# +# Upload reports from failed builds +# ERR_REPORT_UPLOAD_FAILURES = "1" +# +# Upload reports from all builds, not only those with failures +# ERR_REPORT_UPLOAD_ALL = "1" +# +# INHERIT += "report-error" diff --git a/meta/recipes-core/libxcrypt/files/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch b/meta/recipes-core/libxcrypt/files/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch new file mode 100644 index 0000000000..b3e43d5815 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch @@ -0,0 +1,50 @@ +From c3ec04f1aee68970b82e4b033bee1477e76798f9 Mon Sep 17 00:00:00 2001 +From: Leon Timmermans <fawaka@gmail.com> +Date: Tue, 6 Jun 2023 17:03:57 +0200 +Subject: [PATCH] Make BuildCommon.pm compatible with latest perl + +It was previously using an experimental feature that has since been dropped. +This removes the use of that feature. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [v4.4.35 https://github.com/besser82/libxcrypt/commit/ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c] +--- + build-aux/scripts/BuildCommon.pm | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/build-aux/scripts/BuildCommon.pm b/build-aux/scripts/BuildCommon.pm +index 0e6f2a3..c38ba21 100644 +--- a/build-aux/scripts/BuildCommon.pm ++++ b/build-aux/scripts/BuildCommon.pm +@@ -11,7 +11,6 @@ use v5.14; # implicit use strict, use feature ':5.14' + use warnings FATAL => 'all'; + use utf8; + use open qw(:utf8); +-no if $] >= 5.018, warnings => 'experimental::smartmatch'; + no if $] >= 5.022, warnings => 'experimental::re_strict'; + use if $] >= 5.022, re => 'strict'; + +@@ -519,19 +518,19 @@ sub parse_symver_args { + my $COMPAT_ABI; + local $_; + for (@args) { +- when (/^SYMVER_MIN=(.+)$/) { ++ if (/^SYMVER_MIN=(.+)$/) { + $usage_error->() if defined $SYMVER_MIN; + $SYMVER_MIN = $1; + } +- when (/^SYMVER_FLOOR=(.+)$/) { ++ elsif (/^SYMVER_FLOOR=(.+)$/) { + $usage_error->() if defined $SYMVER_FLOOR; + $SYMVER_FLOOR = $1; + } +- when (/^COMPAT_ABI=(.+)$/) { ++ elsif (/^COMPAT_ABI=(.+)$/) { + $usage_error->() if defined $COMPAT_ABI; + $COMPAT_ABI = $1; + } +- default { ++ else { + $usage_error->() if defined $map_in; + $map_in = $_; + } diff --git a/meta/recipes-core/libxcrypt/files/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch b/meta/recipes-core/libxcrypt/files/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch new file mode 100644 index 0000000000..603f52f792 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch @@ -0,0 +1,62 @@ +From 95d6e03ae37f4ec948474d111105bbdd2938aba2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sun, 25 Jun 2023 01:35:08 +0200 +Subject: [PATCH] Remove smartmatch usage from gen-crypt-h + +Needed for Perl 5.38 + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [v4.4.36 https://github.com/besser82/libxcrypt/commit/95d6e03ae37f4ec948474d111105bbdd2938aba2] +--- + build-aux/scripts/gen-crypt-h | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h +index 12aecf6..b113b79 100644 +--- a/build-aux/scripts/gen-crypt-h ++++ b/build-aux/scripts/gen-crypt-h +@@ -12,7 +12,6 @@ use v5.14; # implicit use strict, use feature ':5.14' + use warnings FATAL => 'all'; + use utf8; + use open qw(:std :utf8); +-no if $] >= 5.018, warnings => 'experimental::smartmatch'; + no if $] >= 5.022, warnings => 'experimental::re_strict'; + use if $] >= 5.022, re => 'strict'; + +@@ -37,22 +36,20 @@ sub process_config_h { + local $_; + while (<$fh>) { + chomp; +- # Yes, 'given $_' is really required here. +- given ($_) { +- when ('#define HAVE_SYS_CDEFS_H 1') { +- $have_sys_cdefs_h = 1; +- } +- when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { +- $have_sys_cdefs_begin_end_decls = 1; +- } +- when ('#define HAVE_SYS_CDEFS_THROW 1') { +- $have_sys_cdefs_throw = 1; +- } +- when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { +- $substs{XCRYPT_VERSION_STR} = $1; +- $substs{XCRYPT_VERSION_MAJOR} = $2; +- $substs{XCRYPT_VERSION_MINOR} = $3; +- } ++ ++ if ($_ eq '#define HAVE_SYS_CDEFS_H 1') { ++ $have_sys_cdefs_h = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { ++ $have_sys_cdefs_begin_end_decls = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') { ++ $have_sys_cdefs_throw = 1; ++ } ++ elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { ++ $substs{XCRYPT_VERSION_STR} = $1; ++ $substs{XCRYPT_VERSION_MAJOR} = $2; ++ $substs{XCRYPT_VERSION_MINOR} = $3; + } + } + diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 454a55d73d..342cbd0d06 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -11,9 +11,12 @@ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175" -SRCBRANCH ?= "develop" +SRCBRANCH ?= "master" -SRC_URI += "file://fix_cflags_handling.patch" +SRC_URI += "file://fix_cflags_handling.patch \ + file://0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch \ + file://0002-Remove-smartmatch-usage-from-gen-crypt-h.patch \ +" PROVIDES = "virtual/crypt" |