* [hardknott][PATCH 01/13] curl: cleanup CVE patches for hardknott
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 02/13] libx11: fix CVE-2021-31535 Anuj Mittal
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Trevor Gamblin <trevor.gamblin@windriver.com>
The patch backported to address CVE-2021-22890 was missing a bracket to
properly close out the logic in lib/vtls/wolfssl.c. Fix this so to avoid
any surprise failures when using curl with hardknott.
Also fix the CVE designation in the patch descriptions for CVEs
CVE-2021-22890 and CVE-2021-22876 so that CVE checks run with bitbake
correctly detect that they are patched.
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...oxy-argument-to-Curl_ssl_get-addsession.patch | 16 ++++++++--------
...p-credentials-from-the-auto-referer-hea.patch | 5 ++++-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-support/curl/curl/0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch b/meta/recipes-support/curl/curl/0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch
index a0c7d68f33..1e0e18cf12 100644
--- a/meta/recipes-support/curl/curl/0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch
+++ b/meta/recipes-support/curl/curl/0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch
@@ -1,15 +1,14 @@
-From a2d3885223db9616283bfe33435fbe9b3140eac7 Mon Sep 17 00:00:00 2001
+From e499142d377b56c7606437d14c99d3cb27aba9fd Mon Sep 17 00:00:00 2001
From: Trevor Gamblin <trevor.gamblin@windriver.com>
Date: Tue, 1 Jun 2021 09:50:20 -0400
-Subject: [PATCH 1/2] vtls: add 'isproxy' argument to
- Curl_ssl_get/addsessionid()
+Subject: [PATCH] vtls: add 'isproxy' argument to Curl_ssl_get/addsessionid()
To make sure we set and extract the correct session.
Reported-by: Mingtao Yang
Bug: https://curl.se/docs/CVE-2021-22890.html
-CVE-2021-22890
+CVE: CVE-2021-22890
Upstream-Status: Backport
(https://github.com/curl/curl/commit/b09c8ee15771c614c4bf3ddac893cdb12187c844)
@@ -25,8 +24,8 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
lib/vtls/sectransp.c | 10 ++++----
lib/vtls/vtls.c | 12 +++++++---
lib/vtls/vtls.h | 2 ++
- lib/vtls/wolfssl.c | 28 +++++++++++++----------
- 10 files changed, 111 insertions(+), 51 deletions(-)
+ lib/vtls/wolfssl.c | 29 ++++++++++++++----------
+ 10 files changed, 112 insertions(+), 51 deletions(-)
diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
index 29b08c0e6..0432dfadc 100644
@@ -463,7 +462,7 @@ index 9666682ec..4dc29794c 100644
size_t idsize,
int sockindex);
diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
-index e1fa45926..e4c70877f 100644
+index e1fa45926..f1b12b1d8 100644
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -516,7 +516,9 @@ wolfssl_connect_step1(struct Curl_easy *data, struct connectdata *conn,
@@ -477,7 +476,7 @@ index e1fa45926..e4c70877f 100644
/* we got a session id, use it! */
if(!SSL_set_session(backend->handle, ssl_sessionid)) {
char error_buffer[WOLFSSL_MAX_ERROR_SZ];
-@@ -774,21 +776,23 @@ wolfssl_connect_step3(struct Curl_easy *data, struct connectdata *conn,
+@@ -774,21 +776,24 @@ wolfssl_connect_step3(struct Curl_easy *data, struct connectdata *conn,
void *old_ssl_sessionid = NULL;
our_ssl_sessionid = SSL_get_session(backend->handle);
@@ -501,6 +500,7 @@ index e1fa45926..e4c70877f 100644
+ infof(data, "old SSL session ID is stale, removing\n");
+ Curl_ssl_delsessionid(data, old_ssl_sessionid);
+ incache = FALSE;
++ }
}
}
diff --git a/meta/recipes-support/curl/curl/0002-transfer-strip-credentials-from-the-auto-referer-hea.patch b/meta/recipes-support/curl/curl/0002-transfer-strip-credentials-from-the-auto-referer-hea.patch
index 6c4f6f2f48..c02c9bed68 100644
--- a/meta/recipes-support/curl/curl/0002-transfer-strip-credentials-from-the-auto-referer-hea.patch
+++ b/meta/recipes-support/curl/curl/0002-transfer-strip-credentials-from-the-auto-referer-hea.patch
@@ -6,7 +6,10 @@ Subject: [PATCH 2/2] transfer: strip credentials from the auto-referer header
Added test 2081 to verify.
-CVE-2021-22876
+CVE: CVE-2021-22876
+
+Upstream-Status: Backport
+(https://github.com/curl/curl/commit/7214288898f5625a6cc196e22a74232eada7861c)
Bug: https://curl.se/docs/CVE-2021-22876.html
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 02/13] libx11: fix CVE-2021-31535
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 01/13] curl: cleanup CVE patches for hardknott Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 03/13] util-linux.inc: Do not modify BPN Anuj Mittal
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Backport patch to fix CVE-2021-31535 of libx11. Adjust indentation as well.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../xorg-lib/libx11/fix-CVE-2021-31535.patch | 320 ++++++++++++++++++
.../recipes-graphics/xorg-lib/libx11_1.7.0.bb | 5 +-
2 files changed, 323 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-CVE-2021-31535.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-CVE-2021-31535.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-CVE-2021-31535.patch
new file mode 100644
index 0000000000..2ec5cc1688
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-CVE-2021-31535.patch
@@ -0,0 +1,320 @@
+From 8d2e02ae650f00c4a53deb625211a0527126c605 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@herrb.eu>
+Date: Fri, 19 Feb 2021 15:30:39 +0100
+Subject: [PATCH] Reject string longer than USHRT_MAX before sending them on
+ the wire
+
+The X protocol uses CARD16 values to represent the length so
+this would overflow.
+
+CVE-2021-31535
+
+Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+
+CVE: CVE-2021-31535
+Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/8d2e02a]
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ src/Font.c | 4 +++-
+ src/FontInfo.c | 3 +++
+ src/FontNames.c | 3 +++
+ src/GetColor.c | 4 ++++
+ src/LoadFont.c | 4 ++++
+ src/LookupCol.c | 6 ++++--
+ src/ParseCol.c | 3 +++
+ src/QuExt.c | 5 +++++
+ src/SetFPath.c | 6 ++++++
+ src/SetHints.c | 7 +++++++
+ src/StNColor.c | 3 +++
+ src/StName.c | 7 ++++++-
+ 12 files changed, 51 insertions(+), 4 deletions(-)
+
+diff --git a/src/Font.c b/src/Font.c
+index d4ebdaca..1cd89cca 100644
+--- a/src/Font.c
++++ b/src/Font.c
+@@ -102,6 +102,8 @@ XFontStruct *XLoadQueryFont(
+ XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy);
+ #endif
+
++ if (strlen(name) >= USHRT_MAX)
++ return NULL;
+ if (_XF86LoadQueryLocaleFont(dpy, name, &font_result, (Font *)0))
+ return font_result;
+ LockDisplay(dpy);
+@@ -663,7 +665,7 @@ int _XF86LoadQueryLocaleFont(
+ if (!name)
+ return 0;
+ l = (int) strlen(name);
+- if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-')
++ if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-' || l >= USHRT_MAX)
+ return 0;
+ charset = NULL;
+ /* next three lines stolen from _XkbGetCharset() */
+diff --git a/src/FontInfo.c b/src/FontInfo.c
+index 694efa10..6644b3fa 100644
+--- a/src/FontInfo.c
++++ b/src/FontInfo.c
+@@ -58,6 +58,9 @@ XFontStruct **info) /* RETURN */
+ register xListFontsReq *req;
+ int j;
+
++ if (strlen(pattern) >= USHRT_MAX)
++ return NULL;
++
+ LockDisplay(dpy);
+ GetReq(ListFontsWithInfo, req);
+ req->maxNames = maxNames;
+diff --git a/src/FontNames.c b/src/FontNames.c
+index 30912925..458d80c9 100644
+--- a/src/FontNames.c
++++ b/src/FontNames.c
+@@ -51,6 +51,9 @@ int *actualCount) /* RETURN */
+ register xListFontsReq *req;
+ unsigned long rlen = 0;
+
++ if (strlen(pattern) >= USHRT_MAX)
++ return NULL;
++
+ LockDisplay(dpy);
+ GetReq(ListFonts, req);
+ req->maxNames = maxNames;
+diff --git a/src/GetColor.c b/src/GetColor.c
+index d088497f..c8178067 100644
+--- a/src/GetColor.c
++++ b/src/GetColor.c
+@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+ #include <stdio.h>
+ #include "Xlibint.h"
+ #include "Xcmsint.h"
+@@ -48,6 +49,9 @@ XColor *exact_def) /* RETURN */
+ XcmsColor cmsColor_exact;
+ Status ret;
+
++ if (strlen(colorname) >= USHRT_MAX)
++ return (0);
++
+ #ifdef XCMS
+ /*
+ * Let's Attempt to use Xcms and i18n approach to Parse Color
+diff --git a/src/LoadFont.c b/src/LoadFont.c
+index 0a3809a8..3996436f 100644
+--- a/src/LoadFont.c
++++ b/src/LoadFont.c
+@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+ #include "Xlibint.h"
+
+ Font
+@@ -38,6 +39,9 @@ XLoadFont (
+ Font fid;
+ register xOpenFontReq *req;
+
++ if (strlen(name) >= USHRT_MAX)
++ return (0);
++
+ if (_XF86LoadQueryLocaleFont(dpy, name, (XFontStruct **)0, &fid))
+ return fid;
+
+diff --git a/src/LookupCol.c b/src/LookupCol.c
+index 9608d512..cd9b1368 100644
+--- a/src/LookupCol.c
++++ b/src/LookupCol.c
+@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+ #include <stdio.h>
+ #include "Xlibint.h"
+ #include "Xcmsint.h"
+@@ -46,6 +47,9 @@ XLookupColor (
+ XcmsCCC ccc;
+ XcmsColor cmsColor_exact;
+
++ n = (int) strlen (spec);
++ if (n >= USHRT_MAX)
++ return 0;
+ #ifdef XCMS
+ /*
+ * Let's Attempt to use Xcms and i18n approach to Parse Color
+@@ -77,8 +81,6 @@ XLookupColor (
+ * Xcms and i18n methods failed, so lets pass it to the server
+ * for parsing.
+ */
+-
+- n = (int) strlen (spec);
+ LockDisplay(dpy);
+ GetReq (LookupColor, req);
+ req->cmap = cmap;
+diff --git a/src/ParseCol.c b/src/ParseCol.c
+index 2691df36..7a84a17b 100644
+--- a/src/ParseCol.c
++++ b/src/ParseCol.c
+@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+ #include <stdio.h>
+ #include "Xlibint.h"
+ #include "Xcmsint.h"
+@@ -47,6 +48,8 @@ XParseColor (
+
+ if (!spec) return(0);
+ n = (int) strlen (spec);
++ if (n >= USHRT_MAX)
++ return(0);
+ if (*spec == '#') {
+ /*
+ * RGB
+diff --git a/src/QuExt.c b/src/QuExt.c
+index 2021dca4..4cb99fcf 100644
+--- a/src/QuExt.c
++++ b/src/QuExt.c
+@@ -27,6 +27,8 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
++#include <stdbool.h>
+ #include "Xlibint.h"
+
+ Bool
+@@ -40,6 +42,9 @@ XQueryExtension(
+ xQueryExtensionReply rep;
+ register xQueryExtensionReq *req;
+
++ if (strlen(name) >= USHRT_MAX)
++ return false;
++
+ LockDisplay(dpy);
+ GetReq(QueryExtension, req);
+ req->nbytes = name ? (CARD16) strlen(name) : 0;
+diff --git a/src/SetFPath.c b/src/SetFPath.c
+index 7d12f18c..13fce49e 100644
+--- a/src/SetFPath.c
++++ b/src/SetFPath.c
+@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
+
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
++#include <limits.h>
+ #endif
+ #include "Xlibint.h"
+
+@@ -49,6 +50,11 @@ XSetFontPath (
+ req->nFonts = ndirs;
+ for (i = 0; i < ndirs; i++) {
+ n = (int) ((size_t) n + (safestrlen (directories[i]) + 1));
++ if (n >= USHRT_MAX) {
++ UnlockDisplay(dpy);
++ SyncHandle();
++ return 0;
++ }
+ }
+ nbytes = (n + 3) & ~3;
+ req->length += nbytes >> 2;
+diff --git a/src/SetHints.c b/src/SetHints.c
+index e81aa9d3..61cb0684 100644
+--- a/src/SetHints.c
++++ b/src/SetHints.c
+@@ -49,6 +49,7 @@ SOFTWARE.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+ #include <X11/Xlibint.h>
+ #include <X11/Xutil.h>
+ #include "Xatomtype.h"
+@@ -214,6 +215,8 @@ XSetCommand (
+ register char *buf, *bp;
+ for (i = 0, nbytes = 0; i < argc; i++) {
+ nbytes += safestrlen(argv[i]) + 1;
++ if (nbytes >= USHRT_MAX)
++ return 1;
+ }
+ if ((bp = buf = Xmalloc(nbytes))) {
+ /* copy arguments into single buffer */
+@@ -256,6 +259,8 @@ XSetStandardProperties (
+
+ if (name != NULL) XStoreName (dpy, w, name);
+
++ if (safestrlen(icon_string) >= USHRT_MAX)
++ return 1;
+ if (icon_string != NULL) {
+ XChangeProperty (dpy, w, XA_WM_ICON_NAME, XA_STRING, 8,
+ PropModeReplace,
+@@ -298,6 +303,8 @@ XSetClassHint(
+
+ len_nm = safestrlen(classhint->res_name);
+ len_cl = safestrlen(classhint->res_class);
++ if (len_nm + len_cl >= USHRT_MAX)
++ return 1;
+ if ((class_string = s = Xmalloc(len_nm + len_cl + 2))) {
+ if (len_nm) {
+ strcpy(s, classhint->res_name);
+diff --git a/src/StNColor.c b/src/StNColor.c
+index 3b50401b..16dc9cbc 100644
+--- a/src/StNColor.c
++++ b/src/StNColor.c
+@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+ #include <stdio.h>
+ #include "Xlibint.h"
+ #include "Xcmsint.h"
+@@ -46,6 +47,8 @@ int flags) /* DoRed, DoGreen, DoBlue */
+ XcmsColor cmsColor_exact;
+ XColor scr_def;
+
++ if (strlen(name) >= USHRT_MAX)
++ return 0;
+ #ifdef XCMS
+ /*
+ * Let's Attempt to use Xcms approach to Parse Color
+diff --git a/src/StName.c b/src/StName.c
+index 58b5a5a6..04bb3aa6 100644
+--- a/src/StName.c
++++ b/src/StName.c
+@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+ #include <X11/Xlibint.h>
+ #include <X11/Xatom.h>
+
+@@ -36,7 +37,9 @@ XStoreName (
+ Window w,
+ _Xconst char *name)
+ {
+- return XChangeProperty(dpy, w, XA_WM_NAME, XA_STRING,
++ if (strlen(name) >= USHRT_MAX)
++ return 0;
++ return XChangeProperty(dpy, w, XA_WM_NAME, XA_STRING, /* */
+ 8, PropModeReplace, (_Xconst unsigned char *)name,
+ name ? (int) strlen(name) : 0);
+ }
+@@ -47,6 +50,8 @@ XSetIconName (
+ Window w,
+ _Xconst char *icon_name)
+ {
++ if (strlen(icon_name) >= USHRT_MAX)
++ return 0;
+ return XChangeProperty(dpy, w, XA_WM_ICON_NAME, XA_STRING, 8,
+ PropModeReplace, (_Xconst unsigned char *)icon_name,
+ icon_name ? (int) strlen(icon_name) : 0);
+--
+GitLab
+
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb
index 3faee6e497..c6429cbbac 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb
@@ -11,8 +11,9 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
PE = "1"
SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
- file://disable_tests.patch \
- "
+ file://disable_tests.patch \
+ file://fix-CVE-2021-31535.patch \
+ "
SRC_URI[sha256sum] = "36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54"
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 03/13] util-linux.inc: Do not modify BPN
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 01/13] curl: cleanup CVE patches for hardknott Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 02/13] libx11: fix CVE-2021-31535 Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 04/13] native.bbclass: Do not remove "-native" in the middle of recipe names Anuj Mittal
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Changing BPN to be "util-linux" regardless if it is the util-linux
recipe or the util-linux-libuuid recipe that is being built was an
easy way to allow ${BPN} and ${BP} to be used in the SRC_URI for both
recipes. However, it causes problems for native.bbclass where there
are expectations that ${BPN} and ${PN} match each other.
Use "util-linux" directly in the SRC_URI instead to avoid the problem.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 701ef7ff0e1b17150424a64acfafbb83f518f9c9)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-core/util-linux/util-linux.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index cbf6102ee0..6b47f417aa 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -27,8 +27,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da
FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:"
MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
-BPN = "util-linux"
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
file://configure-sbindir.patch \
file://runuser.pamd \
file://runuser-l.pamd \
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 04/13] native.bbclass: Do not remove "-native" in the middle of recipe names
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (2 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 03/13] util-linux.inc: Do not modify BPN Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 05/13] linux-yocto/5.4: update to v5.4.124 Anuj Mittal
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
For dependencies such as "${PN}-foo", when modifying them for native
recipes, it is expected that they become "${BPN}-foo-native" rather
than "${BPN}-native-foo-native". This was previously done by removing
all occurences of "-native" from the dependency before adding
"-native" at the end. However, this fails for a recipe such as
"crate-native-tls" that happens to contain the string "-native" in the
middle of the name. Solve this by simply replacing ${PN} with ${BPN}
in the name instead before adding "-native" at the end
Also simplify adding "-native" to the end of names the recipe provides.
In this case it is not necessary to replace ${PN} with ${BPN} as the
recipes are expected to use ${BPN}-foo in the first place.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit edaf8ff278fc96b122c4fc3266b63856e3350f4c)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/native.bbclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index a0838e41b9..561cc23f68 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -119,6 +119,7 @@ python native_virtclass_handler () {
pn = e.data.getVar("PN")
if not pn.endswith("-native"):
return
+ bpn = e.data.getVar("BPN")
# Set features here to prevent appends and distro features backfill
# from modifying native distro features
@@ -146,7 +147,10 @@ python native_virtclass_handler () {
elif "-cross-" in dep:
newdeps.append(dep.replace("-cross", "-native"))
elif not dep.endswith("-native"):
- newdeps.append(dep.replace("-native", "") + "-native")
+ # Replace ${PN} with ${BPN} in the dependency to make sure
+ # dependencies on, e.g., ${PN}-foo become ${BPN}-foo-native
+ # rather than ${BPN}-native-foo-native.
+ newdeps.append(dep.replace(pn, bpn) + "-native")
else:
newdeps.append(dep)
d.setVar(varname, " ".join(newdeps), parsing=True)
@@ -166,7 +170,7 @@ python native_virtclass_handler () {
if prov.find(pn) != -1:
nprovides.append(prov)
elif not prov.endswith("-native"):
- nprovides.append(prov.replace(prov, prov + "-native"))
+ nprovides.append(prov + "-native")
else:
nprovides.append(prov)
e.data.setVar("PROVIDES", ' '.join(nprovides))
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 05/13] linux-yocto/5.4: update to v5.4.124
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (3 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 04/13] native.bbclass: Do not remove "-native" in the middle of recipe names Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 06/13] lttng-tools: upgrade 2.12.3 -> 2.12.4 Anuj Mittal
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
70154d2f82a9 Linux 5.4.124
23c7e3235a3a usb: core: reduce power-on-good delay time of root hub
241abccc8a33 neighbour: Prevent Race condition in neighbour subsytem
3c36980ba681 net: hso: bail out on interrupt URB allocation failure
1bd48a2af84e Revert "Revert "ALSA: usx2y: Fix potential NULL pointer dereference""
866648d965f0 net: hns3: check the return of skb_checksum_help()
72cda5259f5e drivers/net/ethernet: clean up unused assignments
776fba1486be i915: fix build warning in intel_dp_get_link_status()
c561d83be40f drm/i915/display: fix compiler warning about array overrun
e3d5ff235ec5 MIPS: ralink: export rt_sysc_membase for rt2880_wdt.c
86a62df8f4d4 MIPS: alchemy: xxs1500: add gpio-au1000.h header file
2221f233cc9e sch_dsmark: fix a NULL deref in qdisc_reset()
a052751302b7 net: ethernet: mtk_eth_soc: Fix packet statistics support for MT7628/88
162b11831f77 ALSA: usb-audio: scarlett2: snd_scarlett_gen2_controls_create() can be static
3bfb58517d06 ipv6: record frag_max_size in atomic fragments in input path
8bb1077448d4 net: lantiq: fix memory corruption in RX ring
fda8f74d3975 scsi: libsas: Use _safe() loop in sas_resume_port()
cf20c704a26e ixgbe: fix large MTU request from VF
7a143b92d1dc bpf: Set mac_len in bpf_skb_change_head
272729d56b2d ASoC: cs35l33: fix an error code in probe()
3ee1d6e23108 staging: emxx_udc: fix loop in _nbu2ss_nuke()
0bf49b3c8d8b cxgb4: avoid accessing registers when clearing filters
68b5fc6ec52f gve: Correct SKB queue index validation.
4f4752e4d8db gve: Upgrade memory barrier in poll routine
821149ee88c2 gve: Add NULL pointer checks when freeing irqs.
6abd1d1983f2 gve: Update mgmt_msix_idx if num_ntfy changes
13c4d8986125 gve: Check TX QPL was actually assigned
37d697759958 mld: fix panic in mld_newpack()
b0fb74377891 bnxt_en: Include new P5 HV definition in VF check.
f7b5b4e26bf5 net: bnx2: Fix error return code in bnx2_init_board()
7a79654b9076 net: hso: check for allocation failure in hso_create_bulk_serial_device()
48da4c0577fe net: sched: fix tx action reschedule issue with stopped queue
515e7c595d84 net: sched: fix tx action rescheduling issue during deactivation
1c25c7621fb7 net: sched: fix packet stuck problem for lockless qdisc
a04790d104e2 tls splice: check SPLICE_F_NONBLOCK instead of MSG_DONTWAIT
5c01181700ab openvswitch: meter: fix race when getting now_ms.
5bfdc481d812 net: mdio: octeon: Fix some double free issues
2e0fba911ca7 net: mdio: thunder: Fix a double free issue in the .remove function
20255d41ac56 net: fec: fix the potential memory leak in fec_enet_init()
41f7f37ddefe net: really orphan skbs tied to closing sk
694f68527e75 vfio-ccw: Check initialized flag in cp_init()
d5e4479228b5 ASoC: cs42l42: Regmap must use_single_read/write
87803141fb3e net: dsa: fix error code getting shifted with 4 in dsa_slave_get_sset_count
4450f733dc3d net: netcp: Fix an error message
de2bf5de17be drm/amd/amdgpu: fix a potential deadlock in gpu reset
7398c2aab4da drm/amdgpu: Fix a use-after-free
dde2656e0bbb drm/amd/amdgpu: fix refcount leak
f6d92ebb3eaf drm/amd/display: Disconnect non-DP with no EDID
63c61d89660a SMB3: incorrect file id in requests compounded with open
07160b004a0b platform/x86: touchscreen_dmi: Add info for the Mediacom Winpad 7.0 W700 tablet
d1dcd53a45e1 platform/x86: intel_punit_ipc: Append MODULE_DEVICE_TABLE for ACPI
feb5d3618a18 platform/x86: hp-wireless: add AMD's hardware id to the supported list
0ed102453aa1 btrfs: do not BUG_ON in link_to_fixup_dir
a10371342903 openrisc: Define memory barrier mb
fed34fb07c4b scsi: BusLogic: Fix 64-bit system enumeration error for Buslogic
55575c08502f btrfs: return whole extents in fiemap
a3dea6dc1e14 brcmfmac: properly check for bus register errors
26fb7a61de4e Revert "brcmfmac: add a check for the status of usb_register"
d4bab5d15bf5 net: liquidio: Add missing null pointer checks
6ba750549671 Revert "net: liquidio: fix a NULL pointer dereference"
d771def6c305 media: gspca: properly check for errors in po1030_probe()
44b17737b7aa Revert "media: gspca: Check the return value of write_bridge for timeout"
f6068eadc1d2 media: gspca: mt9m111: Check write_bridge for timeout
f19375e9a8f2 Revert "media: gspca: mt9m111: Check write_bridge for timeout"
193c790eccfc media: dvb: Add check on sp8870_readreg return
2d5e27f0e031 Revert "media: dvb: Add check on sp8870_readreg"
5b3a68a1cf37 ASoC: cs43130: handle errors in cs43130_probe() properly
7e4ac4e151f1 Revert "ASoC: cs43130: fix a NULL pointer dereference"
3aa60a0335ea libertas: register sysfs groups properly
e0c75f951f81 Revert "libertas: add checks for the return value of sysfs_create_group"
6c52bc7482e3 dmaengine: qcom_hidma: comment platform_driver_register call
e829b7253e4d Revert "dmaengine: qcom_hidma: Check for driver register failure"
4bc94e60d787 isdn: mISDN: correctly handle ph_info allocation failure in hfcsusb_ph_info
6b8872d4972f Revert "isdn: mISDN: Fix potential NULL pointer dereference of kzalloc"
85b2c436a143 ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()
b74d4ae8f538 Revert "ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()"
a34338fcaad6 isdn: mISDNinfineon: check/cleanup ioremap failure correctly in setup_io
d3d74e622e63 Revert "isdn: mISDNinfineon: fix potential NULL pointer dereference"
5dc20457707b Revert "ALSA: usx2y: Fix potential NULL pointer dereference"
ea4c563657d7 Revert "ALSA: gus: add a check of the status of snd_ctl_add"
70bf2a067915 char: hpet: add checks after calling ioremap
07d2945a3551 Revert "char: hpet: fix a missing check of ioremap"
b1da7ad9ad58 net: caif: remove BUG_ON(dev == NULL) in caif_xmit
e8dee217eca8 Revert "net/smc: fix a NULL pointer dereference"
22049c3d40f0 net: fujitsu: fix potential null-ptr-deref
ebb533ce35b5 Revert "net: fujitsu: fix a potential NULL pointer dereference"
e50a9f2548a5 serial: max310x: unregister uart driver in case of failure and abort
e5d3e4b6104c Revert "serial: max310x: pass return value of spi_register_driver"
047aefd62220 Revert "ALSA: sb: fix a missing check of snd_ctl_add"
bec840232fed Revert "media: usb: gspca: add a missed check for goto_low_power"
e44a9941937d gpio: cadence: Add missing MODULE_DEVICE_TABLE
e0c7f6cce1cf platform/x86: hp_accel: Avoid invoking _INI to speed up resume
bd7a3b3ed9e3 perf jevents: Fix getting maximum number of fds
77ac90814b4e i2c: sh_mobile: Use new clock calculation formulas for RZ/G2E
04cc05e3716a i2c: i801: Don't generate an interrupt on bus reset
45488e77e014 i2c: s3c2410: fix possible NULL pointer deref on read message after write
e00da6510b3b net: dsa: sja1105: error out on unsupported PHY mode
ce5355f140a7 net: dsa: fix a crash if ->get_sset_count() fails
4fe4e1f48ba1 net: dsa: mt7530: fix VLAN traffic leaks
15d1cc4b4b58 spi: spi-fsl-dspi: Fix a resource leak in an error handling path
64d17ec9f1de tipc: skb_linearize the head skb when reassembling msgs
d1f76dfadaf8 tipc: wait and exit until all work queues are done
bdd37028a026 Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv"
5e01d87b108c net/mlx4: Fix EEPROM dump support
4fd3213e5354 net/mlx5e: Fix nullptr in add_vlan_push_action()
df61870c4b1d net/mlx5e: Fix multipath lag activation
4ce2bf20b4a6 drm/meson: fix shutdown crash when component not probed
0787efc1a359 NFSv4: Fix v4.0/v4.1 SEEK_DATA return -ENOTSUPP when set NFS_V4_2 config
785917316b25 NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce()
1fc5f4eb9d31 NFS: Fix an Oopsable condition in __nfs_pageio_add_request()
e411df81cd86 NFS: fix an incorrect limit in filelayout_decode_layout()
f76e76555682 fs/nfs: Use fatal_signal_pending instead of signal_pending
fe201316ac36 Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails
977c34b50e6b spi: spi-geni-qcom: Fix use-after-free on unbind
b95fb96e6339 net: usb: fix memory leak in smsc75xx_bind
b94afae0fa7a usb: gadget: udc: renesas_usb3: Fix a race in usb3_start_pipen()
6b5bfb8ce56d usb: dwc3: gadget: Properly track pending and queued SG
2cd572cc45b5 thermal/drivers/intel: Initialize RW trip to THERMAL_TEMP_INVALID
78e80f9c4e96 USB: serial: pl2303: add device id for ADLINK ND-6530 GC
f485e4dcbe44 USB: serial: ftdi_sio: add IDs for IDS GmbH Products
8217f3c7f6cc USB: serial: option: add Telit LE910-S1 compositions 0x7010, 0x7011
eddf691bab0f USB: serial: ti_usb_3410_5052: add startech.com device id
915452f40e2f serial: rp2: use 'request_firmware' instead of 'request_firmware_nowait'
1d8071879a2b serial: sh-sci: Fix off-by-one error in FIFO threshold register setting
3986ba109dad serial: tegra: Fix a mask operation that is always true
2c835fede13e USB: usbfs: Don't WARN about excessively large memory allocations
84af0c28ed1b USB: trancevibrator: fix control-request direction
bc8b9d8c0465 serial: 8250_pci: handle FL_NOIRQ board flag
f75a5b9907e8 serial: 8250_pci: Add support for new HPE serial device
72fa5c26936a iio: adc: ad7793: Add missing error code in ad7793_setup()
f49149964d24 iio: adc: ad7124: Fix potential overflow due to non sequential channel numbers
7e5cac90430c iio: adc: ad7124: Fix missbalanced regulator enable / disable on error.
2c9085b0fa04 iio: adc: ad7768-1: Fix too small buffer passed to iio_push_to_buffers_with_timestamp()
bd877887e479 iio: gyro: fxas21002c: balance runtime power in error path
657f6a33f871 staging: iio: cdc: ad7746: avoid overwrite of num_channels
12fb557863f8 mei: request autosuspend after sending rx flow control
eb78fa5a3815 thunderbolt: dma_port: Fix NVM read buffer bounds and offset issue
36b5ff1db1a4 misc/uss720: fix memory leak in uss720_probe
66a2a494ac48 serial: core: fix suspicious security_locked_down() call
48a9b7957bb2 Documentation: seccomp: Fix user notification documentation
c7c6a316a887 kgdb: fix gcc-11 warnings harder
01c57232a1cb selftests/gpio: Fix build when source tree is read only
d93532a4873d selftests/gpio: Move include of lib.mk up
1e20cdb93889 selftests/gpio: Use TEST_GEN_PROGS_EXTENDED
03aeefb46f07 drm/amdgpu/vcn2.5: add cancel_delayed_work_sync before power gate
f0780e96a6e2 drm/amdgpu/vcn2.0: add cancel_delayed_work_sync before power gate
9351c5192b88 drm/amdgpu/vcn1: add cancel_delayed_work_sync before power gate
d65ec240b3e4 dm snapshot: properly fix a crash when an origin has no snapshots
b06fe1124369 ath10k: Validate first subframe of A-MSDU before processing the list
aee0121afee5 ath10k: Fix TKIP Michael MIC verification for PCIe
124ce717f6b2 ath10k: drop MPDU which has discard flag set by firmware for SDIO
405d08dda2f9 ath10k: drop fragments with multicast DA for SDIO
96d4d82652fa ath10k: drop fragments with multicast DA for PCIe
6bf449a34c0d ath10k: add CCMP PN replay protection for fragmented frames for PCIe
cbc470aa3f93 mac80211: extend protection against mixed key and fragment cache attacks
88664d5e5dc9 mac80211: do not accept/forward invalid EAPOL frames
bbc06191e36e mac80211: prevent attacks on TKIP/WEP as well
c8b3a6150dc8 mac80211: check defrag PN against current frame
1b3774e58e47 mac80211: add fragment cache to sta_info
fb1b24f94d1c mac80211: drop A-MSDUs on old ciphers
fa00d4928eaf cfg80211: mitigate A-MSDU aggregation attacks
5fe9fae1220e mac80211: properly handle A-MSDUs that start with an RFC 1042 header
14f29a67f404 mac80211: prevent mixed key and fragment cache attacks
b90cf214e2bb mac80211: assure all fragments are encrypted
4302a6fdec60 net: hso: fix control-request directions
60d171c477e9 proc: Check /proc/$pid/attr/ writes against file opener
7f4d9d2f0be7 perf scripts python: exported-sql-viewer.py: Fix warning display
cb08c8d591cb perf scripts python: exported-sql-viewer.py: Fix Array TypeError
9044d06150d0 perf scripts python: exported-sql-viewer.py: Fix copy to clipboard from Top Calls by elapsed Time report
21e2eb6a950c perf intel-pt: Fix transaction abort handling
854216d7ec10 perf intel-pt: Fix sample instruction bytes
044bbe8b92ab iommu/vt-d: Fix sysfs leak in alloc_iommu()
aba3c7795f51 NFSv4: Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return()
f2a35ade2274 cifs: set server->cipher_type to AES-128-CCM for SMB3.0
5c81a4e24cf1 ALSA: usb-audio: scarlett2: Improve driver startup messages
26314d278423 ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci
6fc2850259e6 ALSA: hda/realtek: Headphone volume is controlled by Front mixer
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d91ec7d1b47d026149c488cfe1fd0af831b8fad6)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index a55d84f2ba..f09580a8df 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "c279b45a44858da788a13f23130ed06663e77c57"
-SRCREV_meta ?= "aa019cb8e4af653d6e136f1b8720884b97ddde49"
+SRCREV_machine ?= "c538f43c5caae421d4cd56782dc8213c3ea7cbb4"
+SRCREV_meta ?= "669bba3f8ad5c588063f3a8be4fca46c309b0714"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.123"
+LINUX_VERSION ?= "5.4.124"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index cf8e81e0f3..bb4b24ac0d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.123"
+LINUX_VERSION ?= "5.4.124"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "445028ae9ec9a904122bb5c60995def98d2b1ddc"
-SRCREV_machine ?= "edc1395a32f99faaebc6b48769c4bd02a8b074be"
-SRCREV_meta ?= "aa019cb8e4af653d6e136f1b8720884b97ddde49"
+SRCREV_machine_qemuarm ?= "5c655b0a0cf0aed21db20fc2e7fdc2cd1bea7def"
+SRCREV_machine ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
+SRCREV_meta ?= "669bba3f8ad5c588063f3a8be4fca46c309b0714"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index ddd019861d..b0c0ab3c96 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "c292705386cfec860dad5e1dee74f22407fb7f94"
-SRCREV_machine_qemuarm64 ?= "edc1395a32f99faaebc6b48769c4bd02a8b074be"
-SRCREV_machine_qemumips ?= "d4c949dc0b88dba72f9f94a18fd994aa8482ff8e"
-SRCREV_machine_qemuppc ?= "edc1395a32f99faaebc6b48769c4bd02a8b074be"
-SRCREV_machine_qemuriscv64 ?= "edc1395a32f99faaebc6b48769c4bd02a8b074be"
-SRCREV_machine_qemux86 ?= "edc1395a32f99faaebc6b48769c4bd02a8b074be"
-SRCREV_machine_qemux86-64 ?= "edc1395a32f99faaebc6b48769c4bd02a8b074be"
-SRCREV_machine_qemumips64 ?= "417e8e4e101314f02439a88c78d4cf2ab98df209"
-SRCREV_machine ?= "edc1395a32f99faaebc6b48769c4bd02a8b074be"
-SRCREV_meta ?= "aa019cb8e4af653d6e136f1b8720884b97ddde49"
+SRCREV_machine_qemuarm ?= "1c6a92761a897497f1a265e41fbc5a71e77c9599"
+SRCREV_machine_qemuarm64 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
+SRCREV_machine_qemumips ?= "bd70ff3bfca60803be364d3c6a45ab64da9fe1e1"
+SRCREV_machine_qemuppc ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
+SRCREV_machine_qemuriscv64 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
+SRCREV_machine_qemux86 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
+SRCREV_machine_qemux86-64 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
+SRCREV_machine_qemumips64 ?= "f67e90b460cfafbb8a7a9e73c95587321f784351"
+SRCREV_machine ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
+SRCREV_meta ?= "669bba3f8ad5c588063f3a8be4fca46c309b0714"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.123"
+LINUX_VERSION ?= "5.4.124"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 06/13] lttng-tools: upgrade 2.12.3 -> 2.12.4
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (4 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 05/13] linux-yocto/5.4: update to v5.4.124 Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 07/13] linux-yocto/5.4: update to v5.4.125 Anuj Mittal
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a new lttng file to one of the tests to avoid test failures.
Also add a dependency on grep since standalone testing revealed test
failures without this. Normally this was added by other dependencies
in the ptest images so we didn't see this.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5799a807eed44d380e142913e50308589b9412ed)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../{lttng-tools_2.12.3.bb => lttng-tools_2.12.4.bb} | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-tools_2.12.3.bb => lttng-tools_2.12.4.bb} (94%)
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
similarity index 94%
rename from meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
index 6132daf1a1..133d7561b8 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
@@ -15,7 +15,7 @@ include lttng-platforms.inc
DEPENDS = "liburcu popt libxml2 util-linux"
RDEPENDS_${PN} = "libgcc"
RRECOMMENDS_${PN} += "${LTTNGMODULES}"
-RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core"
+RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep"
RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
# babelstats.pl wants getopt-long
@@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
file://determinism.patch \
"
-SRC_URI[sha256sum] = "2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153"
+SRC_URI[sha256sum] = "d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a500dea1"
inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
@@ -69,7 +69,10 @@ do_install_append () {
}
do_install_ptest () {
- for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/*.lttng tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh; do
+ for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/*.lttng \
+ tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh \
+ tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh \
+ tests/regression/tools/base-path/*.lttng; do
install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
done
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 07/13] linux-yocto/5.4: update to v5.4.125
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (5 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 06/13] lttng-tools: upgrade 2.12.3 -> 2.12.4 Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 08/13] linuxloader: Be aware of riscv32 ldso Anuj Mittal
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
3909e2374335 Linux 5.4.125
d99029e6aab6 neighbour: allow NUD_NOARP entries to be forced GCed
8e0bb29446d1 i2c: qcom-geni: Suspend and resume the bus during SYSTEM_SLEEP_PM ops
bdc17b2f8264 xen-pciback: redo VF placement in the virtual topology
defcc2b5e54a lib/lz4: explicitly support in-place decompression
97e814e6b5cd x86/kvm: Disable all PV features on crash
9084fe1b3572 x86/kvm: Disable kvmclock on all CPUs on shutdown
7620a669111b x86/kvm: Teardown PV features on boot CPU as well
f82030a586a1 KVM: arm64: Fix debug register indexing
2295e87a5e39 KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode
0450af01ae7e btrfs: fix unmountable seed device after fstrim
3b7f3cab1d47 mm/filemap: fix storing to a THP shadow entry
0a890e220954 XArray: add xas_split
03a390d8796d XArray: add xa_get_order
fd8e06a7a723 mm: add thp_order
f192885f7cee bnxt_en: Remove the setting of dev_port.
14fd3da3e8d3 mm, hugetlb: fix simple resv_huge_pages underflow on UFFDIO_COPY
6d4da27bd9ef btrfs: fixup error handling in fixup_inode_link_counts
dad974d2494a btrfs: return errors from btrfs_del_csums in cleanup_ref_head
0fd9149a82e3 btrfs: fix error handling in btrfs_del_csums
295859a55549 btrfs: mark ordered extent and inode with error if we fail to finish
12ca65539b04 x86/apic: Mark _all_ legacy interrupts when IO/APIC is missing
b0c0d8b5bf94 drm/amdgpu: make sure we unpin the UVD BO
24c06e5452c3 drm/amdgpu: Don't query CE and UE errors
5d4c4b06ed9f nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect
cc2edb99ea60 ocfs2: fix data corruption by fallocate
2cd6eedfa634 pid: take a reference when initializing `cad_pid`
fe4e0bd4c26c usb: dwc2: Fix build in periphal-only mode
920697b004e4 ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed
52fc8f05c158 ARM: dts: imx6q-dhcom: Add PU,VDD1P1,VDD2P5 regulators
2cac47eed455 ARM: dts: imx6dl-yapp4: Fix RGMII connection to QCA8334 switch
d349ff008cb3 ALSA: hda: Fix for mute key LED for HP Pavilion 15-CK0xx
0afd601d8e0a ALSA: timer: Fix master timer notification
d65bc969ec8b HID: multitouch: require Finger field to mark Win8 reports as MT
368c5d45a87e HID: magicmouse: fix NULL-deref on disconnect
142d5ca797a9 HID: i2c-hid: Skip ELAN power-on command after reset
4d94f530cd24 net: caif: fix memory leak in cfusbl_device_notify
f52f4fd67264 net: caif: fix memory leak in caif_device_notify
c97cdb70b72d net: caif: add proper error handling
64824f626c0c net: caif: added cfserl_release function
b6f97555c71f Bluetooth: use correct lock to prevent UAF of hdev object
8d3d0ac73a4a Bluetooth: fix the erroneous flush_work() order
28efacc21d2a tipc: fix unique bearer names sanity check
9ac67fdf64e0 tipc: add extack messages for bearer/media failure
0fa160a75748 bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act
22ea29c39717 ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells
5b97dd983255 ARM: dts: imx7d-pico: Fix the 'tuning-step' property
55fa22d1d8b2 ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property
3a559111bd10 arm64: dts: zii-ultra: fix 12V_MAIN voltage
f78c28a0dda1 arm64: dts: ls1028a: fix memory node
3616dd03bc43 i40e: add correct exception tracing for XDP
adfd6355fc8b i40e: optimize for XDP_REDIRECT in xsk path
06f667dba42e i2c: qcom-geni: Add shutdown callback for i2c
de37510ec67d ice: Allow all LLDP packets from PF to Tx
bafd0a7461f0 ice: Fix VFR issues for AVF drivers that expect ATQLEN cleared
3583ab29177c ice: write register with correct offset
7ba7fa78a92d ipv6: Fix KASAN: slab-out-of-bounds Read in fib6_nh_flush_exceptions
112533f50c7e ixgbevf: add correct exception tracing for XDP
b5cc02c6986f ieee802154: fix error return code in ieee802154_llsec_getparams()
4ca8aa37cb43 ieee802154: fix error return code in ieee802154_add_iface()
66f3ab065b70 netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches
da8d31e80ff4 netfilter: nft_ct: skip expectations for confirmed conntrack
14c0381e2639 ACPICA: Clean up context mutex during object deletion
8e8678936f0d net/sched: act_ct: Fix ct template allocation for zone 0
385e1861f31b HID: i2c-hid: fix format string mismatch
279e2136dd21 HID: pidff: fix error return code in hid_pidff_init()
c8a95cb0c02d ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service
087b803a5b49 vfio/platform: fix module_put call in error flow
60dcad10e2c7 samples: vfio-mdev: fix error handing in mdpy_fb_probe()
870973918b2a vfio/pci: zap_vma_ptes() needs MMU
5da371c3fdfb vfio/pci: Fix error return code in vfio_ecap_init()
a4ed60297770 efi: cper: fix snprintf() use in cper_dimm_err_location()
bc8f6647a73c efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared
2986fdd3211f netfilter: conntrack: unregister ipv4 sockopts on error unwind
90870b45fc62 hwmon: (dell-smm-hwmon) Fix index values
0338fa4af9f3 nl80211: validate key indexes for cfg80211_registered_device
e9487a498753 ALSA: usb: update old-style static const declaration
aaa41b3094ea net: usb: cdc_ncm: don't spew notifications
96a40c3fa3d3 btrfs: tree-checker: do not error out if extent ref hash doesn't match
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ac4206f38bba852b1171419ad72a6e1c75ccec4c)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index f09580a8df..432289292b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "c538f43c5caae421d4cd56782dc8213c3ea7cbb4"
-SRCREV_meta ?= "669bba3f8ad5c588063f3a8be4fca46c309b0714"
+SRCREV_machine ?= "08b154b1c1f1c85db88295a4169dff6826c2e383"
+SRCREV_meta ?= "656383210d369bbd49a7a278c6c7c7313f0df825"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.124"
+LINUX_VERSION ?= "5.4.125"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index bb4b24ac0d..6c93e2b163 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.124"
+LINUX_VERSION ?= "5.4.125"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "5c655b0a0cf0aed21db20fc2e7fdc2cd1bea7def"
-SRCREV_machine ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
-SRCREV_meta ?= "669bba3f8ad5c588063f3a8be4fca46c309b0714"
+SRCREV_machine_qemuarm ?= "35f9751972b9fba920b1666228a35e5ce0b04440"
+SRCREV_machine ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee"
+SRCREV_meta ?= "656383210d369bbd49a7a278c6c7c7313f0df825"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index b0c0ab3c96..7edab4931a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "1c6a92761a897497f1a265e41fbc5a71e77c9599"
-SRCREV_machine_qemuarm64 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
-SRCREV_machine_qemumips ?= "bd70ff3bfca60803be364d3c6a45ab64da9fe1e1"
-SRCREV_machine_qemuppc ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
-SRCREV_machine_qemuriscv64 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
-SRCREV_machine_qemux86 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
-SRCREV_machine_qemux86-64 ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
-SRCREV_machine_qemumips64 ?= "f67e90b460cfafbb8a7a9e73c95587321f784351"
-SRCREV_machine ?= "2487a0dd8891bcdb43b6ab2b46e3a41909ef7b1a"
-SRCREV_meta ?= "669bba3f8ad5c588063f3a8be4fca46c309b0714"
+SRCREV_machine_qemuarm ?= "b523a950c926e2d7475768b504e46fa618a3b891"
+SRCREV_machine_qemuarm64 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee"
+SRCREV_machine_qemumips ?= "bff59892e827bc85e85fef518305007a787812aa"
+SRCREV_machine_qemuppc ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee"
+SRCREV_machine_qemuriscv64 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee"
+SRCREV_machine_qemux86 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee"
+SRCREV_machine_qemux86-64 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee"
+SRCREV_machine_qemumips64 ?= "e25b97140f5d46ac437cd8a1d9ecc235cbf462b5"
+SRCREV_machine ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee"
+SRCREV_meta ?= "656383210d369bbd49a7a278c6c7c7313f0df825"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.124"
+LINUX_VERSION ?= "5.4.125"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 08/13] linuxloader: Be aware of riscv32 ldso
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (6 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 07/13] linux-yocto/5.4: update to v5.4.125 Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 09/13] valgrind: remove buggy ptest from arm64 Anuj Mittal
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0d7aa00663e1e41980afb24d0ada2d76e8723e2b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/linuxloader.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/linuxloader.bbclass b/meta/classes/linuxloader.bbclass
index 30925ac87d..1b64be6405 100644
--- a/meta/classes/linuxloader.bbclass
+++ b/meta/classes/linuxloader.bbclass
@@ -52,6 +52,8 @@ def get_glibc_loader(d):
dynamic_loader = "${base_libdir}/ld-linux-aarch64${ARMPKGSFX_ENDIAN_64}.so.1"
elif targetarch.startswith("riscv64"):
dynamic_loader = "${base_libdir}/ld-linux-riscv64-lp64${@['d', ''][d.getVar('TARGET_FPU') == 'soft']}.so.1"
+ elif targetarch.startswith("riscv32"):
+ dynamic_loader = "${base_libdir}/ld-linux-riscv32-ilp32${@['d', ''][d.getVar('TARGET_FPU') == 'soft']}.so.1"
return dynamic_loader
def get_linuxloader(d):
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 09/13] valgrind: remove buggy ptest from arm64
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (7 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 08/13] linuxloader: Be aware of riscv32 ldso Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 10/13] valgrind: Actually install list of non-deterministic ptests Anuj Mittal
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Tony Tascioglu <tony.tascioglu@windriver.com>
This commit removes the stack_changes ptest from aarch64 devices.
This test is buggy and fails almost 100% of the time in qemuarm64.
In general, many of the valgrind tests are more likely to fail on
qemuarm64 vs native x86_64.
This test previously worked on gatesgarth and dunfell, but has
been failing since hardknott. It might be due to a recent change
in the cross-compiler or glibc.
The test runs fine when running natively on arm on a Raspberry Pi.
Until we can find the root cause for the failures, this shorter
term solution should clear up some of the noise from the autobuilder
from a known failure.
Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 82d6411b80a46d8ec0258ca75c3c80dc6128d44e)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64
index 93bfd45a4e..ccbb59cf7e 100644
--- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64
+++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64
@@ -233,3 +233,4 @@ memcheck/tests/wrapmalloc
memcheck/tests/wrapmallocstatic
memcheck/tests/writev1
memcheck/tests/xml1
+memcheck/tests/linux/stack_changes
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 10/13] valgrind: Actually install list of non-deterministic ptests
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (8 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 09/13] valgrind: remove buggy ptest from arm64 Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 11/13] perf: Use python3targetconfig to ensure we use target libraries Anuj Mittal
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Tony Tascioglu <tony.tascioglu@windriver.com>
Install list of non-deterministic threaded ptests to be run using taskset
to force them to a single core. This commit works with b318944d7, which
updated the testing script to run the non-deterministic tests separately
but didn't install the list of tests, so these tests were being run
without taskset.
The taskset_nondeterministic_tests file is the list of tests that will
be run separately with taskset, and ignored during the other tests. This
is installed to /usr/lib/valgrind/ptest similar to the 2 existing lists
for tests to skip on ARM and all architectures.
Removed bar_bad and bar_bad_xml to be included separately as they cause
issues on non-kvm QEMU instances.
See:
b318944dd7 valgrind: Improve non-deterministic ptest reliability
for more info.
Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3d23985d0d653844863ed513d75d93a36359992f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/valgrind/valgrind/run-ptest | 4 ++--
.../valgrind/valgrind/taskset_nondeterministic_tests | 2 --
meta/recipes-devtools/valgrind/valgrind_3.16.1.bb | 2 ++
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind/run-ptest b/meta/recipes-devtools/valgrind/valgrind/run-ptest
index b563eb3567..a19944f285 100755
--- a/meta/recipes-devtools/valgrind/valgrind/run-ptest
+++ b/meta/recipes-devtools/valgrind/valgrind/run-ptest
@@ -33,7 +33,7 @@ fi
echo "Run flaky tests using taskset to limit them to a single core."
for i in `cat taskset_nondeterministic_tests`; do
- taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee ${LOG}
+ taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee -a ${LOG}
mv $i.vgtest $i.IGNORE
done
@@ -43,7 +43,7 @@ cd ${VALGRIND_LIB}/ptest && ./tests/vg_regtest \
--valgrind-lib=${VALGRIND_LIB} \
--yocto-ptest \
gdbserver_tests ${TOOLS} ${EXP_TOOLS} \
- 2>&1|tee ${LOG}
+ 2>&1|tee -a ${LOG}
cd ${VALGRIND_LIB}/ptest && \
./tests/post_regtest_checks $(pwd) \
diff --git a/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests b/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
index cf073fa927..e15100ade7 100644
--- a/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
+++ b/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
@@ -1,4 +1,2 @@
helgrind/tests/hg05_race2
helgrind/tests/tc09_bad_unlock
-drd/tests/bar_bad
-drd/tests/bar_bad_xml
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb
index 3493745828..b48d96f8a3 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb
@@ -18,6 +18,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
file://run-ptest \
file://remove-for-aarch64 \
file://remove-for-all \
+ file://taskset_nondeterministic_tests \
file://0004-Fix-out-of-tree-builds.patch \
file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \
file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \
@@ -189,6 +190,7 @@ do_install_ptest() {
cp ${B}/config.h ${D}${PTEST_PATH}
install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH}
install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH}
+ install -D ${WORKDIR}/taskset_nondeterministic_tests ${D}${PTEST_PATH}
# Add an executable need by none/tests/bigcode
mkdir ${D}${PTEST_PATH}/perf
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 11/13] perf: Use python3targetconfig to ensure we use target libraries
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (9 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 10/13] valgrind: Actually install list of non-deterministic ptests Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 12/13] avahi: apply fix for CVE-2021-3468 Anuj Mittal
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
We've seen some reproducibility issues on the autobuilder in perf where the
size of the python module varies slightly between systems. After some head
scratching and removing the --quiet option to the python module build,
you can see it using -Lrecipe-sysroot-native in the linking commandline
for the module. This means it is linking against the native library
on systems where that works, skipping it and using the target one
otherwise, probably with warnings in logs we've not seen.
The fix is to inherit the python3targetconfig class which ensures
that the target sysroot is used, then the byte differences between
the builds go away and things are sane(r) again.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8e2b6c042edd9ec76cb8281247604e4f81518780)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/perf/perf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 2dfd798ef7..99808d636b 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -48,7 +48,7 @@ PROVIDES = "virtual/perf"
inherit linux-kernel-base kernel-arch manpages
# needed for building the tools/perf Python bindings
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3native', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3targetconfig', '', d)}
inherit python3-dir
export PYTHON_SITEPACKAGES_DIR
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 12/13] avahi: apply fix for CVE-2021-3468
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (10 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 11/13] perf: Use python3targetconfig to ensure we use target libraries Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-22 9:50 ` [hardknott][PATCH 13/13] kernel.bbclass: fix do_sizecheck() comparison Anuj Mittal
2021-06-26 14:29 ` [OE-core] [hardknott][PATCH 00/13] review request Richard Purdie
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross@burtonini.com>
This patch isn't yet upstream but it has been submitted and other distros
are shipping it.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ea33a4a2df4600a55b268e9d57e7396c30f3d123)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-connectivity/avahi/avahi_0.8.bb | 1 +
.../avahi/files/handle-hup.patch | 41 +++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 meta/recipes-connectivity/avahi/files/handle-hup.patch
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 23c0e8d823..a07cdbd03c 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -24,6 +24,7 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
file://99avahi-autoipd \
file://initscript.patch \
file://0001-Fix-opening-etc-resolv.conf-error.patch \
+ file://handle-hup.patch \
"
UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
diff --git a/meta/recipes-connectivity/avahi/files/handle-hup.patch b/meta/recipes-connectivity/avahi/files/handle-hup.patch
new file mode 100644
index 0000000000..26632e5443
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/handle-hup.patch
@@ -0,0 +1,41 @@
+CVE: CVE-2021-3468
+Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/330]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone <sirmy15@gmail.com>
+Date: Fri, 26 Mar 2021 11:50:24 +0100
+Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in
+ client_work
+
+If a client fills the input buffer, client_work() disables the
+AVAHI_WATCH_IN event, thus preventing the function from executing the
+`read` syscall the next times it is called. However, if the client then
+terminates the connection, the socket file descriptor receives a HUP
+event, which is not handled, thus the kernel keeps marking the HUP event
+as occurring. While iterating over the file descriptors that triggered
+an event, the client file descriptor will keep having the HUP event and
+the client_work() function is always called with AVAHI_WATCH_HUP but
+without nothing being done, thus entering an infinite loop.
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938
+---
+ avahi-daemon/simple-protocol.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
+index 3e0ebb11..6c0274d6 100644
+--- a/avahi-daemon/simple-protocol.c
++++ b/avahi-daemon/simple-protocol.c
+@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv
+ }
+ }
+
++ if (events & AVAHI_WATCH_HUP) {
++ client_free(c);
++ return;
++ }
++
+ c->server->poll_api->watch_update(
+ watch,
+ (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) |
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [hardknott][PATCH 13/13] kernel.bbclass: fix do_sizecheck() comparison
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (11 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 12/13] avahi: apply fix for CVE-2021-3468 Anuj Mittal
@ 2021-06-22 9:50 ` Anuj Mittal
2021-06-26 14:29 ` [OE-core] [hardknott][PATCH 00/13] review request Richard Purdie
13 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2021-06-22 9:50 UTC (permalink / raw)
To: openembedded-core
From: Andrea Adami <andrea.adami@gmail.com>
The routine do_sizecheck() was historically needed by legacy
devices with limited flash memory.
The lowest extreme is probably with Zaurus collie having exactly
1024*1024 = 1048576 bytes for the kernel partition.
In the years the KERNEL_IMAGE_MAXSIZE has been converted to kilobytes
thus rounded so we have now KERNEL_IMAGE_MAXSIZE_collie = "1024".
The effect is that now the check fails because we hit curiously this
| WARNING: This kernel zImage (size=1024(K) > 1024(K)) is too big for...
even though zImage is 1047288 bytes (kernel + kexecboot-klibc-initramfs).
Fix this case using test -gt (greater) instead of -ge (greater or equal).
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 254ca956d63b4ce6aa294213b60bb943f9f3a9e6)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/kernel.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 8693ab86be..379bed44f2 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -714,7 +714,7 @@ do_sizecheck() {
at_least_one_fits=
for imageType in ${KERNEL_IMAGETYPES} ; do
size=`du -ks ${B}/${KERNEL_OUTPUT_DIR}/$imageType | awk '{print $1}'`
- if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+ if [ $size -gt ${KERNEL_IMAGE_MAXSIZE} ]; then
bbwarn "This kernel $imageType (size=$size(K) > ${KERNEL_IMAGE_MAXSIZE}(K)) is too big for your device."
else
at_least_one_fits=y
--
2.31.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [OE-core] [hardknott][PATCH 00/13] review request
2021-06-22 9:50 [hardknott][PATCH 00/13] review request Anuj Mittal
` (12 preceding siblings ...)
2021-06-22 9:50 ` [hardknott][PATCH 13/13] kernel.bbclass: fix do_sizecheck() comparison Anuj Mittal
@ 2021-06-26 14:29 ` Richard Purdie
13 siblings, 0 replies; 15+ messages in thread
From: Richard Purdie @ 2021-06-26 14:29 UTC (permalink / raw)
To: Anuj Mittal, openembedded-core
On Tue, 2021-06-22 at 17:50 +0800, Anuj Mittal wrote:
> Please review these changes for hardknott. I have not included 5.10
> kernel update since that breaks build for -rt kernel.
>
> Two ptests, for valgrind and lttng-tools, failed while testing on
> autobuilder. We already have bugs for these.
I'm a little worried about this as the lttng-tools upgrade you backport
here is likely causing the increased timeouts for that ptest, we were
not seeing that issue previously :(.
Sadly I'm just lacking bandwidth to try and debug that and figure out
a fix other than increasing the ptest timeout which I'm reluctant to do.
Cheers,
Richard
^ permalink raw reply [flat|nested] 15+ messages in thread