From patchwork Thu Jul 6 15:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26978 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB676EB64DD for ; Thu, 6 Jul 2023 15:06:50 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web10.26488.1688656003060049598 for ; Thu, 06 Jul 2023 08:06:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=p8R3ccO9; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-51b4ef5378bso630060a12.1 for ; Thu, 06 Jul 2023 08:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656002; x=1691248002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JLD/sbt1gaxTrZOdihVDtaa8oH8D9Ny5afU0KIQESgU=; b=p8R3ccO9DFWQCujEtHw3/2wmAFwpVtQXR6Zjg8ZZSQwssU/2Z8N9aurn+BEnsKGwSe Q5e0a/Jtpl8K1JzPFsnhlo+m687/6iPW7YCetQIB+tCMpkFAST1GWO9Wc2Z/RvTOB9fY VeAV54qMzQE9Ox+1PoLMOgZ5QWadPlJbQHW4BDAKYd5AM61CDUBdQpo1lSLfvwlwEr+h ninh2yj1g7vx7mlGfoOTqlw68KQ/GAnplzA4418Km0+h4/Fx/2ypDuGUER5q6czO2E1a lb6qllDvgAria+ccX4Zg7EhqIC6KOKzotyIkkB8FzY9Om57SQozAG58useNz30ler/4i QcCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656002; x=1691248002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JLD/sbt1gaxTrZOdihVDtaa8oH8D9Ny5afU0KIQESgU=; b=WBd78Gu0wHj1fSUdjrrF5nnM1A+Z34DsJEZRvwUVcdMT5Re3b4vozJnO2nj9i/2XcE yG5lYNETEz8jI0sPWtVt9w742baJ6AaFbjNzLBihuR/lqz4SriDBba7Nj3Koz9/G/oGt KI2ZlKIgG6Od56eMoTgig68HuOietP008o028l/wY2UbVNm9k1dU+socafSNF4Q2Nsfx BaEWkiyavJfKHxqCObdIsD5QlZvkjyKRGbDhydQF/F2AbNdasYfSErnrfKcOeu0dOat/ xHXE0NDomr0HyfKxFsGeG4gZDIRM+6REK0uMDLl7VyxoQ5cM5CBtu7iD/Ol/SXXgADdJ oPbQ== X-Gm-Message-State: ABy/qLYpnSgdwvWXc1M1+x8YNZEQ6Zq3qN3+jciMRX4QAlMM5sIxkR2u oFX+Xu+Ggh2brq7FDzWTUgIoFogaHYiagkK/nmg= X-Google-Smtp-Source: APBJJlHCPCMM+hxgDN6ItEJ8boxxHrqauckKryc/+X4EO6FipYtJGH4isYxNVCCUCM+lE0SBs0Wg8Q== X-Received: by 2002:a17:903:11ce:b0:1b3:c4c1:ec4f with SMTP id q14-20020a17090311ce00b001b3c4c1ec4fmr3199307plh.37.1688656002048; Thu, 06 Jul 2023 08:06:42 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/28] go: fix CVE-2023-29400 html/template improper handling of empty HTML attributes Date: Thu, 6 Jul 2023 05:06:04 -1000 Message-Id: <3224084a1ca301ff4fb4735ccc80d24aaec13257.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:06:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183954 From: Vivek Kumbhar Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.17.13.inc | 1 + .../go/go-1.18/CVE-2023-29400.patch | 99 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2023-29400.patch diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc index 3365075fe5..73921852fc 100644 --- a/meta/recipes-devtools/go/go-1.17.13.inc +++ b/meta/recipes-devtools/go/go-1.17.13.inc @@ -35,6 +35,7 @@ SRC_URI += "\ file://CVE-2023-29404.patch \ file://CVE-2023-29405.patch \ file://CVE-2023-29402.patch \ + file://CVE-2023-29400.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd" diff --git a/meta/recipes-devtools/go/go-1.18/CVE-2023-29400.patch b/meta/recipes-devtools/go/go-1.18/CVE-2023-29400.patch new file mode 100644 index 0000000000..04bd1f5fec --- /dev/null +++ b/meta/recipes-devtools/go/go-1.18/CVE-2023-29400.patch @@ -0,0 +1,99 @@ +From 9db0e74f606b8afb28cc71d4b1c8b4ed24cabbf5 Mon Sep 17 00:00:00 2001 +From: Roland Shoemaker +Date: Thu, 13 Apr 2023 14:01:50 -0700 +Subject: [PATCH] [release-branch.go1.19] html/template: emit filterFailsafe + for empty unquoted attr value + +An unquoted action used as an attribute value can result in unsafe +behavior if it is empty, as HTML normalization will result in unexpected +attributes, and may allow attribute injection. If executing a template +results in a empty unquoted attribute value, emit filterFailsafe +instead. + +Thanks to Juho Nurminen of Mattermost for reporting this issue. + +For #59722 +Fixes #59815 +Fixes CVE-2023-29400 + +Change-Id: Ia38d1b536ae2b4af5323a6c6d861e3c057c2570a +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1826631 +Reviewed-by: Julie Qiu +Run-TryBot: Roland Shoemaker +Reviewed-by: Damien Neil +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1851498 +Reviewed-by: Roland Shoemaker +Run-TryBot: Damien Neil +Reviewed-on: https://go-review.googlesource.com/c/go/+/491357 +Run-TryBot: Carlos Amedee +TryBot-Result: Gopher Robot +Reviewed-by: Dmitri Shuralyov + +Upstream-Status: Backport [https://github.com/golang/go/commit/9db0e74f606b8afb28cc71d4b1c8b4ed24cabbf5] +CVE: CVE-2023-29400 +Signed-off-by: Vivek Kumbhar +--- + src/html/template/escape.go | 5 ++--- + src/html/template/escape_test.go | 15 +++++++++++++++ + src/html/template/html.go | 3 +++ + 3 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/src/html/template/escape.go b/src/html/template/escape.go +index ca078f4..bdccc65 100644 +--- a/src/html/template/escape.go ++++ b/src/html/template/escape.go +@@ -362,9 +362,8 @@ func normalizeEscFn(e string) string { + // for all x. + var redundantFuncs = map[string]map[string]bool{ + "_html_template_commentescaper": { +- "_html_template_attrescaper": true, +- "_html_template_nospaceescaper": true, +- "_html_template_htmlescaper": true, ++ "_html_template_attrescaper": true, ++ "_html_template_htmlescaper": true, + }, + "_html_template_cssescaper": { + "_html_template_attrescaper": true, +diff --git a/src/html/template/escape_test.go b/src/html/template/escape_test.go +index fbc84a7..4f48afe 100644 +--- a/src/html/template/escape_test.go ++++ b/src/html/template/escape_test.go +@@ -678,6 +678,21 @@ func TestEscape(t *testing.T) { + ``, + ``, + }, ++ { ++ "unquoted empty attribute value (plaintext)", ++ "

", ++ "

", ++ }, ++ { ++ "unquoted empty attribute value (url)", ++ "

", ++ "

", ++ }, ++ { ++ "quoted empty attribute value", ++ "

", ++ "

", ++ }, + } + + for _, test := range tests { +diff --git a/src/html/template/html.go b/src/html/template/html.go +index 356b829..636bc21 100644 +--- a/src/html/template/html.go ++++ b/src/html/template/html.go +@@ -14,6 +14,9 @@ import ( + // htmlNospaceEscaper escapes for inclusion in unquoted attribute values. + func htmlNospaceEscaper(args ...interface{}) string { + s, t := stringify(args...) ++ if s == "" { ++ return filterFailsafe ++ } + if t == contentTypeHTML { + return htmlReplacer(stripTags(s), htmlNospaceNormReplacementTable, false) + } +-- +2.25.1 + From patchwork Thu Jul 6 15:06:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26980 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB6B5C001DF for ; Thu, 6 Jul 2023 15:06:50 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.26454.1688656005648298433 for ; Thu, 06 Jul 2023 08:06:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=aDe3RXK2; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b7e66ff65fso5151925ad.0 for ; Thu, 06 Jul 2023 08:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656005; x=1691248005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Z5G2s/3AoxN3ih+x/Ovc/aQj/KqnnlTVItvLMopknPU=; b=aDe3RXK2qPgk8utSxKvQJ7ShALg3TzdlgMmSObOGRw14ApoxKSHV/It/9RgxiWvSkX 76gDxlu5MLYxSaVzGFgnpN/4q1sGvgnWDueRcFz3b28h7kYm/JXiLLDqNo/p9wGk/jBZ DBbahRKfWfCxWmPxa8AIfBJqZV8ZqivrHrX12D7C9Hv/ELDsCs3I4E/JyvDdhbXZTe4h DZetXRUaK/nhZGGHdIVRFUJaOKAn35c9MCglA6rNblcK3nTziyRUWN1vSW3ASTHSEXTS qjOefzmStzK5uykTWvcMl55BbeQjuT8LilJ6cQ30VKyJ9OhBQfxK/gz40slEB1kn1Yqe Ux8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656005; x=1691248005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z5G2s/3AoxN3ih+x/Ovc/aQj/KqnnlTVItvLMopknPU=; b=DWPKO62BYdoM7s5wuYkV5FTj3uBxMyccxmdwsVlIxanrXpcgVVgF2PWdXn/9L2r5jt OoarPlpfIgUa/vDYsq7vpQyxDqb7hqu6taYJfRwqM1uxiD+A7l3pWNR9S0iRXTTuOhp6 a2uIWvTfs+z2J0CiH9H6AUNDrQp8JoTT3kk7cS4CUKS/UrUrdwielw6BZsIdEb8MzcpC wKJb/SgoeqaupPh7DGCYpHi7W5TDe74+1bDkHY2TPQ0JXLbrAtN+lMaiT4YQfG5KmXbE 4rjwAbI6igPtbYpLqrjnsvwMhxofWpTq4i09OSGDn0ORWQ3DAJx3EAEcSFWBA7+3OuOT CPsg== X-Gm-Message-State: ABy/qLbKhV/evU9xmy/8w1K7V8CSIc6r6L+LYWica8zyigHleRD/zV+u gmhrh595jY1R7qfuNmeASG9aNkys+xInM52ZG6o= X-Google-Smtp-Source: APBJJlF4Ks7Yp0GSqh/+hJ7oqOx/Qd72hdH4lykHIViCpXQe8NS3iPxPN/CKcZXmEnwWBtIRmVFCDQ== X-Received: by 2002:a17:902:c3c4:b0:1b8:9b5e:65c8 with SMTP id j4-20020a170902c3c400b001b89b5e65c8mr2063046plj.4.1688656004316; Thu, 06 Jul 2023 08:06:44 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/28] libcap: fix CVE-2023-2603 Integer Overflow in _libcap_strdup() Date: Thu, 6 Jul 2023 05:06:05 -1000 Message-Id: <92340bc3161259c962b5ed5f9d9055f5bd36a3ce.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:06:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183955 From: Vivek Kumbhar Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- .../libcap/files/CVE-2023-2603.patch | 60 +++++++++++++++++++ meta/recipes-support/libcap/libcap_2.66.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta/recipes-support/libcap/files/CVE-2023-2603.patch diff --git a/meta/recipes-support/libcap/files/CVE-2023-2603.patch b/meta/recipes-support/libcap/files/CVE-2023-2603.patch new file mode 100644 index 0000000000..e09be78640 --- /dev/null +++ b/meta/recipes-support/libcap/files/CVE-2023-2603.patch @@ -0,0 +1,60 @@ +From 422bec25ae4a1ab03fd4d6f728695ed279173b18 Mon Sep 17 00:00:00 2001 +From: "Andrew G. Morgan" +Date: Wed, 3 May 2023 19:44:22 -0700 +Subject: Large strings can confuse libcap's internal strdup code. + +Avoid something subtle with really long strings: 1073741823 should +be enough for anybody. This is an improved fix over something attempted +in libcap-2.55 to address some static analysis findings. + +Reviewing the library, cap_proc_root() and cap_launcher_set_chroot() +are the only two calls where the library is potentially exposed to a +user controlled string input. + +Credit for finding this bug in libcap goes to Richard Weinberger of +X41 D-Sec GmbH (https://x41-dsec.de/) who performed a security audit +of the libcap source code in April of 2023. The audit was sponsored +by the Open Source Technology Improvement Fund (https://ostif.org/). + +Audit ref: LCAP-CR-23-02 (CVE-2023-2603) + +Signed-off-by: Andrew G. Morgan + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=422bec25ae4a1ab03fd4d6f728695ed279173b18] +CVE: CVE-2023-2603 +Signed-off-by: Vivek Kumbhar + +--- + libcap/cap_alloc.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/libcap/cap_alloc.c b/libcap/cap_alloc.c +index c826e7a..25f9981 100644 +--- a/libcap/cap_alloc.c ++++ b/libcap/cap_alloc.c +@@ -105,15 +105,17 @@ char *_libcap_strdup(const char *old) + errno = EINVAL; + return NULL; + } +- len = strlen(old) + 1 + 2*sizeof(__u32); +- if (len < sizeof(struct _cap_alloc_s)) { +- len = sizeof(struct _cap_alloc_s); +- } +- if ((len & 0xffffffff) != len) { ++ ++ len = strlen(old); ++ if ((len & 0x3fffffff) != len) { + _cap_debug("len is too long for libcap to manage"); + errno = EINVAL; + return NULL; + } ++ len += 1 + 2*sizeof(__u32); ++ if (len < sizeof(struct _cap_alloc_s)) { ++ len = sizeof(struct _cap_alloc_s); ++ } + + raw_data = calloc(1, len); + if (raw_data == NULL) { +-- +2.25.1 + diff --git a/meta/recipes-support/libcap/libcap_2.66.bb b/meta/recipes-support/libcap/libcap_2.66.bb index d3189fb105..7534063b7d 100644 --- a/meta/recipes-support/libcap/libcap_2.66.bb +++ b/meta/recipes-support/libcap/libcap_2.66.bb @@ -17,6 +17,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ file://0002-tests-do-not-run-target-executables.patch \ file://CVE-2023-2602.patch \ + file://CVE-2023-2603.patch \ " SRC_URI:append:class-nativesdk = " \ file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \ From patchwork Thu Jul 6 15:06:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDE8DEB64DC for ; Thu, 6 Jul 2023 15:06:50 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.26490.1688656008239986015 for ; Thu, 06 Jul 2023 08:06:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=HNEZfFla; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1b8b318c5cfso4918915ad.1 for ; Thu, 06 Jul 2023 08:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656007; x=1691248007; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BYmDEPdg6nsmump+rECcE2GMXJ0VVFueIlzoJbx3a5w=; b=HNEZfFlahCX05vUC/fhYfEyXJPYl/3VyEu/OIm2yUyNuaR+TqZqC6XSYhGPAoZjhS5 5I5gJNe6M7g/Qr0tPezMNmiSV7C9AHmSSYD3lao9T0x5rQRcaJd/Wppm4vs1suLOUEyD buvjHL/dlcBLuFY25GpSiGjChBWFyg2335Mzahjl+kNn073AFb6p4W5w7Oz0uG6tFZiv RtUtQbt8/aViWBQfNT70kAhz3QzhWyUYaS65HedGbBb5L4/2iKufboNVC54Qe3ToH48q ywJxVLSPyWM1onhLbcEgo/Jke9Bam75LhT8KAWwpVC5r9nkUL4aNorWC8b546v9ho/7f +Udg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656007; x=1691248007; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BYmDEPdg6nsmump+rECcE2GMXJ0VVFueIlzoJbx3a5w=; b=W7WyjDqivCY4S2c8aKawaHPb/3amM2EQVu0CQQRss8iQh+0RCeEkhX6PFGyZ9nsg3L PvoMCs4hWsXNjf+MwJTJgurPI+XPWxfxp6RVavf4Mr0d/2VbYmBedbKx8fcinAlNXqHs 4wm2dzmihnCPyHS9E2v1x7x/CmzgxQZtn76mGQc6dC0vvYKv8FLYCOqeMgCdHNWjkUZq BHat/JAzcW2hlo9iqH8Vt0Qrm7l/ud4jxn3p/1p8VEgkyUx2gN84CanCAfz1cs370rW2 Oblr9LjynVr4aMtQqJpF4FTjS4FTcoU+ExwbfF64IIYORR9UEkCeyv8RBgKiAzLqsRQH AN0Q== X-Gm-Message-State: ABy/qLYjT/NFgVZICuJrje0wFe46YRPPy6f484H9JyZTs15r6I3dPTvi Iu1x70We4xYaZE7KXxqs2UcTcJo6fHLZFh4iEnw= X-Google-Smtp-Source: APBJJlF2n8deMzU0byR4Nfq1givQSTdsVQe+jzKCieH4HgickN26/CopQotJtqrTQVDQ7O9NoRVdSQ== X-Received: by 2002:a17:902:d48c:b0:1b8:52b:dd52 with SMTP id c12-20020a170902d48c00b001b8052bdd52mr1952200plg.36.1688656006946; Thu, 06 Jul 2023 08:06:46 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/28] cpio: Replace fix wrong CRC with ASCII CRC for large files with upstream backport Date: Thu, 6 Jul 2023 05:06:06 -1000 Message-Id: <727f301e4888c8f59cfc2d8768d02bb52ce23784.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:06:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183956 From: Marek Vasut Replace the original "Wrong CRC with ASCII CRC for large files" patch with upstream backport, and add additional fix on top of the same problem which upstream detected and fixed. Signed-off-by: Marek Vasut Signed-off-by: Steve Sakoman --- ...g-CRC-with-ASCII-CRC-for-large-files.patch | 39 --- ...-calculation-of-CRC-in-copy-out-mode.patch | 58 ++++ ...appending-to-archives-bigger-than-2G.patch | 312 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.13.bb | 3 +- 4 files changed, 372 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.13/0003-Fix-calculation-of-CRC-in-copy-out-mode.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.13/0004-Fix-appending-to-archives-bigger-than-2G.patch diff --git a/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch b/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch deleted file mode 100644 index 4b96e4316c..0000000000 --- a/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 77ff5f1be394eb2c786df561ff37dde7f982ec76 Mon Sep 17 00:00:00 2001 -From: Stefano Babic -Date: Fri, 28 Jul 2017 13:20:52 +0200 -Subject: [PATCH] Wrong CRC with ASCII CRC for large files - -Due to signedness, the checksum is not computed when filesize is bigger -a 2GB. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-cpio/2017-07/msg00004.html] -Signed-off-by: Stefano Babic ---- - src/copyout.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/copyout.c b/src/copyout.c -index 1f0987a..727aeca 100644 ---- a/src/copyout.c -+++ b/src/copyout.c -@@ -34,13 +34,13 @@ - compute and return a checksum for them. */ - - static uint32_t --read_for_checksum (int in_file_des, int file_size, char *file_name) -+read_for_checksum (int in_file_des, unsigned int file_size, char *file_name) - { - uint32_t crc; - char buf[BUFSIZ]; -- int bytes_left; -- int bytes_read; -- int i; -+ unsigned int bytes_left; -+ unsigned int bytes_read; -+ unsigned int i; - - crc = 0; - --- -2.7.4 - diff --git a/meta/recipes-extended/cpio/cpio-2.13/0003-Fix-calculation-of-CRC-in-copy-out-mode.patch b/meta/recipes-extended/cpio/cpio-2.13/0003-Fix-calculation-of-CRC-in-copy-out-mode.patch new file mode 100644 index 0000000000..2dfd348d7c --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.13/0003-Fix-calculation-of-CRC-in-copy-out-mode.patch @@ -0,0 +1,58 @@ +From d257e47a6c6b41ba727b196ac96c05ab91bd9d65 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Fri, 7 Apr 2023 11:23:37 +0300 +Subject: [PATCH 3/4] Fix calculation of CRC in copy-out mode. + +* src/copyout.c (read_for_checksum): Fix type of the file_size argument. +Rewrite the reading loop. + +Original patch by Stefano Babic + +Upstream-Status: Backport [a1b2f7871c3ae5113e0102b870b15ea06a8f0e3d] +Signed-off-by: Marek Vasut +--- + src/copyout.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 8b0beb6..f1ff351 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -34,27 +34,25 @@ + compute and return a checksum for them. */ + + static uint32_t +-read_for_checksum (int in_file_des, int file_size, char *file_name) ++read_for_checksum (int in_file_des, off_t file_size, char *file_name) + { + uint32_t crc; +- char buf[BUFSIZ]; +- int bytes_left; +- int bytes_read; +- int i; ++ unsigned char buf[BUFSIZ]; ++ ssize_t bytes_read; ++ ssize_t i; + + crc = 0; + +- for (bytes_left = file_size; bytes_left > 0; bytes_left -= bytes_read) ++ while (file_size > 0) + { + bytes_read = read (in_file_des, buf, BUFSIZ); + if (bytes_read < 0) + error (PAXEXIT_FAILURE, errno, _("cannot read checksum for %s"), file_name); + if (bytes_read == 0) + break; +- if (bytes_left < bytes_read) +- bytes_read = bytes_left; +- for (i = 0; i < bytes_read; ++i) ++ for (i = 0; i < bytes_read; i++) + crc += buf[i] & 0xff; ++ file_size -= bytes_read; + } + if (lseek (in_file_des, 0L, SEEK_SET)) + error (PAXEXIT_FAILURE, errno, _("cannot read checksum for %s"), file_name); +-- +2.39.2 + diff --git a/meta/recipes-extended/cpio/cpio-2.13/0004-Fix-appending-to-archives-bigger-than-2G.patch b/meta/recipes-extended/cpio/cpio-2.13/0004-Fix-appending-to-archives-bigger-than-2G.patch new file mode 100644 index 0000000000..c212bddf7d --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.13/0004-Fix-appending-to-archives-bigger-than-2G.patch @@ -0,0 +1,312 @@ +From 8513495ab5cfb63eb7c4c933fdf0b78c6196cd27 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Fri, 28 Apr 2023 15:23:46 +0300 +Subject: [PATCH 4/4] Fix appending to archives bigger than 2G + +* src/extern.h (last_header_start): Change type to off_t. +* src/global.c: Likewise. +* src/util.c (prepare_append): Use off_t for file offsets. + +Upstream-Status: Backport [0987d63384f0419b4b14aecdc6a61729b75ce86a] +Signed-off-by: Marek Vasut +--- + src/extern.h | 11 ++++----- + src/global.c | 2 +- + src/util.c | 66 ++++++++++++++++++++++++++-------------------------- + 3 files changed, 39 insertions(+), 40 deletions(-) + +diff --git a/src/extern.h b/src/extern.h +index 11ac6bf..12f14a9 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -67,7 +67,7 @@ extern int ignore_devno_option; + + extern bool to_stdout_option; + +-extern int last_header_start; ++extern off_t last_header_start; + extern int copy_matching_files; + extern int numeric_uid; + extern char *pattern_file_name; +@@ -123,7 +123,7 @@ void field_width_error (const char *filename, const char *fieldname, + + /* copypass.c */ + void process_copy_pass (void); +-int link_to_maj_min_ino (char *file_name, int st_dev_maj, ++int link_to_maj_min_ino (char *file_name, int st_dev_maj, + int st_dev_min, ino_t st_ino); + int link_to_name (char const *link_name, char const *link_target); + +@@ -171,7 +171,7 @@ void copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes); + void copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename); + void copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, char *filename); + void warn_if_file_changed (char *file_name, off_t old_file_size, +- time_t old_file_mtime); ++ time_t old_file_mtime); + void create_all_directories (char const *name); + void prepare_append (int out_file_des); + char *find_inode_file (ino_t node_num, +@@ -185,7 +185,7 @@ void set_new_media_message (char *message); + #ifdef HPUX_CDF + char *add_cdf_double_slashes (char *filename); + #endif +-void write_nuls_to_file (off_t num_bytes, int out_des, ++void write_nuls_to_file (off_t num_bytes, int out_des, + void (*writer) (char *in_buf, + int out_des, off_t num_bytes)); + #define DISK_IO_BLOCK_SIZE 512 +@@ -229,6 +229,5 @@ void delay_set_stat (char const *file_name, struct stat *st, + mode_t invert_permissions); + int repair_delayed_set_stat (struct cpio_file_stat *file_hdr); + void apply_delayed_set_stat (void); +- +-int arf_stores_inode_p (enum archive_format arf); + ++int arf_stores_inode_p (enum archive_format arf); +diff --git a/src/global.c b/src/global.c +index fb3abe9..5c9fc05 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -114,7 +114,7 @@ int debug_flag = false; + + /* File position of last header read. Only used during -A to determine + where the old TRAILER!!! record started. */ +-int last_header_start = 0; ++off_t last_header_start = 0; + + /* With -i; if true, copy only files that match any of the given patterns; + if false, copy only files that do not match any of the patterns. (-f) */ +diff --git a/src/util.c b/src/util.c +index 4421b20..3be89a4 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -60,8 +60,8 @@ tape_empty_output_buffer (int out_des) + static long output_bytes_before_lseek = 0; + + /* Some tape drivers seem to have a signed internal seek pointer and +- they lose if it overflows and becomes negative (e.g. when writing +- tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the ++ they lose if it overflows and becomes negative (e.g. when writing ++ tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the + seek pointer and prevent it from overflowing. */ + if (output_is_special + && ( (output_bytes_before_lseek += output_size) >= 1073741824L) ) +@@ -106,7 +106,7 @@ static ssize_t sparse_write (int fildes, char *buf, size_t nbyte, bool flush); + descriptor OUT_DES and reset `output_size' and `out_buff'. + If `swapping_halfwords' or `swapping_bytes' is set, + do the appropriate swapping first. Our callers have +- to make sure to only set these flags if `output_size' ++ to make sure to only set these flags if `output_size' + is appropriate (a multiple of 4 for `swapping_halfwords', + 2 for `swapping_bytes'). The fact that DISK_IO_BLOCK_SIZE + must always be a multiple of 4 helps us (and our callers) +@@ -188,8 +188,8 @@ tape_fill_input_buffer (int in_des, int num_bytes) + { + #ifdef BROKEN_LONG_TAPE_DRIVER + /* Some tape drivers seem to have a signed internal seek pointer and +- they lose if it overflows and becomes negative (e.g. when writing +- tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the ++ they lose if it overflows and becomes negative (e.g. when writing ++ tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the + seek pointer and prevent it from overflowing. */ + if (input_is_special + && ( (input_bytes_before_lseek += num_bytes) >= 1073741824L) ) +@@ -332,8 +332,8 @@ tape_buffered_peek (char *peek_buf, int in_des, int num_bytes) + + #ifdef BROKEN_LONG_TAPE_DRIVER + /* Some tape drivers seem to have a signed internal seek pointer and +- they lose if it overflows and becomes negative (e.g. when writing +- tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the ++ they lose if it overflows and becomes negative (e.g. when writing ++ tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the + seek pointer and prevent it from overflowing. */ + if (input_is_special + && ( (input_bytes_before_lseek += num_bytes) >= 1073741824L) ) +@@ -404,7 +404,7 @@ tape_toss_input (int in_des, off_t num_bytes) + + if (crc_i_flag && only_verify_crc_flag) + { +- int k; ++ int k; + for (k = 0; k < space_left; ++k) + crc += in_buff[k] & 0xff; + } +@@ -416,14 +416,14 @@ tape_toss_input (int in_des, off_t num_bytes) + } + + void +-write_nuls_to_file (off_t num_bytes, int out_des, +- void (*writer) (char *in_buf, int out_des, off_t num_bytes)) ++write_nuls_to_file (off_t num_bytes, int out_des, ++ void (*writer) (char *in_buf, int out_des, off_t num_bytes)) + { + off_t blocks; + off_t extra_bytes; + off_t i; + static char zeros_512[512]; +- ++ + blocks = num_bytes / sizeof zeros_512; + extra_bytes = num_bytes % sizeof zeros_512; + for (i = 0; i < blocks; ++i) +@@ -603,7 +603,7 @@ create_all_directories (char const *name) + char *dir; + + dir = dir_name (name); +- ++ + if (dir == NULL) + error (PAXEXIT_FAILURE, 0, _("virtual memory exhausted")); + +@@ -637,9 +637,9 @@ create_all_directories (char const *name) + void + prepare_append (int out_file_des) + { +- int start_of_header; +- int start_of_block; +- int useful_bytes_in_block; ++ off_t start_of_header; ++ off_t start_of_block; ++ size_t useful_bytes_in_block; + char *tmp_buf; + + start_of_header = last_header_start; +@@ -697,8 +697,8 @@ inode_val_compare (const void *val1, const void *val2) + const struct inode_val *ival1 = val1; + const struct inode_val *ival2 = val2; + return ival1->inode == ival2->inode +- && ival1->major_num == ival2->major_num +- && ival1->minor_num == ival2->minor_num; ++ && ival1->major_num == ival2->major_num ++ && ival1->minor_num == ival2->minor_num; + } + + static struct inode_val * +@@ -706,10 +706,10 @@ find_inode_val (ino_t node_num, unsigned long major_num, + unsigned long minor_num) + { + struct inode_val sample; +- ++ + if (!hash_table) + return NULL; +- ++ + sample.inode = node_num; + sample.major_num = major_num; + sample.minor_num = minor_num; +@@ -734,7 +734,7 @@ add_inode (ino_t node_num, char *file_name, unsigned long major_num, + { + struct inode_val *temp; + struct inode_val *e = NULL; +- ++ + /* Create new inode record. */ + temp = (struct inode_val *) xmalloc (sizeof (struct inode_val)); + temp->inode = node_num; +@@ -1007,7 +1007,7 @@ buf_all_zeros (char *buf, int bufsize) + + /* Write NBYTE bytes from BUF to file descriptor FILDES, trying to + create holes instead of writing blockfuls of zeros. +- ++ + Return the number of bytes written (including bytes in zero + regions) on success, -1 on error. + +@@ -1027,7 +1027,7 @@ sparse_write (int fildes, char *buf, size_t nbytes, bool flush) + + enum { begin, in_zeros, not_in_zeros } state = + delayed_seek_count ? in_zeros : begin; +- ++ + while (nbytes) + { + size_t rest = nbytes; +@@ -1042,7 +1042,7 @@ sparse_write (int fildes, char *buf, size_t nbytes, bool flush) + if (state == not_in_zeros) + { + ssize_t bytes = buf - start_ptr + rest; +- ++ + n = write (fildes, start_ptr, bytes); + if (n == -1) + return -1; +@@ -1091,8 +1091,8 @@ sparse_write (int fildes, char *buf, size_t nbytes, bool flush) + if (n != 1) + return n; + delayed_seek_count = 0; +- } +- ++ } ++ + return nwritten + seek_count; + } + +@@ -1222,7 +1222,7 @@ set_perms (int fd, struct cpio_file_stat *header) + if (!no_chown_flag) + { + uid_t uid = CPIO_UID (header->c_uid); +- gid_t gid = CPIO_GID (header->c_gid); ++ gid_t gid = CPIO_GID (header->c_gid); + if ((fchown_or_chown (fd, header->c_name, uid, gid) < 0) + && errno != EPERM) + chown_error_details (header->c_name, uid, gid); +@@ -1239,13 +1239,13 @@ set_file_times (int fd, + const char *name, unsigned long atime, unsigned long mtime) + { + struct timespec ts[2]; +- ++ + memset (&ts, 0, sizeof ts); + + ts[0].tv_sec = atime; + ts[1].tv_sec = mtime; + +- /* Silently ignore EROFS because reading the file won't have upset its ++ /* Silently ignore EROFS because reading the file won't have upset its + timestamp if it's on a read-only filesystem. */ + if (fdutimens (fd, name, ts) < 0 && errno != EROFS) + utime_error (name); +@@ -1297,7 +1297,7 @@ cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names, + + /* This is a simplified form of delayed set_stat used by GNU tar. + With the time, both forms will merge and pass to paxutils +- ++ + List of directories whose statuses we need to extract after we've + finished extracting their subsidiary files. If you consider each + contiguous subsequence of elements of the form [D]?[^D]*, where [D] +@@ -1415,7 +1415,7 @@ cpio_mkdir (struct cpio_file_stat *file_hdr, int *setstat_delayed) + { + int rc; + mode_t mode = file_hdr->c_mode; +- ++ + if (!(file_hdr->c_mode & S_IWUSR)) + { + rc = mkdir (file_hdr->c_name, mode | S_IWUSR); +@@ -1438,10 +1438,10 @@ cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir) + { + int res; /* Result of various function calls. */ + int setstat_delayed = 0; +- ++ + if (to_stdout_option) + return 0; +- ++ + /* Strip any trailing `/'s off the filename; tar puts + them on. We might as well do it here in case anybody + else does too, since they cause strange things to happen. */ +@@ -1530,7 +1530,7 @@ arf_stores_inode_p (enum archive_format arf) + } + return 1; + } +- ++ + void + cpio_file_stat_init (struct cpio_file_stat *file_hdr) + { +-- +2.39.2 + diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb index dd3541096f..6ac5653eab 100644 --- a/meta/recipes-extended/cpio/cpio_2.13.bb +++ b/meta/recipes-extended/cpio/cpio_2.13.bb @@ -10,7 +10,8 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \ file://CVE-2021-38185.patch \ - file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \ + file://0003-Fix-calculation-of-CRC-in-copy-out-mode.patch \ + file://0004-Fix-appending-to-archives-bigger-than-2G.patch \ " SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810" From patchwork Thu Jul 6 15:06:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF410C001B0 for ; Thu, 6 Jul 2023 15:06:50 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.26457.1688656009767428487 for ; Thu, 06 Jul 2023 08:06:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=3hpRtOJY; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b8baa836a5so5074645ad.1 for ; Thu, 06 Jul 2023 08:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656009; x=1691248009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rqc9BN5XVOocZULuj2mim6dP/aM108IFp3F2xe/ai18=; b=3hpRtOJYSGsBT8bKWXFlgUvBhPKc/zcU6AklgXwnwwvmSr7/0JW8oRYBVi6wUZo5Bi 9F1gA7lWHVuj0pjNUNxgTPrLreSobsrTGxL2r54iAMb9N/jc3TNi/+/G+6123Df705th 6cfoXlQMKDUFm0dN2600dt1bBKk2CGSX/jwqKQQXaxuvUM6+XshAq//829/vwwpgO41/ 4emJOzf1GDUdapraA6YAgu8rOyIdkTtgj34fSzT3dpRLHkSI7y2P7nv/Rn/HhVc3F8eZ Fck8O9K/B+wmeKahEiJY+1+qx6XYSEtkOKKU4cpV0UoBeXvnJLCR5fivwlZKCWY2aHrF 1Xiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656009; x=1691248009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rqc9BN5XVOocZULuj2mim6dP/aM108IFp3F2xe/ai18=; b=VrxGkjtta/iMhvBWsM4w2W8jt4KDLjETT6Us/qx9Ur8I4/C5VHwdfb+fyu6I5/k+Is /rcaDYK2P+XsTqnVxrwvu5+qs1TqGh/I7jncgTpimcTzXezAg+5Zv17xmpxFCurNOFBq saF1Vj4new8oFlvD44WETP0rKRJ4pfzQ7Nw82FjhUE9/OYQLtpEov+iuUd4lqhTuUxBo iU903XFkWvu1vssNiMcv1r5w8FBm0RU9JTXfPODqv3VF2Key8Z7dt3ywE3F3SPg+HleW +fKycoyxFn7fFl2LGwESdKpX37WZ+hcn+e/sNH0WOvPQEOnD+UfTgSGk2imsYhMyW/Bh E+Aw== X-Gm-Message-State: ABy/qLbSl1p52y0dHcTgPaEoE0hlsH5UanzwSL4RDfg4oHkUutNstZwc 16t+YTeHHylOXFM9zyBRlKjlTOYhhYIXgVAFAHY= X-Google-Smtp-Source: APBJJlHATKNF2KqHuJiyEI8dgXSAcliZkxzUx7yD2YupBWuwjpLcvADcC72HBlirXk+c6tQnSefh1A== X-Received: by 2002:a17:902:b942:b0:1b3:f8db:6f0c with SMTP id h2-20020a170902b94200b001b3f8db6f0cmr2039324pls.58.1688656008918; Thu, 06 Jul 2023 08:06:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/28] libxcrypt: fix hard-coded ".so" extension Date: Thu, 6 Jul 2023 05:06:07 -1000 Message-Id: <87d3ad23643abff47ac35ca14f8b4b4bb9ee80da.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:06:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183957 From: Etienne Cordonnier 2 issues: - the .so extension is hard-coded, and therefore the libxcryt package compiled with meta-darwin is empty, because the dylib files are not contained in FILES_${PN} - nothing actually produces a file libcrypt-*.so (the symlink file is libcrypt.so, without dash), thus defining FILES:${PN} manually to contain libcrypt-*.so has no effect. Signed-off-by: Etienne Cordonnier Signed-off-by: Richard Purdie (cherry picked from commit 7ed6bfa2428b4f1ba7f09d6e9e67c462ff355153) Signed-off-by: Sanjay Chitroda Signed-off-by: Steve Sakoman --- meta/recipes-core/libxcrypt/libxcrypt.inc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 61b0381076..454a55d73d 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -17,12 +17,6 @@ SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES:${PN} = "${libdir}/libcrypt*.so.* \ - ${libdir}/libcrypt-*.so \ - ${libdir}/libowcrypt*.so.* \ - ${libdir}/libowcrypt-*.so \ -" - S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" From patchwork Thu Jul 6 15:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26981 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCD64C001B0 for ; Thu, 6 Jul 2023 15:07:00 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.26494.1688656011568645717 for ; Thu, 06 Jul 2023 08:06:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=J1vqoZfW; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b8a44ee159so3694605ad.3 for ; Thu, 06 Jul 2023 08:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656010; x=1691248010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jW75ezQsxhrtvA1jS2bv79tNC48t6Dl8jIUQGgXvDR8=; b=J1vqoZfWuLnSF1Mgkpow3l2cJz0z8l9pY2q8hAvhPronlJOM33ner3QlX4+X9bTsyr OTtu2p2GX6mlPoeAHt90foU6inQfGWJZFG4t7X3HYKnPK5qMQQE//ekIV9kWTGF2R8iV /vz7BgWLEjB0hgAOyT6bXiJ54xPdshlq9b26bXncW1Ei5AXL75UW9Xklwv2nmm07dXPf 9u+Rw/KJFs4Onwm2sZZGJ+H1N/+C2iWkOe2625uPrCizS626CDacGfeuGDNK8Mys0oo8 H7eLdk98IjvntExNz5ImEZrrfE87Lo89mJJLgh/6RmSqPr+YWX24JQl7aTYDBEL7/3D0 lg8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656010; x=1691248010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jW75ezQsxhrtvA1jS2bv79tNC48t6Dl8jIUQGgXvDR8=; b=Fpno+5bs1u0YIeiOR5TrTg8sO10ssG7yLw+tL2F5s8lMKEUiykDCUu7OUf5mDI9p48 bdJ9Pzn1D68DWnYCHOL5efwNoPK3GOOKNOumrR9twhp36Rvlh4IxnQNvx8Dk5zbwAoql XXPC4LuYYOWVIWTnsbepWvIvNRY3DICl1EjViJuTd8Fx7D0/6NebcqHeXCtyoC/QxtNN 61/4dOxKXLxAGqfoWISqlF3TXEXLzNC8N8xwwHGXwMR3VYfxs0F0hTXFXvBRNnx0yrZl 2Ynv/YLJCMmNtFLpUWuqMgJrSg/zTz8A9Z1UkmzYAFq3uSyMFRHqHalTnOvoA7ETQxUj PVEQ== X-Gm-Message-State: ABy/qLb45Qlt60PCIreCBlJoDCuu4oUacir87/UJLzQuW1z+yJkppgQW TlWdcdpdFQwjxd0mSxFxJiS9F/RBi5A/99FtHkY= X-Google-Smtp-Source: APBJJlH9h/IRm70BukBGUaUYUNZ96X4zGDeo451EeTi8GnljRvWgSIcwWGUTdE13qSPPXGRE0SrXKg== X-Received: by 2002:a17:902:7441:b0:1b7:edcd:8dcd with SMTP id e1-20020a170902744100b001b7edcd8dcdmr1446211plt.21.1688656010630; Thu, 06 Jul 2023 08:06:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/28] oe-depends-dot: Handle new format for task-depends.dot Date: Thu, 6 Jul 2023 05:06:08 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183958 From: Rusty Howell The .dot file created by `bitbake -g` changed formats a while ago, which broke oe-depends-dot. Also add some useful examples to the --help output. Signed-off-by: Rusty Howell Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- scripts/oe-depends-dot | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/scripts/oe-depends-dot b/scripts/oe-depends-dot index 5eb3e12769..1c2d51c6ec 100755 --- a/scripts/oe-depends-dot +++ b/scripts/oe-depends-dot @@ -15,7 +15,7 @@ class Dot(object): def __init__(self): parser = argparse.ArgumentParser( description="Analyse recipe-depends.dot generated by bitbake -g", - epilog="Use %(prog)s --help to get help") + formatter_class=argparse.RawDescriptionHelpFormatter) parser.add_argument("dotfile", help = "Specify the dotfile", nargs = 1, action='store', default='') parser.add_argument("-k", "--key", @@ -32,6 +32,21 @@ class Dot(object): " For example, A->B, B->C, A->C, then A->C can be removed.", action="store_true", default=False) + parser.epilog = """ +Examples: +First generate the .dot file: + bitbake -g core-image-minimal + +To find out why a package is being built: + %(prog)s -k -w ./task-depends.dot + +To find out what a package depends on: + %(prog)s -k -d ./task-depends.dot + +Reduce the .dot file packages only, no tasks: + %(prog)s -r ./task-depends.dot +""" + self.args = parser.parse_args() if len(sys.argv) != 3 and len(sys.argv) < 5: @@ -99,6 +114,10 @@ class Dot(object): if key == "meta-world-pkgdata": continue dep = m.group(2) + key = key.split('.')[0] + dep = dep.split('.')[0] + if key == dep: + continue if key in depends: if not key in depends[key]: depends[key].add(dep) From patchwork Thu Jul 6 15:06:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8519C001DD for ; Thu, 6 Jul 2023 15:07:00 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web11.26459.1688656013397446534 for ; Thu, 06 Jul 2023 08:06:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=mKlBhCDE; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-55b1238cab4so455349a12.2 for ; Thu, 06 Jul 2023 08:06:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656012; x=1691248012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vgTfkpDAM29Vd0qO4yHDOBsnAaFTAeGXs3BkX6ilOkc=; b=mKlBhCDEtyw4Dtr1NRpaLddtRKxzESfbFoK28jqM01bjTS6INP/w7TenxYiD35OUWy fKlFbYoWoh2AeIUsAbvHZA1qd27Ovty3OkH/v1zkZQqI54LO8aiVjOnUFDmVNnLuBmcY rwgF21suIo4Gv23r1ifZ+zBpfWf5fdw8vp+8XCWWIp1WFuV1sZPvQI73zdRIA/q1cvt6 SiHt6TvtTN4m7WeYXiee0+XA6TFZO+6T26Z1KKXgyZdqAa5JG1DS96hZlTQk40C279W8 mi2zY6xTtwC6ctPNTLqMfjteOCdeN1CtrhJhHHNAHdRFsC04d6/fulTiD95/ZMOl95Uw y7Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656012; x=1691248012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vgTfkpDAM29Vd0qO4yHDOBsnAaFTAeGXs3BkX6ilOkc=; b=Zccke4hdWD6HBYlqwUSj3BQtJbCwN4k6XDjaykr8fAdOCsuDcrsQIaUqQtgncskDWU 9Ou5RHhfzvQIwgkpG4BrNFTgLm3IOuJlv/haqkbe2Lewex7mgs8kp655VeEh9GqMnzb2 fEAmGKi1BgjkE3rjeKR5UHFrmCEBym5adf/CHl1jnh1wiCDw8VrxgFMDOJ4NPx44Y++T 9sf/pH90nTSgeOW3Dg+Od54Hx0T3TnQ8GIKn+tUzMRs0BZEsXfe1O5zML0/YhKS5IEGt 8Dt4J5OKJGI0L/1GfxD+kuEIoJeXvpDpsmYkgXB5LXryszjMNQTScNLk8vRFLOIJJLAq T3DQ== X-Gm-Message-State: ABy/qLZdIcYe26i6d56tl9JJlrDcCL+3KJGjZyldyFw0SrUYoIx+yPZO XvxK06nat4Zhi+jh2i3v2LzBwSsLiQRK2TtsFqg= X-Google-Smtp-Source: APBJJlEOJWqY+UZTRiQ0TFucNn951bmOP+kd6J2zAVygm0TqKMTwZ0uizJO7jcjLxZdx+/cwyQ+bFA== X-Received: by 2002:a05:6a20:4ce:b0:12c:9518:7899 with SMTP id 14-20020a056a2004ce00b0012c95187899mr1703386pzd.24.1688656012478; Thu, 06 Jul 2023 08:06:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/28] cups: fix CVE-2023-34241 use-after-free in cupsdAcceptClient() in scheduler/client.c Date: Thu, 6 Jul 2023 05:06:09 -1000 Message-Id: <9a6c7442ac2fc2ce668d0c931696d39288ee3d4a.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183959 From: Vivek Kumbhar Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 1 + .../cups/cups/CVE-2023-34241.patch | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-34241.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 1b87d47a49..87f220590f 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -16,6 +16,7 @@ SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${ file://volatiles.99_cups \ file://cups-volatiles.conf \ file://CVE-2023-32324.patch \ + file://CVE-2023-34241.patch \ " UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases" diff --git a/meta/recipes-extended/cups/cups/CVE-2023-34241.patch b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch new file mode 100644 index 0000000000..95b3925b36 --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch @@ -0,0 +1,68 @@ +From ffd290b4ab247f82722927ba9b21358daa16dbf1 Mon Sep 17 00:00:00 2001 +From: Rose <83477269+AtariDreams@users.noreply.github.com> +Date: Thu, 1 Jun 2023 11:33:39 -0400 +Subject: [PATCH] Log result of httpGetHostname BEFORE closing the connection + +httpClose frees the memory of con->http. This is problematic because httpGetHostname then tries to access the memory it points to. + +We have to log the hostname first. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2] +CVE: CVE-2023-34241 +Signed-off-by: Vivek Kumbhar +--- + scheduler/client.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/scheduler/client.c b/scheduler/client.c +index e7e419f..441c1d7 100644 +--- a/scheduler/client.c ++++ b/scheduler/client.c +@@ -193,13 +193,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + /* + * Can't have an unresolved IP address with double-lookups enabled... + */ +- +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, +- "Name lookup failed - connection from %s closed!", ++ "Name lookup failed - closing connection from %s!", + httpGetHostname(con->http, NULL, 0)); + ++ httpClose(con->http); + free(con); + return; + } +@@ -235,11 +233,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + * with double-lookups enabled... + */ + +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, +- "IP lookup failed - connection from %s closed!", ++ "IP lookup failed - closing connection from %s!", + httpGetHostname(con->http, NULL, 0)); ++ ++ httpClose(con->http); + free(con); + return; + } +@@ -256,11 +254,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + + if (!hosts_access(&wrap_req)) + { +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, + "Connection from %s refused by /etc/hosts.allow and " + "/etc/hosts.deny rules.", httpGetHostname(con->http, NULL, 0)); ++ ++ httpClose(con->http); + free(con); + return; + } +-- +2.25.1 + From patchwork Thu Jul 6 15:06:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4F64EB64DC for ; Thu, 6 Jul 2023 15:07:00 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.26460.1688656015289560610 for ; Thu, 06 Jul 2023 08:06:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=KbIYD2Ji; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1b852785a65so5821155ad.0 for ; Thu, 06 Jul 2023 08:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656014; x=1691248014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PMpT1jSJHV5nd/RpcYURz/xkZLeaYERyCosbbApZ/Fw=; b=KbIYD2Ji5HnbOnpEHY4+04JARck548ZOH+6SOOi1AvgfGj/IHTmGgrCqJVhjK95Lzt 7ylYBure5s31M1SWfJApnJzixI7Oii+RtM0qw6rHR7UXObAxm1x4Vuo8tF8ZXCEhzyVL FN2lRTSU2rbT9YET31nzyQV09TNMDk3XbL6Q3+w6s0refr9ffIw6h1vaLevOEiqLHhaz 87gqdP0Af1/xPDhAUKZVXgnhomOS3vwH7oxDKuxNl9FIAUHVgTKA9QCnbOFigsoyDILz Xf7XrvywbFgUMYbeUxLziP/bWhI9WdND3XVe0x89/O5jw7N3YkBpUpexgOGF3Clx5TER BTnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656014; x=1691248014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PMpT1jSJHV5nd/RpcYURz/xkZLeaYERyCosbbApZ/Fw=; b=ioq3TrNdhtH+rdh4sPT5yGJc9NKS47nSLItyA5HdxPfiqHAYFo5aZAmazQbYiMzr2v HcLdAcFctuD9ZIKrUUGIdPQTKj29NcMbS1xTQcgxwpNIATCXjPvlEc29sgmKFHPI+11l ePYKuMIHj6qkach1ZYK4VRBhDd+LRjtp29uGCijuipguog/WYZPw9iUkCdYJaBrhUQzZ V/3l0citCTNXCJD6uyruLbx8zVxUSyKMQBwBpHjXk1clEl3aeWTQPlDFo0gBWjujQ1XN xInjbjs0lZRkG173AUS+C7vFxfHELReJPYMdrwvS4whAgpXagP+0kIc58UeOB2G6SXaj +wJw== X-Gm-Message-State: ABy/qLbxiJHemgbZE41Nxp6G3BY9nPtYuQOZKJlad54VEH7j10HZyEqU wf/4dLIBX1mSK7tIsOkxid3aFIy0bYoHNx2YzeM= X-Google-Smtp-Source: APBJJlHbv2GZkIrX11kg1Aj139a4U9gjCYcgWIXkGuhpRgUp4zTct39A+AlHrvtFo9CnuSLqgIj2KA== X-Received: by 2002:a17:902:da84:b0:1b5:cd6:8246 with SMTP id j4-20020a170902da8400b001b50cd68246mr3901452plx.2.1688656014259; Thu, 06 Jul 2023 08:06:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/28] linux-yocto/5.15: update to v5.15.114 Date: Thu, 6 Jul 2023 05:06:10 -1000 Message-Id: <1c8415175dc89a58e8af604163904cbfbe787edc.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183960 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 0ab06468cbd1 Linux 5.15.114 193c59ba7299 net: phy: mscc: add VSC8502 to MODULE_DEVICE_TABLE 350b95e86ca9 3c589_cs: Fix an error handling path in tc589_probe() 7c2fa3e56d95 regulator: mt6359: add read check for PMIC MT6359 28ebfb74fbf5 firmware: arm_ffa: Set reserved/MBZ fields to zero in the memory descriptors 34b0985ebdfc arm64: dts: imx8mn-var-som: fix PHY detection bug by adding deassert delay 1e7550653680 net/mlx5: Devcom, fix error flow in mlx5_devcom_register_device a89a69cea44c net/mlx5: Fix error message when failing to allocate device memory e8a974bbf4a5 net/mlx5: DR, Check force-loopback RC QP capability independently from RoCE 5e0cc0d502d4 net/mlx5: DR, Fix crc32 calculation to work on big-endian (BE) CPUs 792a8233fc01 net/mlx5e: do as little as possible in napi poll when budget is 0 fdf8f33e7d03 platform/mellanox: mlxbf-pmc: fix sscanf() error checking d5ab5447d910 forcedeth: Fix an error handling path in nv_probe() ae7c4ec42655 sctp: fix an issue that plpmtu can never go to complete state ee553694be42 ASoC: Intel: Skylake: Fix declaration of enum skl_ch_cfg aafa5019e2a3 x86/show_trace_log_lvl: Ensure stack pointer is aligned, again 90314394a16d xen/pvcalls-back: fix double frees with pvcalls_new_active_socket() ff151810fb95 coresight: Fix signedness bug in tmc_etr_buf_insert_barrier_packet() 24cf11474376 regulator: pca9450: Fix BUCK2 enable_mask cd41ec23503f fs: fix undefined behavior in bit shift for SB_NOUSER c2f65991097a firmware: arm_ffa: Fix FFA device names for logical partitions 6a26c62625c5 firmware: arm_ffa: Check if ffa_driver remove is present before executing f64567bd9566 power: supply: sbs-charger: Fix INHIBITED bit for Status reg 71a9f146b3dc power: supply: bq27xxx: Add cache parameter to bq27xxx_battery_current_and_status() e98e5bebfcaf power: supply: bq27xxx: Fix poll_interval handling and races on remove e01820a94aea power: supply: bq27xxx: Fix I2C IRQ race on remove d21b3448577f power: supply: bq27xxx: Fix bq27xxx_battery_update() race condition c530f60e5a2e power: supply: mt6360: add a check of devm_work_autocancel in mt6360_charger_probe 0dd4881238bc power: supply: leds: Fix blink to LED on transition 5e4bb063dcaf cifs: mapchars mount option ignored 9b92e2d0eb69 ipv6: Fix out-of-bounds access in ipv6_find_tlv() bf478c2643ba bpf: Fix mask generation for 32-bit narrow loads of 64-bit fields 79081b3f489a octeontx2-pf: Fix TSOv6 offload 114657365c88 selftests: fib_tests: mute cleanup error message e06841a2abf9 net: fix skb leak in __skb_tstamp_tx() 8f1512d78b5d ASoC: lpass: Fix for KASAN use_after_free out of bounds b1bde4b4360c media: radio-shark: Add endpoint checks 43f569fd0699 USB: sisusbvga: Add endpoint checks da0f4b557682 USB: core: Add routines for endpoint checks in old drivers 387bd0a3af3b udplite: Fix NULL pointer dereference in __sk_mem_raise_allocated(). cf3b5cd7127c net: fix stack overflow when LRO is disabled for virtual interfaces 9e12c58a5ece fbdev: udlfb: Fix endpoint check aee97eec7702 debugobjects: Don't wake up kswapd from fill_pool() c09a7b6190f5 x86/topology: Fix erroneous smp_num_siblings on Intel Hybrid platforms a9ffd42eb9ab perf/x86/uncore: Correct the number of CHAs on SPR 277f206bb874 parisc: Fix flush_dcache_page() for usage from irq context eff115ca949a selftests/memfd: Fix unknown type name build failure 1a98b6e028ee x86/mm: Avoid incomplete Global INVLPG flushes 683bb30c6947 dt-binding: cdns,usb3: Fix cdns,on-chip-buff-size type 647af8a998c2 btrfs: use nofs when cleaning up aborted transactions 7e93fe1d1733 gpio: mockup: Fix mode of debugfs files 3a2d238c5a3a parisc: Allow to reboot machine after system halt 96f8dd0483c8 parisc: Handle kgdb breakpoints only in kernel context 16deb7413ace m68k: Move signal frame following exception on 68020/030 9be921854e98 net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize 1f6ae24e3d5a ASoC: rt5682: Disable jack detection interrupt during suspend 693acaa739dc mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works 7177586e06ff ALSA: hda/realtek: Enable headset onLenovo M70/M90 e6a624451afb ALSA: hda: Fix unhandled register update during auto-suspend period 7716da3fa10b ALSA: hda/ca0132: add quirk for EVGA X299 DARK c37eb46c613a arm64: Also reset KASAN tag if page is not PG_mte_tagged 291fe3d6f5db ocfs2: Switch to security_inode_init_security() 4badd33929c0 spi: fsl-cpm: Use 16 bit mode for large transfers with even size 28ffe8c84603 spi: fsl-spi: Re-organise transfer bits_per_word adaptation 381e55bffe15 ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15 ca338fa8032a watchdog: sp5100_tco: Immediately trigger upon starting. 6312c7cc07f3 dt-bindings: ata: ahci-ceva: Cover all 4 iommus entries 7ef9045fe758 dt-bindings: ata: ahci-ceva: convert to yaml f19171155305 usb: dwc3: fix gadget mode suspend interrupt handler issue 7919af1dcb8e usb: gadget: Properly configure the device for remote wakeup Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit b83b248e5042dd1e9fdbc4c48be1af188fece1df) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index a17840cb8a..fb92ac9527 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "613a261b361c2f0d1e1428ad02dffe4e81d1a24b" -SRCREV_meta ?= "957ddf5f9d4bf5791e88a46ce9ec4352a6d0a171" +SRCREV_machine ?= "85bc9c4be5d0be6f26d120ee466ea456d4b72adc" +SRCREV_meta ?= "ba0876ac0b787294ecb502d82c057ac71fd3fe3d" 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.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.113" +LINUX_VERSION ?= "5.15.114" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 5f6d254970..1bf912cd17 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.113" +LINUX_VERSION ?= "5.15.114" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "cad8d3fd06feec26840453ddfd483216b4cf5b51" -SRCREV_meta ?= "957ddf5f9d4bf5791e88a46ce9ec4352a6d0a171" +SRCREV_machine ?= "91a679c72403cfb28c8a03991c8ab7fd05bae24e" +SRCREV_meta ?= "ba0876ac0b787294ecb502d82c057ac71fd3fe3d" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index b123ec6a1f..600296a788 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "8f55d1b405ec36812e15592bec1a471c4afa8dfa" -SRCREV_machine:qemuarm64 ?= "6f43cd2bf083a3a6d77edd2ddd275b9c6c3adf63" -SRCREV_machine:qemumips ?= "942912a383bbb5b1edb362c1da8f328c50e8e16a" -SRCREV_machine:qemuppc ?= "9b2cc2b52ad546d07bcef0d6c76e657ff46140ce" -SRCREV_machine:qemuriscv64 ?= "934b0d629afd6e3bf31fcaeada9828b1f13dbd91" -SRCREV_machine:qemuriscv32 ?= "934b0d629afd6e3bf31fcaeada9828b1f13dbd91" -SRCREV_machine:qemux86 ?= "934b0d629afd6e3bf31fcaeada9828b1f13dbd91" -SRCREV_machine:qemux86-64 ?= "934b0d629afd6e3bf31fcaeada9828b1f13dbd91" -SRCREV_machine:qemumips64 ?= "570b02954e1cf598ba8792aa6127ddde7f2af647" -SRCREV_machine ?= "934b0d629afd6e3bf31fcaeada9828b1f13dbd91" -SRCREV_meta ?= "957ddf5f9d4bf5791e88a46ce9ec4352a6d0a171" +SRCREV_machine:qemuarm ?= "cc8e6ff343cc0c0ca4e81bd9c8246cf26a1386d2" +SRCREV_machine:qemuarm64 ?= "144e8b0887515060993c55aa6390953facdc5985" +SRCREV_machine:qemumips ?= "875ca95dfbdc54834a761eca4ace8ea8464553e0" +SRCREV_machine:qemuppc ?= "4dd882535e9f7b24974b070a33e132ee783cae12" +SRCREV_machine:qemuriscv64 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" +SRCREV_machine:qemuriscv32 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" +SRCREV_machine:qemux86 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" +SRCREV_machine:qemux86-64 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" +SRCREV_machine:qemumips64 ?= "788a1a85fd93d1d5b115fbbc6370fe26fae6dea4" +SRCREV_machine ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" +SRCREV_meta ?= "ba0876ac0b787294ecb502d82c057ac71fd3fe3d" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "1fe619a7d25218e9b9fdcce9fcac6a05cd62abed" +SRCREV_machine:class-devupstream ?= "0ab06468cbd149aac0d7f216ec00452ff8c74e0b" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,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.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.113" +LINUX_VERSION ?= "5.15.114" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jul 6 15:06:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26984 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCC0DEB64DD for ; Thu, 6 Jul 2023 15:07:00 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.26499.1688656017170818109 for ; Thu, 06 Jul 2023 08:06:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=xLkEqLau; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b89114266dso5063585ad.0 for ; Thu, 06 Jul 2023 08:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656016; x=1691248016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ESnLLU2qbGgQMprCuUTWA+BF46tU5B1xoxr1aQUvotk=; b=xLkEqLaukHzC1zJqg10XEyixkaWoKDhXel/3EUVohxp5TORQG9jKdAwApgN5gtbdAk 4BD4GwwwRSSHYdLv1kOkiT3/2dubrK3rKMYeyvhSFemedTvWq4oQDbePVtMW4s9YFIQC S59dhseX300/3WrkxRh2Sjqh9+yEsexcywTiJ3olXvsDNCZWZmPibbxOlTnpey0JECmc y9k9x5O6xpRk88eD5XBHANsOXPjTjNk5vvSy/8XBzbXBWB9fecETTyJMapMuWBxMRliS y21IU3rOxnV8zaxHWT1fvqCnW0kESepxBKupmhR42kMGqNIbgtB8A57H1oOYBua4uvML yIwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656016; x=1691248016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ESnLLU2qbGgQMprCuUTWA+BF46tU5B1xoxr1aQUvotk=; b=B8xjXDEflRKKYL8zCs2SI7CZIupmCC7nf6JN9oKVDq7BgPNngytcHndLLoae1kzkZO GwwuGVEN0/eTMHz51Yd94j6fEAUwYD75ZGRs3PYdIprFU51xdSFhhQFbBGV6boQCMhn2 jmwoHHF4mI8uiHBrV/FfiiA4H+pPSZ34ol+W5zq6BmFXs/2lz7HNFOHzlxnGf1Sg4Y1r pal/sBPC6wPt0eKJ6W975pOzttQ+ubHutOPnw+6lY+5uVlgCpAxMK+0yz1dvofhRgFaZ 6e+QLoRb4XPVuKE5TUA4UFVkKiO4cOk5/6Po9DiDMtmpUXv07+xmXUC6JRi/v2gGBkBa hAvg== X-Gm-Message-State: ABy/qLaZoZl4qISDLw4KUuvUg7qZFy7TUUjcAJbPAb2liOiuZnMNQkqk bJn2yn9uqVuL++m4+phsSaGt01S6z+oayFP1jX0= X-Google-Smtp-Source: APBJJlG7Q7FWqtJwPf2w02p4KDi4ScY0Twqp9O7nQd4enLvRwZtFUuWaLx+rhE+ir9ySzXN3T0SPTw== X-Received: by 2002:a17:902:d4d1:b0:1b8:a234:7617 with SMTP id o17-20020a170902d4d100b001b8a2347617mr2799737plg.5.1688656016072; Thu, 06 Jul 2023 08:06:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/28] linux-yocto/5.15: update to v5.15.115 Date: Thu, 6 Jul 2023 05:06:11 -1000 Message-Id: <44262f31928a20a25b4c4a54c3b76a788cc20216.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183961 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: d7af3e5ba454 Linux 5.15.115 e226893c935f netfilter: ctnetlink: Support offloaded conntrack entry deletion 395d846c61c5 ipv{4,6}/raw: fix output xfrm lookup wrt protocol 1bb8a65190d4 binder: fix UAF of alloc->vma in race with munmap() 1cae0d51368e binder: add lockless binder_alloc_(set|get)_vma() dd7aff43d005 Revert "android: binder: stop saving a pointer to the VMA" 6802c700902c Revert "binder_alloc: add missing mmap_lock calls when using the VMA" 09411f1b8672 bluetooth: Add cmd validity checks at the start of hci_sock_ioctl() 0f21b8621756 xdp: xdp_mem_allocator can be NULL in trace_mem_connect(). b6c4afcbd625 irqchip/mips-gic: Don't touch vl_map if a local interrupt is not routable 13b290f02094 page_pool: fix inconsistency for page_pool_ring_[un]lock() 3af319d51474 net: page_pool: use in_softirq() instead 1c097b9db173 xdp: Allow registering memory model without rxq reference 623d965c2dee net/mlx5e: Fix SQ wake logic in ptp napi_poll context 9085886c04d9 irqchip/mips-gic: Use raw spinlock for gic_lock 4517730b4c1e irqchip/mips-gic: Get rid of the reliance on irq_cpu_online() 5fd7c1e36b0a binder: fix UAF caused by faulty buffer cleanup c88d21c0ae32 bonding: fix send_peer_notif overflow 7ee611fc85ad Bonding: add arp_missed_max option 5b925b48bebc net: dsa: mt7530: fix network connectivity with multiple CPU ports 5a7266feaa6d net: dsa: mt7530: split-off common parts from mt7531_setup 0753c1ef2419 net: dsa: mt7530: rework mt753[01]_setup 9902f91cf666 net: dsa: introduce helpers for iterating through ports using dp d84b42b72526 net: phy: mscc: enable VSC8501/2 RGMII RX clock 3dce2f3d8359 platform/x86: ISST: Remove 8 socket limit 017a634f9f38 platform/x86: ISST: PUNIT device mapping with Sub-NUMA clustering ff455f7fbce7 net/mlx5: Devcom, serialize devcom registration 69966bce28da net/mlx5e: Fix deadlock in tc route query code 1c4e3cf8944f net/mlx5: devcom only supports 2 ports 79ea1a12fb9a bpf: fix a memory leak in the LRU and LRU_PERCPU hash maps 1f06b2a60445 power: supply: bq24190: Call power_supply_changed() after updating input current 8c6f881dc13b power: supply: core: Refactor power_supply_set_input_current_limit_from_supplier() 1f9367a890ac power: supply: bq27xxx: After charger plug in/out wait 0.5s for things to stabilize 75a7e9de60a2 power: supply: bq27xxx: Ensure power_supply_changed() is called on current sign changes e4c708a9bbde power: supply: bq27xxx: Move bq27xxx_battery_update() down 2288fa1ae9b1 power: supply: bq27xxx: expose battery data when CI=1 Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit acb7f13dd673b15706f56a6b12ab4637a54e89f8) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index fb92ac9527..eee248dba9 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "85bc9c4be5d0be6f26d120ee466ea456d4b72adc" -SRCREV_meta ?= "ba0876ac0b787294ecb502d82c057ac71fd3fe3d" +SRCREV_machine ?= "649674a0e78bb0454571f2b8cb3cded4e0bb2b6a" +SRCREV_meta ?= "5f6249ab6fc0f2ac02d745c815adfbf2ad2f92fa" 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.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.114" +LINUX_VERSION ?= "5.15.115" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 1bf912cd17..67c0ae51a4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.114" +LINUX_VERSION ?= "5.15.115" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "91a679c72403cfb28c8a03991c8ab7fd05bae24e" -SRCREV_meta ?= "ba0876ac0b787294ecb502d82c057ac71fd3fe3d" +SRCREV_machine ?= "1475d97fc568cd18aee2ffc9e2327df42ab11dbc" +SRCREV_meta ?= "5f6249ab6fc0f2ac02d745c815adfbf2ad2f92fa" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 600296a788..766995dbed 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "cc8e6ff343cc0c0ca4e81bd9c8246cf26a1386d2" -SRCREV_machine:qemuarm64 ?= "144e8b0887515060993c55aa6390953facdc5985" -SRCREV_machine:qemumips ?= "875ca95dfbdc54834a761eca4ace8ea8464553e0" -SRCREV_machine:qemuppc ?= "4dd882535e9f7b24974b070a33e132ee783cae12" -SRCREV_machine:qemuriscv64 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" -SRCREV_machine:qemuriscv32 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" -SRCREV_machine:qemux86 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" -SRCREV_machine:qemux86-64 ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" -SRCREV_machine:qemumips64 ?= "788a1a85fd93d1d5b115fbbc6370fe26fae6dea4" -SRCREV_machine ?= "08ba9badec4caaec9caa61bab1651716ba2a0eaf" -SRCREV_meta ?= "ba0876ac0b787294ecb502d82c057ac71fd3fe3d" +SRCREV_machine:qemuarm ?= "c4eda8f51adfce3ce4a7ec38945138db06d10847" +SRCREV_machine:qemuarm64 ?= "644dc3e054fde0403f2e211e0d33fdcc65b86eb9" +SRCREV_machine:qemumips ?= "9b1d37b6e5f0cc9c0397d6665b7457ebccedf20a" +SRCREV_machine:qemuppc ?= "6fa7818e5625448e3ce9a08a7a9ec2cfadbea50e" +SRCREV_machine:qemuriscv64 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" +SRCREV_machine:qemuriscv32 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" +SRCREV_machine:qemux86 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" +SRCREV_machine:qemux86-64 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" +SRCREV_machine:qemumips64 ?= "d13909f10dbd2affda5ac77d8d7ac0c0dbd9fe9c" +SRCREV_machine ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" +SRCREV_meta ?= "5f6249ab6fc0f2ac02d745c815adfbf2ad2f92fa" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "0ab06468cbd149aac0d7f216ec00452ff8c74e0b" +SRCREV_machine:class-devupstream ?= "d7af3e5ba454d007b4939f858739cf1cecdeab46" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,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.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.114" +LINUX_VERSION ?= "5.15.115" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jul 6 15:06:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26982 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6FB4EB64D9 for ; Thu, 6 Jul 2023 15:07:00 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.26502.1688656019341907253 for ; Thu, 06 Jul 2023 08:06:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=KA7pLdnq; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b89b75dc1cso14007085ad.1 for ; Thu, 06 Jul 2023 08:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656018; x=1691248018; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D7g7ic54W98y59lC+qtVH7NGcjeRHhZQLadzh9KQc9A=; b=KA7pLdnq5ucTyxE+9Pg3Ll16kqC+W4vvst0tXKDGRNiiwRM1GAdj6phDqZDms+866/ QYdymrrZ0bqWKxDApEUHbrFl3VZkBc/tHQKvgeW5/zjPrVu5NlLGYAkim6T1x7A/d4Rg DNjui5tSHZPi12CtB5RgOaD5mKEcnfJ7V84Dmvd9BwkoUUAcPowOQQ2JhJgXANFTVor4 V6ddMJsFJmdJXhN5QUXKv0V+w24oSeL6SG4ERkhzHZ9S2nBzHTGk3CfdUPfL358PMfc1 S5kTrNEtPnDe2z/hq+qvQ9XiwDdNxtCQooWdbt+FxBIWQ7NJp1/PybOXKEx1fgfyc53F pcoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656018; x=1691248018; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D7g7ic54W98y59lC+qtVH7NGcjeRHhZQLadzh9KQc9A=; b=M/Z8WTjRWXdu3GosqDqKonB5tkV1OmgLF3hg3eswUfvSeh9sY5PVOgpwou2Q77X+UN sVwKA/jXHXWqkfLawdGOoxXhapUCvULqf4Q3ZFZkg+ay6juJbNfRxcPmMK1soEgB4gEp qi1NzIB3YKTHy6/jzijUM5wIZH+W+0RnhltTr372yJxgbvzVKxSy+s1pycfGgaVQVBcx WommQMljlTrHjG4ceAt2D2OTMB6WK5z9R1SwrTT7xRJEjMgxET2d0tg6vjUb/BF659wa 3pMUoGfn6k/VmdedJqyteyX+jsnPGwPcWLfYgB91bp7+VNfiHvHI+11t1WxCXTZhKMs5 MdOw== X-Gm-Message-State: ABy/qLay2LhTHEXYmCYnAojS9hfjQdkCAirdJcXdBTuspoW8tEUnUhMU iAIh5DRZi0Ftm9b76o4p2pSVc9FtXJNQwfAoFOI= X-Google-Smtp-Source: APBJJlGarx0E6AUjCxLxYjxq9CjAbPU6+2nm3fCDYvtuCLkYyCggi1qIjZ9EcAh7//R+A37MusBn5Q== X-Received: by 2002:a17:902:dacf:b0:1b6:b703:36f8 with SMTP id q15-20020a170902dacf00b001b6b70336f8mr4120319plx.25.1688656018250; Thu, 06 Jul 2023 08:06:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/28] linux-yocto/5.15: update to v5.15.116 Date: Thu, 6 Jul 2023 05:06:12 -1000 Message-Id: <5bcbae7273fcb619be39d388a7b593799b46dab5.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183962 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 7349e40704a0 Linux 5.15.116 62886f17d3e6 RDMA/irdma: Do not generate SW completions for NOPs 14d148401c52 RDMA/irdma: Fix drain SQ hang with no completion e88b19b252db ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS a1c76e2907c1 ext4: enable the lazy init thread when remounting read/write 76a7dfc9cc02 selftests: mptcp: join: skip if MPTCP is not supported 807114223d3e selftests: mptcp: simult flows: skip if MPTCP is not supported 9319c8b75ee6 selftests: mptcp: diag: skip if MPTCP is not supported c971ca2b9d8d drm/amdgpu/gfx10: Disable gfxoff before disabling powergating. 7a20262fa9ee scsi: dpt_i2o: Do not process completions with invalid addresses daeab37ddb6f scsi: dpt_i2o: Remove broken pass-through ioctl (I2OUSERCMD) 78a79c625265 drm/rcar: stop using 'imply' for dependencies 4c3dda6b7cfd tpm, tpm_tis: Request threaded interrupt handler 19750d7b575a regmap: Account for register length when chunking 6cb7e7579a3d KEYS: asymmetric: Copy sig and digest in public_key_verify_signature() d56c2ab32594 ksmbd: fix incorrect AllocationSize set in smb2_get_info 380b47932e76 ksmbd: fix credit count leakage 8a870c07a1df KVM: x86: Account fastpath-only VM-Exits in vCPU stats 808ed7d86ed9 test_firmware: fix the memory leak of the allocated firmware buffer 4b7a35eb8a18 serial: 8250_tegra: Fix an error handling path in tegra_uart_probe() fc8ef0714161 fbcon: Fix null-ptr-deref in soft_cursor a0790a7739a2 ext4: add lockdep annotations for i_data_sem for ea_inode's a8c3024c3e46 ext4: disallow ea_inodes with extended attributes 39a66e7a2987 ext4: set lockdep subclass for the ea_inode in ext4_xattr_inode_cache_find() bdbfbb7d5057 ext4: add EA_INODE checking to ext4_iget() efa3fe247d6b selftests: mptcp: sockopt: skip if MPTCP is not supported 95ad73b62765 selftests: mptcp: pm nl: skip if MPTCP is not supported 30bacfd8caf6 selftests: mptcp: connect: skip if MPTCP is not supported 2712a1ba0597 tracing/probe: trace_probe_primary_from_call(): checked list_first_entry 8a716b28b933 selinux: don't use make's grouped targets feature yet 11a8e7fd7231 block: fix revalidate performance regression 538d8504859f usb: cdns3: fix NCM gadget RX speed 20x slow than expection at iMX8QM 57a2fd7b2c75 usb: cdns3: allocate TX FIFO size according to composite EP number d42d869b2cf4 iommu/amd: Fix domain flush size when syncing iotlb cb21384372d1 powerpc/iommu: Limit number of TCEs to 512 for H_STUFF_TCE hcall f257c1a6cc86 btrfs: fix csum_tree_block page iteration to avoid tripping on -Werror=array-bounds 292806cfe43d tty: serial: fsl_lpuart: use UARTCTRL_TXINV to send break instead of UARTCTRL_SBK 3fda903511f3 mmc: pwrseq: sd8787: Fix WILC CHIP_EN and RESETN toggling order dade1f4a379d mmc: vub300: fix invalid response handling 3eb4590bc37c block/blk-iocost (gcc13): keep large values in a new enum 43124187fe3a ath6kl: Use struct_group() to avoid size-mismatched casting 43f4aca98bf2 x86/boot: Wrap literal addresses in absolute_pointer() 3cfd7f042e67 drm/amd/pm: reverse mclk and fclk clocks levels for renoir 7e0c25b39065 drm/amd/pm: reverse mclk and fclk clocks levels for yellow carp fce05ec3deb5 drm/amd/pm: reverse mclk and fclk clocks levels for vangogh b0dda610b42c ata: libata-scsi: Use correct device no in ata_find_dev() 57f4555bdfa5 scsi: stex: Fix gcc 13 warnings 6f675380db4f misc: fastrpc: reject new invocations during device removal cebe84b9c02e misc: fastrpc: return -EPIPE to invocations on device removal d3103fc0d191 md/raid5: fix miscalculation of 'end_sector' in raid5_read_one_chunk() 599e19202be2 usb: gadget: f_fs: Add unbind event before functionfs_unbind c762eafe7949 dt-bindings: usb: snps,dwc3: Fix "snps,hsphy_interface" type 7099a87cf5ee net: usb: qmi_wwan: Set DTR quirk for BroadMobi BM818 16bd13e701c0 iio: dac: build ad5758 driver when AD5758 is selected b6622c1fd233 iio: adc: ad7192: Change "shorted" channels to differential aeec28d83865 iio: dac: mcp4725: Fix i2c_master_send() return value handling 23c6a184c2b8 iio: adc: ad_sigma_delta: Fix IRQ issue by setting IRQ_DISABLE_UNLAZY flag 4349ee3deef9 iio: light: vcnl4035: fixed chip ID check db633585e93b dt-bindings: iio: adc: renesas,rcar-gyroadc: Fix adi,ad7476 compatible value 6bd3d6305b6a iio: imu: inv_icm42600: fix timestamp reset 536b4ffa93fa HID: wacom: avoid integer overflow in wacom_intuos_inout() cfa747cc65ca HID: google: add jewel USB id 11bc983e4393 iio: adc: mxs-lradc: fix the order of two cleanup operations a5461c3134ce iio: accel: st_accel: Fix invalid mount_matrix on devices without ACPI _ONT method 6a7d946733ea media: uvcvideo: Don't expose unsupported formats to userspace 6dd02a7bff9d mailbox: mailbox-test: fix a locking issue in mbox_test_message_write() 0f3c55c7d62c nvme-pci: Add quirk for Teamgroup MP33 SSD c9079eb6f1cf drm/amdgpu: skip disabling fence driver src_irqs when device is unplugged 4238ea044eb2 atm: hide unused procfs functions 5d4c31d93973 drm/msm: Be more shouty if per-process pgtables aren't working 825cc70fbf2f ALSA: oss: avoid missing-prototype warnings a79da1659cdc nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk 9a195b991709 netfilter: conntrack: define variables exp_nat_nla_policy and any_addr with CONFIG_NF_NAT 82f505878f0a wifi: b43: fix incorrect __packed annotation ab62fc176eac scsi: core: Decrease scsi_device's iorequest_cnt if dispatch failed e04de12881ca wifi: mac80211: simplify chanctx allocation 24dc97e135e8 arm64: vdso: Pass (void *) to virt_to_page() 2944b9f0fdcf arm64/mm: mark private VM_FAULT_X defines as vm_fault_t 39d84ddd9ebc ARM: dts: stm32: add pin map for CAN controller on stm32f7 b2f00acd5369 wifi: rtl8xxxu: fix authentication timeout due to incorrect RCR value ce135055be33 ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P 66f05cf2b2fd s390/topology: honour nr_cpu_ids when adding CPUs 79803685425c s390/pkey: zeroize key blobs 42624bc8c30c media: dvb-core: Fix use-after-free due to race condition at dvb_ca_en50221 22fc36d59eab media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*() a47a3f7a9bf6 media: dvb-core: Fix use-after-free due to race at dvb_register_device() 50831747cb3a media: dvb-core: Fix use-after-free due on race condition at dvb_net 9f74fec18f4c media: mn88443x: fix !CONFIG_OF error by drop of_match_ptr from ID table d6c47b235992 media: ttusb-dec: fix memory leak in ttusb_dec_exit_dvb() 747a121914e3 media: dvb_ca_en50221: fix a size write bug 34562df4082b media: netup_unidvb: fix irq init by register it at the end of probe 5e56e3d5ebeb media: dvb-usb: dw2102: fix uninit-value in su3000_read_mac_address 5240bc8c0c9a media: dvb-usb: digitv: fix null-ptr-deref in digitv_i2c_xfer() cd6764cf45ab media: dvb-usb-v2: rtl28xxu: fix null-ptr-deref in rtl28xxu_i2c_xfer ef0d867e295d media: dvb-usb-v2: ce6230: fix null-ptr-deref in ce6230_i2c_master_xfer() abaf49c5a95d media: dvb-usb-v2: ec168: fix null-ptr-deref in ec168_i2c_xfer() 4b61ee116a3c media: dvb-usb: az6027: fix three null-ptr-deref in az6027_i2c_xfer() 5e9ad9962f2a media: dvb_demux: fix a bug for the continuity counter ae3e3ac8b294 ASoC: ssm2602: Add workaround for playback distortions 6cf7f03d2d34 ASoC: dt-bindings: Adjust #sound-dai-cells on TI's single-DAI codecs 133c78bc6769 xfrm: Check if_id in inbound policy/secpath match f1a6d366cdb1 um: harddog: fix modular build e9d167ca4810 ASoC: dwc: limit the number of overrun messages 84dfd8bee506 nvme-pci: add quirk for missing secondary temperature thresholds b32eeafd4eb9 nvme-pci: add NVME_QUIRK_BOGUS_NID for HS-SSD-FUTURE 2048G f7af470fad9c block/rnbd: replace REQ_OP_FLUSH with REQ_OP_WRITE 8ba70707c3fe nbd: Fix debugfs_create_dir error checking 156f5237e9c3 fbdev: stifb: Fix info entry in sti_struct on error path b3c785428797 fbdev: modedb: Add 1920x1080 at 60 Hz video mode ad3de274e065 fbdev: imsttfb: Fix use after free bug in imsttfb_probe fd8b4e28f400 gfs2: Don't deref jdesc in evict a00cc8562835 platform/x86: intel_scu_pcidrv: Add back PCI ID for Medfield 736626df53e9 media: rcar-vin: Select correct interrupt mode for V4L2_FIELD_ALTERNATE 1eae6e919639 ARM: 9295/1: unwind:fix unwind abort for uleb128 case af739a701517 btrfs: abort transaction when sibling keys check fails for leaves 872a038dd4c9 drm/ast: Fix ARM compatibility 3291f4a1073a mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write() fe6f6f470612 drm/amdgpu: Use the default reset when loading or reloading the driver 2226d9ef63d5 ALSA: hda: Glenfly: add HD Audio PCI IDs and HDMI Codec Vendor IDs. 65221bdde702 watchdog: menz069_wdt: fix watchdog initialisation 6a7bf0038973 drm/amdgpu: release gpu full access after "amdgpu_device_ip_late_init" 8ac106aade8f rtnetlink: call validate_linkmsg in rtnl_create_link beeffe764e07 mtd: rawnand: marvell: don't set the NAND frequency select 6494318f11f3 mtd: rawnand: marvell: ensure timing values are written 0fad29dabce1 net: dsa: mv88e6xxx: Increase wait after reset deactivation 45f47d2cf114 net/sched: flower: fix possible OOB write in fl_set_geneve_opt() b15adce7d326 net/mlx5: Read embedded cpu after init bit cleared c3caee8fe178 net/mlx5e: Fix error handling in mlx5e_refresh_tirs 1abb7b04ec37 udp6: Fix race condition in udp6_sendmsg & connect 7dc379f8856b net/netlink: fix NETLINK_LIST_MEMBERSHIPS length report 91b07931c14d net: sched: fix NULL pointer dereference in mq_attach b1cb1ba1fbfa net/sched: Prohibit regrafting ingress or clsact Qdiscs cde00dcdf0ce net/sched: Reserve TC_H_INGRESS (TC_H_CLSACT) for ingress (clsact) Qdiscs 2e859de5aeb0 net/sched: sch_clsact: Only create under TC_H_CLSACT cff0af3d1364 net/sched: sch_ingress: Only create under TC_H_INGRESS a907a389c71c tcp: Return user_mss for TCP_MAXSEG in CLOSE/LISTEN state if user_mss set fade445f3921 tcp: deny tcp_disconnect() when threads are waiting 5434c8128777 af_packet: do not use READ_ONCE() in packet_bind() 60bd1403bab7 RDMA/irdma: Fix Local Invalidate fencing 0b3c392b82cd RDMA/irdma: Prevent QP use after free bd2af69575f5 RDMA/irdma: Add SW mechanism to generate completions on error 2d04dde4ded7 mtd: rawnand: ingenic: fix empty stub helper definitions 8f61d394b0c2 amd-xgbe: fix the false linkup in xgbe_phy_status aefcb6ea1d44 af_packet: Fix data-races of pkt_sk(sk)->num. c8775b97bf96 netrom: fix info-leak in nr_write_internal() 8045788adda6 net: mellanox: mlxbf_gige: Fix skb_panic splat under memory pressure 8d9d0bfd4c22 net/mlx5e: Don't attach netdev profile while handling internal error d002e0287d78 net/mlx5: fw_tracer, Fix event handling 3a7793ae6911 riscv: Fix unused variable warning when BUILTIN_DTB is set 3f1191bc5b6a dmaengine: pl330: rename _start to prevent build error c4be5d71d7a4 iommu/amd: Don't block updates to GATag if guest mode is on b4fd38c0c7b8 iommu/rockchip: Fix unwind goto issue 190ea1c39104 RDMA/bnxt_re: Fix return value of bnxt_re_process_raw_qp_pkt_rx 2fa9ee0fd65d RDMA/bnxt_re: Fix a possible memory leak fdc977f2e785 dmaengine: at_xdmac: fix potential Oops in at_xdmac_prep_interleaved() f68eff0faf67 dmaengine: at_xdmac: Move the free desc to the tail of the desc list ba0e7ca84a93 RDMA/hns: Modify the value of long message loopback slice 15aeb44199e6 RDMA/hns: Fix base address table allocation b0f40ecc46d9 RDMA/efa: Fix unsupported page sizes in device f370588ec389 RDMA/bnxt_re: Fix the page_size used during the MR creation Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit 20388189ab6d03ae3c6e4fdd0135af4f88e15198) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index eee248dba9..32eb5b8351 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "649674a0e78bb0454571f2b8cb3cded4e0bb2b6a" -SRCREV_meta ?= "5f6249ab6fc0f2ac02d745c815adfbf2ad2f92fa" +SRCREV_machine ?= "c24198eab94f04755689cf431a434932396e56f6" +SRCREV_meta ?= "ae5766055d47d5675065e386ffa286b212a352c0" 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.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.115" +LINUX_VERSION ?= "5.15.116" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 67c0ae51a4..259db4b41f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.115" +LINUX_VERSION ?= "5.15.116" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "1475d97fc568cd18aee2ffc9e2327df42ab11dbc" -SRCREV_meta ?= "5f6249ab6fc0f2ac02d745c815adfbf2ad2f92fa" +SRCREV_machine ?= "7002dac746495520fb193cb13b1afd83fe4dd2cb" +SRCREV_meta ?= "ae5766055d47d5675065e386ffa286b212a352c0" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 766995dbed..0d86a84415 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "c4eda8f51adfce3ce4a7ec38945138db06d10847" -SRCREV_machine:qemuarm64 ?= "644dc3e054fde0403f2e211e0d33fdcc65b86eb9" -SRCREV_machine:qemumips ?= "9b1d37b6e5f0cc9c0397d6665b7457ebccedf20a" -SRCREV_machine:qemuppc ?= "6fa7818e5625448e3ce9a08a7a9ec2cfadbea50e" -SRCREV_machine:qemuriscv64 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" -SRCREV_machine:qemuriscv32 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" -SRCREV_machine:qemux86 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" -SRCREV_machine:qemux86-64 ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" -SRCREV_machine:qemumips64 ?= "d13909f10dbd2affda5ac77d8d7ac0c0dbd9fe9c" -SRCREV_machine ?= "ad4f0f4baf291e68300bffe88ef0c6e98f5c9882" -SRCREV_meta ?= "5f6249ab6fc0f2ac02d745c815adfbf2ad2f92fa" +SRCREV_machine:qemuarm ?= "846212e7d5354df9f5a061cac6fff98c2d2ca218" +SRCREV_machine:qemuarm64 ?= "c15cb294c24733e9f1f73c5efccaacec7e0ad534" +SRCREV_machine:qemumips ?= "9268ce3666b74e3da988ee8476b5908a11208b59" +SRCREV_machine:qemuppc ?= "8a029153e24092cc00d18f888f22bc03e73a2860" +SRCREV_machine:qemuriscv64 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" +SRCREV_machine:qemuriscv32 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" +SRCREV_machine:qemux86 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" +SRCREV_machine:qemux86-64 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" +SRCREV_machine:qemumips64 ?= "ea7f77e865a06b2431f06bc8cbf320c9e5e71642" +SRCREV_machine ?= "ec5cfb5e4ec277f8d0a728032047639192072107" +SRCREV_meta ?= "ae5766055d47d5675065e386ffa286b212a352c0" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "d7af3e5ba454d007b4939f858739cf1cecdeab46" +SRCREV_machine:class-devupstream ?= "7349e40704a0209a2af8b37fa876322209de9684" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,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.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.115" +LINUX_VERSION ?= "5.15.116" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jul 6 15:06:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26986 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB2B2EB64DD for ; Thu, 6 Jul 2023 15:07:10 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.26504.1688656021464743573 for ; Thu, 06 Jul 2023 08:07:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=hbX7eMEl; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1b8062c1ee1so4923685ad.3 for ; Thu, 06 Jul 2023 08:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656020; x=1691248020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=h/8A9eaJv4hYrLX9MU2lOL3k3KcXhog1FwIu4oL+gDY=; b=hbX7eMElxgVaq2126tLtKwBXW1AN5xoAxke715e4KljUiw1jmLbJjTVUq+IjC2g8qx /UvYIsJ6uZXD3utwBLLxmCHkuv2Dnn7VTGbi8T98/Vg1dMj2ozOn2xI2kaktJ7bmUGbU jBXmVuBuogiC9HBmLyRovG/OSJA9HDDs+0IdiRAY+8sMkKYFlPMNZZ0XOV+Fnx+SAICa wum3wkKztfx0coXo0968psf6BVdgh6OcphXc7nzy8Yrj/xyiPFn1aahfLwUBmsU//wkG 2NSnKAO6DjLGZrOvDjNDryEgnT+usTewxOsMSFjmyBh3RaQX9erhyXfHakr9wIlaySsR zhqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656020; x=1691248020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h/8A9eaJv4hYrLX9MU2lOL3k3KcXhog1FwIu4oL+gDY=; b=IegeiwUyIaY0to2vmm7feauNJ/cccudBvbAmhM33MF2pPjPHO5N8+A35Kkt/3xyDc/ c5OMaR6LRMEx+nrUB63Bh/xPSjEzBpGVOQKsVcGOhRoMUEA6rvjNSMK9d5viI3Ai3Jhi FQKfOKs0k1kc8BzKiPm3UA9MlzRQX6MgPN6PL6eEAiZjTbLImbPwip3ZNTpWNef+9lgd 2cpYMT7lbWAnYBIi8Dt1BGwxTAF+W+pvAzXR7XAB9a+EwJL5D/tyND98Bver+yUGpvNf 4ZV7xb6s8c4iSR8c8NCzI8eaahqQb+SisQOm9J/z1alNBnelvxyEFIdFKytkHhQVlWqu Kekw== X-Gm-Message-State: ABy/qLYLIlHhH7LCGalX4mPXQCuz7EbPTQ42VQo48t36YHYXfywAZjvG qy2s4Z40gHXG2XlH+mNQHVtV3BaFlGAubXSgu3s= X-Google-Smtp-Source: APBJJlGoofggP/xnk/GLm3jedsyHUayNFtq2dugl5WYxuZliaiGWsmlEyf0GV0zogOeY/7Yhis1vZA== X-Received: by 2002:a17:902:a510:b0:1b8:b768:8bf4 with SMTP id s16-20020a170902a51000b001b8b7688bf4mr2174819plq.19.1688656020400; Thu, 06 Jul 2023 08:07:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.06.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:06:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/28] linux-yocto/5.15: update to v5.15.117 Date: Thu, 6 Jul 2023 05:06:13 -1000 Message-Id: <79a6eb479bee6caabf22e3ed9e8b2793bdde836c.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183963 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 471e639e59d1 Linux 5.15.117 ef876dd25830 Revert "staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE" 6cfe9ddb6aa6 xfs: verify buffer contents when we skip log replay b5a52009d90e Revert "debugobject: Ensure pool refill (again)" 3cc6805547d5 ext4: only check dquot_initialize_needed() when debugging 86ebb5b5344d Revert "ext4: don't clear SB_RDONLY when remounting r/w until quota is re-enabled" 9945284195a9 vhost_vdpa: support PACKED when setting-getting vring_base 17882a3556ce vhost: support PACKED when setting-getting vring_base d18688ff423a vduse: avoid empty string for dev name 952d1e4cbc26 riscv: fix kprobe __user string arg print fault issue 62958e78b757 eeprom: at24: also select REGMAP 66b99b3bd7b1 i2c: sprd: Delete i2c adapter in .remove's error path 58648a533a89 firmware: arm_ffa: Set handle field to zero in memory descriptor e1ab7ed7925d i2c: mv64xxx: Fix reading invalid status value in atomic mode 003421fc430c arm64: dts: imx8mn-beacon: Fix SPI CS pinmux 2a4f0ad59d3d ASoC: mediatek: mt8195: fix use-after-free in driver remove path cc4a2c0b1efa ASoC: mediatek: mt8195-afe-pcm: Convert to platform remove callback returning void 036bba96bf5e arm64: dts: imx8-ss-dma: assign default clock rate for lpuarts d97c8306a9af arm64: dts: imx8qm-mek: correct GPIOs for USDHC2 CD and WP signals 2212344664fb arm64: dts: qcom: sc7180-lite: Fix SDRAM freq for misidentified sc7180-lite boards c589ba11da5a ASoC: codecs: wsa881x: do not set can_multi_write flag 980011869a2a ARM: dts: at91: sama7g5ek: fix debounce delay property for shdwc ac817e26f9df usb: usbfs: Use consistent mmap functions 35d9f521bcc8 usb: usbfs: Enforce page requirements for mmap 64e4a3b25338 pinctrl: meson-axg: add missing GPIOA_18 gpio group 4124536ad924 rbd: get snapshot context after exclusive lock is ensured to be held 1af3b16b6240 rbd: move RBD_OBJ_FLAG_COPYUP_ENABLED flag setting 2326488a9648 tee: amdtee: Add return_origin to 'struct tee_cmd_load_ta' 0a8e5a6166dc Bluetooth: hci_qca: fix debugfs registration 2a7e918e2280 Bluetooth: Fix use-after-free in hci_remove_ltk/hci_remove_irk 36482bf16fde s390/dasd: Use correct lock while counting channel queue length fd03b5575c8a ceph: fix use-after-free bug for inodes when flushing capsnaps e022640b1fee can: j1939: avoid possible use-after-free when j1939_can_rx_register fails 67eb5a5153ab can: j1939: change j1939_netdev_lock type to mutex e2a6db7cab74 can: j1939: j1939_sk_send_loop_abort(): improved error queue handling in J1939 Socket 4ce28f3ab368 drm/amd/pm: Fix power context allocation in SMU13 2984dbacf68e drm/amdgpu: fix xclk freq on CHIP_STONEY 77558dd16502 drm/amd/pm: conditionally disable pcie lane switching for some sienna_cichlid SKUs 4b1bf594604c drm/i915/gt: Use the correct error value when kernel_context() fails 17c01feed6ba ALSA: hda/realtek: Add Lenovo P3 Tower platform 800e4c5b36bb ALSA: hda/realtek: Add a quirk for HP Slim Desktop S01 9dab648ccd01 ALSA: hda/realtek: Add quirk for Clevo NS50AU cd67fdd3cc1b Input: fix open count when closing inhibited device 2545d1b4d14f Input: psmouse - fix OOB access in Elantech protocol ed263c550fbd Input: xpad - delete a Razer DeathAdder mouse VID/PID entry 5db4229b1427 batman-adv: Broken sync while rescheduling delayed work aedad6c7fbaf bnxt_en: Implement .set_port / .unset_port UDP tunnel callbacks a94401de2bc2 bnxt_en: Query default VLAN before VNIC setup on a VF cf0a3e94674d bnxt_en: Don't issue AP reset during ethtool's reset operation 40d074f7e490 lib: cpu_rmap: Fix potential use-after-free in irq_cpu_rmap_release() b6b1799c37c3 bpf: Add extra path pointer check to d_path helper a242c6a92ce6 net: sched: fix possible refcount leak in tc_chain_tmplt_add() d7c69f7b8383 net: sched: act_police: fix sparse errors in tcf_police_dump() e7e0f9497421 net: sched: move rtm_tca_policy declaration to include file c5e0a2f49c5a drm/i915/selftests: Add some missing error propagation 234f0337b439 drm/i915/selftests: Stop using kthread_stop() 1f942073e164 drm/i915/selftests: Increase timeout for live_parallel_switch 3604ab1519ef rfs: annotate lockless accesses to RFS sock flow table 2501f5a95511 rfs: annotate lockless accesses to sk->sk_rxhash dd5296e3b21b ipv6: rpl: Fix Route of Death. eab6cda0bfd7 netfilter: ipset: Add schedule point in call_ad(). 7b053b2e8c96 netfilter: conntrack: fix NULL pointer dereference in nf_confirm_cthelper 34d67ecf3dcc selftests/bpf: Fix sockopt_sk selftest 01363bf8efe5 selftests/bpf: Verify optval=NULL case 7e74801e1bfb wifi: cfg80211: fix locking in sched scan stop work 6c25c96a4634 qed/qede: Fix scheduling while atomic 668c3f9514f0 Bluetooth: L2CAP: Add missing checks for invalid DCID 53c056ccda02 Bluetooth: Fix l2cap_disconnect_req deadlock c16e79e27e90 drm/i915: Use 18 fast wake AUX sync len 567873901a92 drm/i915: Explain the magic numbers for AUX SYNC/precharge length dd40bcc357fe net/sched: fq_pie: ensure reasonable TCA_FQ_PIE_QUANTUM values 9d66ffd8ac9e net: enetc: correct the statistics of rx bytes 8db1acf2b131 net/smc: Avoid to access invalid RMBs' MRs in SMCRv1 ADD LINK CONT 9b001a7d1e1a net/ipv6: fix bool/int mismatch for skip_notify_on_dev_down c85bee3a4ae1 bpf: Fix UAF in task local storage 54c8aea7e888 net: dsa: lan9303: allow vid != 0 in port_fdb_{add|del} methods ab0eca3f5455 neighbour: fix unaligned access to pneigh_entry bdcc42186dd9 wifi: mt76: mt7615: fix possible race in mt7615_mac_sta_poll 7b0c76354a6a afs: Fix setting of mtime when creating a file/dir/symlink 8ef72e783065 spi: qup: Request DMA before enabling clocks f0e84db82ed3 platform/surface: aggregator: Allow completion work-items to be executed in parallel 547da248321a blk-iocost: avoid 64-bit division in ioc_timer_fn 3b07425c3dea f2fs: fix iostat lock protection b85fb01a761a bonding (gcc13): synchronize bond_{a,t}lb_xmit() types 0dfc81a283d4 i40e: fix build warning in ice_fltr_add_mac_to_list() 2e12542c19c2 i40e: use int for i40e_status 81f552df075f i40e: Remove string printing for i40e_status d13f56d4b265 sfc (gcc13): synchronize ef100_enqueue_skb()'s return type a9ad05e35412 remove the sx8 block driver c7cf7760b9b5 gcc-plugins: Reorganize gimple includes for GCC 13 8d00b4e329b7 ata: ahci: fix enum constants for gcc-13 Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit e2c1d5814c659ffea6d1c1c658890a7a6fdb779a) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 32eb5b8351..6f392deb06 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "c24198eab94f04755689cf431a434932396e56f6" -SRCREV_meta ?= "ae5766055d47d5675065e386ffa286b212a352c0" +SRCREV_machine ?= "23c35cbe4ce993fc3b566f733820bc46ef715972" +SRCREV_meta ?= "3fe1658766cb7c35799c501ff46b85d773bee417" 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.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.116" +LINUX_VERSION ?= "5.15.117" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 259db4b41f..cc424833c0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.116" +LINUX_VERSION ?= "5.15.117" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "7002dac746495520fb193cb13b1afd83fe4dd2cb" -SRCREV_meta ?= "ae5766055d47d5675065e386ffa286b212a352c0" +SRCREV_machine ?= "9d2b9c97c40afeb83f842bc7b2759bb3a2d2a19d" +SRCREV_meta ?= "3fe1658766cb7c35799c501ff46b85d773bee417" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 0d86a84415..fb904c493e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "846212e7d5354df9f5a061cac6fff98c2d2ca218" -SRCREV_machine:qemuarm64 ?= "c15cb294c24733e9f1f73c5efccaacec7e0ad534" -SRCREV_machine:qemumips ?= "9268ce3666b74e3da988ee8476b5908a11208b59" -SRCREV_machine:qemuppc ?= "8a029153e24092cc00d18f888f22bc03e73a2860" -SRCREV_machine:qemuriscv64 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" -SRCREV_machine:qemuriscv32 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" -SRCREV_machine:qemux86 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" -SRCREV_machine:qemux86-64 ?= "ec5cfb5e4ec277f8d0a728032047639192072107" -SRCREV_machine:qemumips64 ?= "ea7f77e865a06b2431f06bc8cbf320c9e5e71642" -SRCREV_machine ?= "ec5cfb5e4ec277f8d0a728032047639192072107" -SRCREV_meta ?= "ae5766055d47d5675065e386ffa286b212a352c0" +SRCREV_machine:qemuarm ?= "1bf5d396bdb59d790e28ee0002d45fe974023e99" +SRCREV_machine:qemuarm64 ?= "96c8889c7cf3da5210f20f68efdd0a9ff35b1f19" +SRCREV_machine:qemumips ?= "3d65f1de77e2b0c0736503979fa9308d385d19f0" +SRCREV_machine:qemuppc ?= "c3ec0c3928575af062554bc94d49e1e582dc5416" +SRCREV_machine:qemuriscv64 ?= "7a7b177c86db237df76dd87e5515233aac96232b" +SRCREV_machine:qemuriscv32 ?= "7a7b177c86db237df76dd87e5515233aac96232b" +SRCREV_machine:qemux86 ?= "7a7b177c86db237df76dd87e5515233aac96232b" +SRCREV_machine:qemux86-64 ?= "7a7b177c86db237df76dd87e5515233aac96232b" +SRCREV_machine:qemumips64 ?= "58aa8e851acd14dec6c2769637d5e09d796315d9" +SRCREV_machine ?= "7a7b177c86db237df76dd87e5515233aac96232b" +SRCREV_meta ?= "3fe1658766cb7c35799c501ff46b85d773bee417" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "7349e40704a0209a2af8b37fa876322209de9684" +SRCREV_machine:class-devupstream ?= "471e639e59d128f4bf58000a118b2ceca3893f98" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,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.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.116" +LINUX_VERSION ?= "5.15.117" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jul 6 15:06:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26990 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D35F8C001E0 for ; Thu, 6 Jul 2023 15:07:10 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.26465.1688656023497449214 for ; Thu, 06 Jul 2023 08:07:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=DY6O17bz; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1b852785a65so5822355ad.0 for ; Thu, 06 Jul 2023 08:07:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656022; x=1691248022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OOygEl+CpzEjMh27y/j3truVhaRn71wboz2603RMvDI=; b=DY6O17bzvvS/s76Zzrf6o/n5ovyjeWCUm4W6yEQ3jujeQN2SN4KKE2hOst9hoo0Cyy wIc1qF5fnhyOsiKvoyPXUK8ASLne1voYXk2xbej4/e4+6NsMrrtNSBMavGrIaemWao4c LaLHqlSHpgnz/ElZtUm9MMLsRoDuGvzIgtNo20arRgF4NOSv8+xxMNjpA9lHnznPnt1c AEwqFpmNwkdm/OuJgttABV3S4xQscQK/xLlW88a55kF0gO7Vmp8SRqaaOsAMsRSE5/Z7 w7V2OIueZj4mQ8yE2Emf6rPox9T41saDuRi810cy7AZHlHAcZisEqK7AawMeHDgAnxuD KbtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656022; x=1691248022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OOygEl+CpzEjMh27y/j3truVhaRn71wboz2603RMvDI=; b=GcXkm3TLr7Mgs80uJRDLdS3Dia18FwtpsGFNB4JytvoWKmCgRMHoJqdI4/lkre7gwN nQEqfEPGREMQlfEj8wNYZFA4sdzJ8CSwkn4wbgDQFYAeVx256gpOv1XHUtMnFQMpJ6m8 PmaDcwbfWNqA05lJ+XuvqbcJHTpCrKubROC9gFcs9qKb+DlEzNLvN0GKC6hkOk+CtKzj 1CSDGpt1jP+r6+DbLlAQOgDuB50W5uvOUCS0WiRd1LOG7bWXAKjTou7spgS4eRAuM3Yx flPitZ17lnlhM47o4YgHmercZZ1ZPm0vuXWIZNG9gVhrikudCx+LP557rI/w86GqAQNB fJFg== X-Gm-Message-State: ABy/qLYfPwB3WbOS+T3vy+9BQab6L9tIUQySixjWkvoTCON8ZTeZ37BE s1GEJWO1Cb9gfZUOQMKKjPk3tJwN30bH1V7s3vk= X-Google-Smtp-Source: APBJJlGIwC5qtxG5Hc5gHlHNAcU6/2EQMhIZfpnbGDDIws7DtqzS7hh9Ut/Hgl/N27cEnlvmIMYA9g== X-Received: by 2002:a17:902:c401:b0:1b6:92f0:b6f5 with SMTP id k1-20020a170902c40100b001b692f0b6f5mr8577961plk.14.1688656022324; Thu, 06 Jul 2023 08:07:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/28] linux-yocto/5.15: update to v5.15.118 Date: Thu, 6 Jul 2023 05:06:14 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183964 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: f67653019430 Linux 5.15.118 e5bf1f7d1fc8 nilfs2: reject devices with insufficient block count 2bc9231afc64 mmc: block: ensure error propagation for non-blk 4b7b50d4eb1a of: overlay: add entry to of_overlay_action_name[] 84770cc54eff neighbour: delete neigh_lookup_nodev as not used 41806518254c net: Remove DECnet leftovers from flow.h. 4c39a2414a23 net: Remove unused inline function dst_hold_and_use() bb76281b6e61 neighbour: Remove unused inline function neigh_key_eq16() 67866cad7624 rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period c91ed3a5c2ab cgroup: always put cset in cgroup_css_set_put_fork 33b801be2de1 afs: Fix vlserver probe RTT handling f824bcc3e14b selftests/ptp: Fix timestamp printf format for PTP_SYS_OFFSET 2077c7dbfe29 net: tipc: resize nlattr array to correct size f734e16ee17f dm: don't lock fs when the map is NULL during suspend or resume 8a8179f6a345 net: lapbether: only support ethernet devices 052417e8b3ac net/sched: cls_api: Fix lockup on flushing explicitly created chain c0cb9d453fd1 ext4: drop the call to ext4_error() from ext4_get_group_info() eb4ccc102d5f cifs: fix lease break oops in xfstest generic/098 1cb181271eab drm/nouveau: add nv_encoder pointer check for NULL c79dccc263db drm/nouveau/dp: check for NULL nv_connector->native_mode 909b7f7497cc drm/nouveau: don't detect DSM for non-NVIDIA device 10e1e07bdea4 igb: fix nvm.ops.read() error handling fe03fd373ca6 igc: Clean the TX buffer and TX descriptor ring 032b8cbeb19c sctp: fix an error code in sctp_sf_eat_auth() 981e78781a96 ipvlan: fix bound dev checking for IPv6 l3s mode 3e76522d1a6d net: ethtool: correct MAX attribute value for stats 18512de74454 IB/isert: Fix incorrect release of isert connection 63e9e7198374 IB/isert: Fix possible list corruption in CMA handler 29ff057c0a50 IB/isert: Fix dead lock in ib_isert fced7aaaa38f IB/uverbs: Fix to consider event queue closing also upon non-blocking mode cd44977ecc94 RDMA/cma: Always set static rate to 0 for RoCE 5a9dee176b4b RDMA/mlx5: Initiate dropless RQ for RAW Ethernet functions 35828874aa9f octeontx2-af: fix lbk link credits on cn10k 7506e77357da octeontx2-af: fixed resource availability check 4dd914b9e2f9 iavf: remove mask from iavf_irq_enable_queues() e6342cd13d39 RDMA/rxe: Fix the use-before-initialization error of resp_pkts 466f25fd2d9b RDMA/rxe: Removed unused name from rxe_task struct 13d087b3587b RDMA/rxe: Remove the unused variable obj 0e1098d72fa4 net/sched: cls_u32: Fix reference counter leak leading to overflow d56661cd8d55 net/sched: act_pedit: Parse L3 Header for L4 offset 17b330b78244 net/sched: act_pedit: remove extra check for key type 219b8e98387f net/sched: simplify tcf_pedit_act 688e6db59661 ping6: Fix send to link-local addresses with VRF. 471a4c08e30e net: enetc: correct the indexes of highest and 2nd highest TCs 44ebe988cb38 netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE 133b73d85343 netfilter: nfnetlink: skip error delivery on batch in case of ENOMEM e4188f8b8134 netfilter: nf_tables: integrate pipapo into commit protocol 4da9d4e74033 spi: fsl-dspi: avoid SCK glitches with continuous transfers 08acd41bb15a RDMA/rxe: Fix packet length checks 01f6f867adc7 RDMA/rtrs: Fix rxe_dealloc_pd warning 01bbead3098b RDMA/rtrs: Fix the last iu->buf leak in err path 1938f080a183 usb: dwc3: gadget: Reset num TRBs before giving back the request ed0295504905 serial: lantiq: add missing interrupt ack 235845b576c5 USB: serial: option: add Quectel EM061KGL series e05e9cca7797 thunderbolt: Mask ring interrupt on Intel hardware as well 0bd227610c83 thunderbolt: dma_test: Use correct value for absent rings when creating paths 2a974abc0976 Remove DECnet support from kernel 28010d3a9a22 ALSA: hda/realtek: Add a quirk for Compaq N14JP6 203a01ae5732 drm/amdgpu: add missing radeon secondary PCI ID b1b64a76b775 drm/amd/display: edp do not add non-edid timings 98c8c0f2b3a5 net: usb: qmi_wwan: add support for Compal RXM-G1 fd81222d1a69 RDMA/uverbs: Restrict usage of privileged QKEYs 14c30c2439dc nouveau: fix client work fence deletion race f4c5eebb37a2 dm thin metadata: check fail_io before using data_sm ee09c0b1b0f4 ALSA: usb-audio: Add quirk flag for HEM devices to enable native DSD playback 953cc0bf2d5b powerpc/purgatory: remove PGO flags faf45f2c5e62 x86/purgatory: remove PGO flags d38e051ec6fd kexec: support purgatories with .text.hot sections 4357336192ed nilfs2: fix possible out-of-bounds segment allocation in resize ioctl 74ea184af91a nilfs2: fix incomplete buffer cleanup in nilfs_btnode_abort_change_key() 941e7452dfc8 nios2: dts: Fix tse_mac "max-frame-size" property 8a8efde4a735 ocfs2: check new file size on fallocate call 559b7a0d9f0d ocfs2: fix use-after-free when unmounting read-only filesystem 8262a9f3b801 epoll: ep_autoremove_wake_function should use list_del_init_careful c0a242295569 wifi: cfg80211: fix double lock bug in reg_wdev_chan_valid() 1a65bac4edf9 wifi: cfg80211: fix locking in regulatory disconnect 0e388fce7aec io_uring: hold uring mutex around poll removal 27825a6da78b irqchip/gic: Correctly validate OF quirk descriptors f50018e2dd87 NVMe: Add MAXIO 1602 to bogus nid list. 4204b539ca73 drm:amd:amdgpu: Fix missing buffer object unlock in failure path 7cb02d5dc2e2 xen/blkfront: Only check REQ_FUA for writes a75928bb929a ASoC: dwc: move DMA init to snd_soc_dai_driver probe() 37f7864c1791 mips: Move initrd_start check after initrd address sanitisation. 0d6e6542946d MIPS: Alchemy: fix dbdma2 1907b6148f86 MIPS: unhide PATA_PLATFORM 8f50d247b5dc parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory() 717368977b8e parisc: Improve cache flushing for PCXL in arch_sync_dma_for_cpu() 7e85809d2782 ASoC: soc-pcm: test if a BE can be prepared 68086376a1d2 btrfs: handle memory allocation failure in btrfs_csum_one_bio 39ea94952625 btrfs: scrub: try harder to mark RAID56 block groups read-only 9df872ec4a22 power: supply: Fix logic checking if system is running from battery 42e6a4a1e085 irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues 2105f2fa5791 regulator: Fix error checking for debugfs_create_dir 91b3d6aa0722 platform/x86: asus-wmi: Ignore WMI events with codes 0x7B, 0xC0 c845ec79c3cf power: supply: Ratelimit no data debug output 19d09d31dae5 tools: gpio: fix debounce_period_us output of lsgpio c11bb961ca4d ARM: dts: vexpress: add missing cache properties 36fdd1d5b40e power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule() 3b86c54e6ebe power: supply: sc27xx: Fix external_power_changed race 200d8ad44e04 power: supply: ab8500: Fix external_power_changed race 48992b928785 of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset() 282f0c63cf53 of: overlay: rework overlay apply and remove kfree()s 5f306cbfa52b of: overlay: rename variables to be consistent 1cc40dccad76 drm/amdgpu: fix Null pointer dereference error in amdgpu_device_recover_vram 7cf3bf3cc033 ksmbd: fix slab-out-of-bounds read in smb2_handle_negotiate de091a6e1ff0 test_firmware: fix a memory leak with reqs buffer bfb0b366e8ec test_firmware: prevent race conditions by a correct implementation of locking 4b5511aa0a5e test_firmware: Use kstrtobool() instead of strtobool() Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit ec3fd718ecc881ee3410a0b6434922993368ee6d) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 6f392deb06..924e6ffa10 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "23c35cbe4ce993fc3b566f733820bc46ef715972" -SRCREV_meta ?= "3fe1658766cb7c35799c501ff46b85d773bee417" +SRCREV_machine ?= "b2a7dbd4edac7627c091c2ab14fec83726a4c79b" +SRCREV_meta ?= "a6e18bacddf8ebca0c151e809c9996e17e08a7b0" 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.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.117" +LINUX_VERSION ?= "5.15.118" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index cc424833c0..859ef2b687 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.117" +LINUX_VERSION ?= "5.15.118" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "9d2b9c97c40afeb83f842bc7b2759bb3a2d2a19d" -SRCREV_meta ?= "3fe1658766cb7c35799c501ff46b85d773bee417" +SRCREV_machine ?= "b79e89ab973aeb8ec48e2cd987436ab52678e795" +SRCREV_meta ?= "a6e18bacddf8ebca0c151e809c9996e17e08a7b0" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index fb904c493e..e88e465467 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "1bf5d396bdb59d790e28ee0002d45fe974023e99" -SRCREV_machine:qemuarm64 ?= "96c8889c7cf3da5210f20f68efdd0a9ff35b1f19" -SRCREV_machine:qemumips ?= "3d65f1de77e2b0c0736503979fa9308d385d19f0" -SRCREV_machine:qemuppc ?= "c3ec0c3928575af062554bc94d49e1e582dc5416" -SRCREV_machine:qemuriscv64 ?= "7a7b177c86db237df76dd87e5515233aac96232b" -SRCREV_machine:qemuriscv32 ?= "7a7b177c86db237df76dd87e5515233aac96232b" -SRCREV_machine:qemux86 ?= "7a7b177c86db237df76dd87e5515233aac96232b" -SRCREV_machine:qemux86-64 ?= "7a7b177c86db237df76dd87e5515233aac96232b" -SRCREV_machine:qemumips64 ?= "58aa8e851acd14dec6c2769637d5e09d796315d9" -SRCREV_machine ?= "7a7b177c86db237df76dd87e5515233aac96232b" -SRCREV_meta ?= "3fe1658766cb7c35799c501ff46b85d773bee417" +SRCREV_machine:qemuarm ?= "2290ac7e8d7fbb8e13a34468b85066c398c7d1f3" +SRCREV_machine:qemuarm64 ?= "3f3f2067c3ee4d9dffaed9b757583d013671cf25" +SRCREV_machine:qemumips ?= "f61a3b045bdfc9aa7da440852e0a79fd8d9b4d69" +SRCREV_machine:qemuppc ?= "7a2773ad8fb4ae4eb0183ccda8ec133098d13ec9" +SRCREV_machine:qemuriscv64 ?= "079c88490578df99b38570c8968b836b8347ed44" +SRCREV_machine:qemuriscv32 ?= "079c88490578df99b38570c8968b836b8347ed44" +SRCREV_machine:qemux86 ?= "079c88490578df99b38570c8968b836b8347ed44" +SRCREV_machine:qemux86-64 ?= "079c88490578df99b38570c8968b836b8347ed44" +SRCREV_machine:qemumips64 ?= "47d334232ab28f0f8d5316e07e11f8f14c6aaecc" +SRCREV_machine ?= "079c88490578df99b38570c8968b836b8347ed44" +SRCREV_meta ?= "a6e18bacddf8ebca0c151e809c9996e17e08a7b0" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "471e639e59d128f4bf58000a118b2ceca3893f98" +SRCREV_machine:class-devupstream ?= "f67653019430833d5003f16817d7fa85272a6a76" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,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.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.117" +LINUX_VERSION ?= "5.15.118" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jul 6 15:06:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3431C001DD for ; Thu, 6 Jul 2023 15:07:10 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web10.26507.1688656025390994082 for ; Thu, 06 Jul 2023 08:07:05 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=sF12glES; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1b8bd586086so4956225ad.2 for ; Thu, 06 Jul 2023 08:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656024; x=1691248024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vMw/qgNGSrm5gX/IjTne9DLDL/PNfr9ezi78NbanxFc=; b=sF12glESxj+F/xt6UqjIRcYJ0YZ89Msc/6Zd+DZPLYKlvHK1sTg8S/zKCxslsLW0C4 mXg5F1j94fyZF1w9ZsqF8Tyk7eS7h4NpFm5ihpRbgc64SSQSQDZ4S8Wuseta1F1q6AZK 59GgVvlwyZeKJKbqDgBP5MpYzUwk2RsRPn7jb3j7oNQGulexHvrKweCNfkpJdZd+GmLy JOYgt1OLRzOSFf4bQLn97g9Ilk70O9NCaJsuusGtefrh/ZIkY7uLURRZDGvFNjj0XY4K p8MW7i0C2XJURRngaQsIxeyVPb7bLHFb16+aSjuo2b9I40TWsIG6SepskKgsNN7wKxXN ciqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656024; x=1691248024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vMw/qgNGSrm5gX/IjTne9DLDL/PNfr9ezi78NbanxFc=; b=blbHZ8sBzky5+cmYth/FoM7Dp+tcrdAvVPEPRTsU1wLQEZHVZ1LD8xF+iyMmwfd9i3 8ktwS+Er7YVOOrVa4/5FggWVb0vo+lflkQr6qPd9kg6+MU30gFG953y9SVdBgbtsRLiX JcK0c+/kI3dXuAVt1EWKxJFuqoXh4aUIsA0jIe5DS02dmC61NQFtpMjJ3t6Mc5/fkhWs +vcCAeuIOlsXUK1QgEayXA8PjyGJ/UHWDT+W5wtvG25zzsWPD52+fqWrw6iLK+BC+8Aq ZgjXLQsG/NF0C/V+7cXUU/FEFnkp2K802UcdbYWjmi+lNMmIQigSF40E5EqiNOELxRPc 9qSA== X-Gm-Message-State: ABy/qLZ/Az20yCupZtVi6kRTpeFJE7nHo+dcPdpOtHmqNfHs0H6L9GzF yqZSATY5yxMwfpLTgMFO+aycfkAH72eVbfWJxOw= X-Google-Smtp-Source: APBJJlGTyWfN1SGVyAuFemQ0lWwfHdN8b0ZfgwwS29W9v5tvke4+CxmCeNuyuHQwcmLf4fBgoUOW8w== X-Received: by 2002:a17:903:2349:b0:1b5:5fd2:4d6e with SMTP id c9-20020a170903234900b001b55fd24d6emr2650500plh.58.1688656024375; Thu, 06 Jul 2023 08:07:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/28] linux-yocto/5.15: cfg: fix DECNET configuration warning Date: Thu, 6 Jul 2023 05:06:15 -1000 Message-Id: <4c063286ab115abf3d15e4713ea9bcd4f5fb1ab2.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183965 From: Bruce Ashfield -stable merged the DECNET removal to 5.15, so we integrate the following kernel-cache commit to fix the kernel configuration audit warning: b647d9611cb base: drop CONFIG_DECNET Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit 06ef70ac1fa8201c5b46050e098ebea3b1423f9f) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 924e6ffa10..8e5ff78790 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "b2a7dbd4edac7627c091c2ab14fec83726a4c79b" -SRCREV_meta ?= "a6e18bacddf8ebca0c151e809c9996e17e08a7b0" +SRCREV_meta ?= "b647d9611cb4936536e60a438292fc22df2fe000" 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.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 859ef2b687..77e11c100b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -15,7 +15,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "b79e89ab973aeb8ec48e2cd987436ab52678e795" -SRCREV_meta ?= "a6e18bacddf8ebca0c151e809c9996e17e08a7b0" +SRCREV_meta ?= "b647d9611cb4936536e60a438292fc22df2fe000" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index e88e465467..c4266c6f30 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "079c88490578df99b38570c8968b836b8347ed44" SRCREV_machine:qemux86-64 ?= "079c88490578df99b38570c8968b836b8347ed44" SRCREV_machine:qemumips64 ?= "47d334232ab28f0f8d5316e07e11f8f14c6aaecc" SRCREV_machine ?= "079c88490578df99b38570c8968b836b8347ed44" -SRCREV_meta ?= "a6e18bacddf8ebca0c151e809c9996e17e08a7b0" +SRCREV_meta ?= "b647d9611cb4936536e60a438292fc22df2fe000" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same From patchwork Thu Jul 6 15:06:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26988 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6DA4EB64D9 for ; Thu, 6 Jul 2023 15:07:10 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.26466.1688656027173632721 for ; Thu, 06 Jul 2023 08:07:07 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=CCjEZIQL; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b8033987baso14121795ad.0 for ; Thu, 06 Jul 2023 08:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656026; x=1691248026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=eqbcmbCBYAp+zhG9717TcnTFy9vDhEQDYEueVcWP4dA=; b=CCjEZIQL2CTA6iBTn80Bz+JbYqsCwPd7rDptJWyFFENmYK86Cu/kmgHC2J7KxOcEal arFuXoAAAlOvmlKo9Kv/v8xacCWiq4hvB82+ifP7leV0QtUPjjBkA4OfVEcW96HGmGlo w12GC4ASz53pQKKzgMQQkn7H8OBV5zTnJG0760F9UuuB0yqMJKJf9rxw0kNoySnjKz+F lYYcq4bsCF/BMCN2H52NWYrwgL1lGBK5LYODI53MDkPLNwTjEwX4xXZd8CX+F7lLPHia m9lOc5yPWNdBWDoPb6OXTWwwfxZIM0/zj2YfCDHnEJEXfiSTCVWare3nvd2OwM8PW92j 2PpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656026; x=1691248026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eqbcmbCBYAp+zhG9717TcnTFy9vDhEQDYEueVcWP4dA=; b=jeae2IKO4BDG9ueRGqHjf2J1p9E/gTA6XCZX6qyxFWVBDI8oJ9pmtmxPAUKVFnpuFh pxu36lxSKAZkvmjHgGfdU8t2z4x48q3ZPVaUG0VAIFjE9iCciH7OxRW/MONnw9RsdVQy 0FzTTT+BVjnNznVV8dwfIxDOwtkSz+p2VYPudHyuBuMbPzSckIiJgTIBXX2MnmfaOtoF XP1ccAjQKViYbrLpJLp2pl0yzCikUXVGKMXTs+G3WS75K72JUpLmboit1sDDoQyewKLg Oxjn83QNnxgpPUA7wkhz2JMNgIJ1kth15jVlPHluu7rarhtl4Iyzyhmvf4KQp3Qe7xBu XvVg== X-Gm-Message-State: ABy/qLYDcEyOaDFtGn71RzBUBRIF559W7e6MQPDSmNMpPrX0Tmz/Nf0b fQ+q1x5DBkPvX0ujklCphweifBkj7UZw2Ovgyfs= X-Google-Smtp-Source: APBJJlETag11AOzN9+trUU4WwoV2PDD3n/4sRu9LpEEKtiRXSaNjw6yLLag8gJGbE+Pv6KCLeY3crA== X-Received: by 2002:a17:902:e843:b0:1b7:de50:7d9c with SMTP id t3-20020a170902e84300b001b7de507d9cmr8522204plg.15.1688656026182; Thu, 06 Jul 2023 08:07:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/28] v86d: Improve kernel dependency Date: Thu, 6 Jul 2023 05:06:16 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183966 From: Richard Purdie Working with enabling SPDX, an issue was observerd where v86d wasn't rebuilding when the kernel was changed from linux-yocto to linux-yocto-rt. This is due to the code in sstatesig.py which was seeing the RRECOMMENDS on a kernel module and ignoring the DEPENDS. The v86d is technically a kernel module since it uses kernel header files. There are two ways to address this, we could inherit the module-base class and the dependency code does the correct thing. It appears the code doesn't look into STAGING_KERNEL_DIR though and doesn't use the kernel sources. We can therefore drop the DEPENDS and the code will the do the correct thing. Signed-off-by: Richard Purdie (cherry picked from commit 37ccd11cb0b89416b8e23160445186269b6c0c8a) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/v86d/v86d_0.1.10.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/meta/recipes-bsp/v86d/v86d_0.1.10.bb index 5f342b1120..b4fe362f8e 100644 --- a/meta/recipes-bsp/v86d/v86d_0.1.10.bb +++ b/meta/recipes-bsp/v86d/v86d_0.1.10.bb @@ -6,7 +6,6 @@ DESCRIPTION = "v86d provides a backend for kernel drivers that need to execute x LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;md5=94ac1971e4f2309dc322d598e7b1f7dd" -DEPENDS = "virtual/kernel" RRECOMMENDS:${PN} = "kernel-module-uvesafb" PR = "r2" From patchwork Thu Jul 6 15:06:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6DDDC001B0 for ; Thu, 6 Jul 2023 15:07:10 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.26467.1688656029711001017 for ; Thu, 06 Jul 2023 08:07:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=5B6jxAi+; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-666e6ecb52dso539035b3a.2 for ; Thu, 06 Jul 2023 08:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656029; x=1691248029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6+HzmG/80t0r2N6damhv67dtUMXD1lFVfrZgUuU9qMM=; b=5B6jxAi+G/Z32jajHs8/rCqeqeg7cZ6WNDXnFQEBZHekLIwHm+fJPYM4s8sY7btnHX yRTjXUGzbpDe20eAqGf4NM83dEVhYV50G6MvvHGdzG4RYqdT3u4smrX8jVw/0C9hmPmg JPLZUnPy/y6zqQ7X888AP79eB9qv/I0yTW8JrMk6PvjC0cpzTBmi82PMVxd7YF81nDKf duuQwk6Dlj/DB7+g3M/UnZ5pNeyddTTtQIYDPXySYVus/f17UOwADcrDckGUgtfxwLAL juPDY3eyRNfESBs0rhC2JJmsfR6KXeBYGO8SC8xpNh19MYeYohdm0MnpT7XDnnO3fOYb QkgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656029; x=1691248029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6+HzmG/80t0r2N6damhv67dtUMXD1lFVfrZgUuU9qMM=; b=LeU3MIFaPfOExHIm1zLgNSiddVEMqCch/RVa0leGXkrlfPClAdkVEFqwOboEXyOOeg 8VB1rMiEXXhwobE0tR6U0RgaOjI3Ag1BLqGlr/lPY2tmZxzLY1k7RJTHMuRMaSsCk2ux O3ycygrqYjxG+smpj+of/Sjcv6MWgYS22L1dVoIwDMGfoSMyfhudTvYUC07+4hWxsklS /G2ZK8wQcht7aOwWQ+11WEktLSbZPCgPbld+koch5/Gb26pmzlMoDvhMcWv5kP/RIXwJ OREDFHgUSlsRlVPM0PHmVpysXHn8SNtT8JcwchgerLf4UtOneP7adwL42DRprrTlSs0W QAXg== X-Gm-Message-State: ABy/qLaZufq1W6deWPyu3Tsdy8JmT1L5+u69au8jjac7SLj4C9jhDOFz vXBCZ7BvMT4naAR7Y/EDHbl/W3oqL/1BSe4amF4= X-Google-Smtp-Source: APBJJlHaLMXZr/NVCOVQqbxsprspwuLdlX6+O+guFqct2gQgTmqkKFSYtOQHfxr4ViHf8/yTJDLeGw== X-Received: by 2002:a05:6a20:6708:b0:10b:e54f:1c00 with SMTP id q8-20020a056a20670800b0010be54f1c00mr1346596pzh.57.1688656027975; Thu, 06 Jul 2023 08:07:07 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/28] image_types: Fix reproducible builds for initramfs and UKI img Date: Thu, 6 Jul 2023 05:06:17 -1000 Message-Id: <0d8890f7c1fbea5036acefa3031dcd442b316725.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183967 From: Frieder Paape I've encountered issues reproducing initramfs and UKI image builds, which will be fixed with this patch. 1. initramfs There's a symbolic link to /sbin/init, which is appended to the cpio archive after creation. The links timestamp needs to be static and the cpio append command needs the '--reproducible' flag to produce deterministic outcomes. 2. Unified Kernel Image '--preserve-dates' is required for a static 'Time/Date' entry. I've added '--enable-deterministic-archives' although in my case this didn't change anything. Signed-off-by: Frieder Paape Signed-off-by: Richard Purdie (cherry picked from commit fd027729bafb4e085ba0949e38e724f3a8cad102) Signed-off-by: Steve Sakoman --- meta/classes/image_types.bbclass | 5 +++-- scripts/lib/wic/plugins/source/bootimg-efi.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 79081d9f98..9d5f8c68a4 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -130,10 +130,11 @@ IMAGE_CMD:cpio () { if [ ! -L ${IMAGE_ROOTFS}/init ] && [ ! -e ${IMAGE_ROOTFS}/init ]; then if [ -L ${IMAGE_ROOTFS}/sbin/init ] || [ -e ${IMAGE_ROOTFS}/sbin/init ]; then ln -sf /sbin/init ${WORKDIR}/cpio_append/init + touch -h -r ${IMAGE_ROOTFS}/sbin/init ${WORKDIR}/cpio_append/init else - touch ${WORKDIR}/cpio_append/init + touch -r ${IMAGE_ROOTFS} ${WORKDIR}/cpio_append/init fi - (cd ${WORKDIR}/cpio_append && echo ./init | cpio -oA -H newc -F ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio) + (cd ${WORKDIR}/cpio_append && echo ./init | cpio --reproducible -oA -H newc -F ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio) fi fi } diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index c28d3917c2..a2b9f4c893 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -330,6 +330,8 @@ class BootimgEFIPlugin(SourcePlugin): # https://www.freedesktop.org/software/systemd/man/systemd-stub.html objcopy_cmd = "%s-objcopy" % target_sys + objcopy_cmd += " --enable-deterministic-archives" + objcopy_cmd += " --preserve-dates" objcopy_cmd += " --add-section .osrel=%s/usr/lib/os-release" % staging_dir_host objcopy_cmd += " --change-section-vma .osrel=0x20000" objcopy_cmd += " --add-section .cmdline=%s" % cmdline.name From patchwork Thu Jul 6 15:06:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26995 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5C3BEB64DC for ; Thu, 6 Jul 2023 15:07:20 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.26468.1688656031691820507 for ; Thu, 06 Jul 2023 08:07:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=moCAXtJa; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1b852785a65so5823575ad.0 for ; Thu, 06 Jul 2023 08:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656031; x=1691248031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yTRTgq2m0QYWC3Rku6iIlIfMuSlc64nKa4V3ZLCw9z0=; b=moCAXtJaV/EiSwP9zYx8slPRJjGRhHRTnjTc0Bf+N3WNBrbFIlUzO3OJ5525IfzNk1 IGWj/QoB10g2MzsrPB/Kb3z8ZhGw8fVwBaX8BVLc/rmKgCEMoxwL3QvKvo5RRPiExKlz 98pBp/ivUNThndU6jaXkxxZnjavvxwiW5Gz+Jmsh3w1Zzv7qRmFCnx5pkf6m642JTEtA vCANE7BGV+v8LI3zBq8RDWy6ZaaDNr+dopU0Zr8c/GCDYYYuMKRsHsl2VKxRJv5vHAIm SbtL/0P42e3kKXfB40DUcqpVg2sQ9mgve5Z9lw9nxmnFCg8ydUJlnuWHnhftxL2EVlnY UHGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656031; x=1691248031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yTRTgq2m0QYWC3Rku6iIlIfMuSlc64nKa4V3ZLCw9z0=; b=Ejw3dukFk6RryH417G4GXDxwkzPg7+i4vpyiH86GMX0bXwEHEOeyIxBEp2A6s/LhJQ Y7VAk6BVnENZ7exDvuLjcosnwDndzHil0HJi2KMYp/vj/92QLH+6SDS0ZaAqIf8UCXk4 qSN/PXbQrkwwfbmYoh7xqEzX49a4UPldTJu9Z4sbt4RJQXAcBM5R7rbbYsn3NtfEtfny lSBjVPUG2qn7xR1hNVm0mjLFQ4YsTYjsPBVWneUWf7Bdw+9tgZCUI+aZ8RJSwXCwPAha 7THLtYJUhuPq/kOkIKxKAtXrQX53uGOmwin7ga6v3UKe/YVktiD4vaj4kEKesVwLsRmH pHPg== X-Gm-Message-State: ABy/qLZIkQsoe0m+zDh9YmYVUG32Elac7tfQlvAjWV0APlFVo2lO0maX /wqrMZqlfRuCSSpaxvtKQBAJybCPtHaLppeL5a8= X-Google-Smtp-Source: APBJJlF29L4t2BLDd+ZUEcZWc5NGYnqiOaqbMAAFKOFOd2JO5I+bKgt7aWZJ0PECrrN075ZF2Awmnw== X-Received: by 2002:a17:902:dac9:b0:1b8:76cb:c6a4 with SMTP id q9-20020a170902dac900b001b876cbc6a4mr7813584plx.21.1688656030743; Thu, 06 Jul 2023 08:07:10 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/28] meta: lib: oe: npm_registry: Add more safe caracters Date: Thu, 6 Jul 2023 05:06:18 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183968 From: BELOUARGA Mohamed NPM registry cache should support caracaters like '(' and ')' Explanation: NPM packages can contains these caracters like : @(._.)/execute Signed-off-by: BELOUARGA Mohamed Signed-off-by: Alexandre Belloni (cherry picked from commit 6110d9e24e43e286781afd1b3634a4ad1a2050d0) Signed-off-by: Steve Sakoman --- meta/lib/oe/npm_registry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/npm_registry.py b/meta/lib/oe/npm_registry.py index 96c0affb45..3f70e4f5c8 100644 --- a/meta/lib/oe/npm_registry.py +++ b/meta/lib/oe/npm_registry.py @@ -5,7 +5,7 @@ import subprocess _ALWAYS_SAFE = frozenset('ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' '0123456789' - '_.-~') + '_.-~()') MISSING_OK = object() From patchwork Thu Jul 6 15:06:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26993 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9AAEC001DD for ; Thu, 6 Jul 2023 15:07:20 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.26469.1688656033771762189 for ; Thu, 06 Jul 2023 08:07:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=4exvidLC; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b7e6512973so5105545ad.3 for ; Thu, 06 Jul 2023 08:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656033; x=1691248033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=17UF527Ezwx0RQqDAZ2dnucMkqNz+vlyEqQO4SBu33Y=; b=4exvidLClOyIF3004A3ExBzoiOB3kVe4GWAlK6gjWvSSCZpnj2W6+b25gmubRnxOJw Dl/B234xP39yNitXWlQ/F41nfOMYdEL1/VXn0UcSJq1PtmJfC/FNPN3zCYLbPiOIjChy hCdBcpVuzycQGoI7jKLuN8EnBjaBJv/fB2Bx7mU3mdG8ycSK9gnW4mPgj6Zq3ThYcPGG 9x+5Q3aM+MhCjsTmVhySB/Wu11fxfBkMqmweZjGAdFzLQKOMV+FquV5jKrFFSUzDdtkG bbfFUtbF6Vc1AeIcWxSUFgy0mtP+M50pFr0vZ8++qHCtqzILsC6M+shgd08H2nd6Svfs Mk6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656033; x=1691248033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=17UF527Ezwx0RQqDAZ2dnucMkqNz+vlyEqQO4SBu33Y=; b=Cew/pna0x8xkMKChHIdSbweQIhRqEpjPybnkhClUtqWVYKxJ6G86o+bFPqIKRxFsEh rlbjMbHzbYNUD+Ln6awFDs1ugwNvO6Ucwsm103Xd+LuY7HkEqMElShgGeDQTKhbtTIuN XEDPtLsxceUkNQXoA0urXGQo/lAm15w5GR+Kx6qLX9h36QQ8Q52LWTbghPqJzH5gH9ql rmSfz+RpeXHqiP4Xity9nY+HBaE29qQRbH4DgouCgWIpzHR1SaXCgOkp5XgRvbQUbOxk F47RxBJTgybR+Pro5MBfizIQUxz0HxIKkBatjoHclBZPUVuR9BCrivEY9gAxqfI61D9l wFVA== X-Gm-Message-State: ABy/qLY30GDa6MDY6JOHoQJIqsM2fsjHJXlz9qEuo7dH8XKdgFVE/gyE BqV/HXrHHBE50xnhS7/G6urbX0M9SEGZ4VXN7Vs= X-Google-Smtp-Source: APBJJlEN3a9BGhDjXYX3a1rrew3pUUDLm5q/VHy0o/oQv8GpDhtWsKt08Ohzj0s2PfdAjg8opOs4DQ== X-Received: by 2002:a17:903:41d2:b0:1b5:6312:4c5b with SMTP id u18-20020a17090341d200b001b563124c5bmr2214069ple.63.1688656032841; Thu, 06 Jul 2023 08:07:12 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/28] scripts/runqemu: split lock dir creation into a reusable function Date: Thu, 6 Jul 2023 05:06:19 -1000 Message-Id: <2ada5f426e71e3873ba8c47dd925d8cfc103524b.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183969 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 004d6bcb067ecf1d796801fa43a98820c4efd3c7) Signed-off-by: Steve Sakoman Reviewed-by: Philippe Mathieu-Daudé --- scripts/runqemu | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 5a98abfffe..f275cf7813 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1062,6 +1062,17 @@ class BaseConfig(object): self.set('NETWORK_CMD', '-netdev bridge,br=%s,id=net0,helper=%s -device virtio-net-pci,netdev=net0 ' % ( self.net_bridge, os.path.join(self.bindir_native, 'qemu-oe-bridge-helper'))) + def make_lock_dir(self, lockdir): + if not os.path.exists(lockdir): + # There might be a race issue when multi runqemu processess are + # running at the same time. + try: + os.mkdir(lockdir) + os.chmod(lockdir, 0o777) + except FileExistsError: + pass + return + def setup_slirp(self): """Setup user networking""" @@ -1080,14 +1091,7 @@ class BaseConfig(object): mac = 2 lockdir = "/tmp/qemu-port-locks" - if not os.path.exists(lockdir): - # There might be a race issue when multi runqemu processess are - # running at the same time. - try: - os.mkdir(lockdir) - os.chmod(lockdir, 0o777) - except FileExistsError: - pass + self.make_lock_dir(lockdir) # Find a free port to avoid conflicts for p in ports[:]: @@ -1127,14 +1131,7 @@ class BaseConfig(object): logger.error("ip: %s" % ip) raise OEPathError("runqemu-ifup, runqemu-ifdown or ip not found") - if not os.path.exists(lockdir): - # There might be a race issue when multi runqemu processess are - # running at the same time. - try: - os.mkdir(lockdir) - os.chmod(lockdir, 0o777) - except FileExistsError: - pass + self.make_lock_dir(lockdir) cmd = (ip, 'link') logger.debug('Running %s...' % str(cmd)) From patchwork Thu Jul 6 15:06:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26994 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9A75EB64DD for ; Thu, 6 Jul 2023 15:07:20 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.26513.1688656035738667051 for ; Thu, 06 Jul 2023 08:07:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=xQ5Z2oM7; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b8baa836a5so5078955ad.1 for ; Thu, 06 Jul 2023 08:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656035; x=1691248035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=p3Luc8s+sGY2wDRMEC117qeZJ7252giBDAqUKLlcLXo=; b=xQ5Z2oM76YtJv+JErvrqSl8jItUXDolfSzKBhfLUhmMjEYXKuFb47he+boHBKtgJIh e4lcZ0ma45lFZQ4fWPtg1AnJlif0N1S7uD57xd0YSPRq11bFXecY/iIGFl3jhWPy2lF3 dshPxRuKA972s7cTFJw8MhmM19I/77DdkMrF/5RZhKTBn583i9JwNDfTpihoNUTT+Snt U8P3nWGls6yjkXUoTOOiwp83vXGSyZp5E3IP+T4finQArJXnUv1tAQbKvEje6+j26nnh iYVfwZzhedkjuyCSZkNDAY4x1hQRRpkX57Q5LBe+lQ4SSiwvJIsv6txkoR+YmbNzJtAa FQ/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656035; x=1691248035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p3Luc8s+sGY2wDRMEC117qeZJ7252giBDAqUKLlcLXo=; b=fOGYEp/OZGsgvkJcP0YRI4bun2ZWZyv7w7No3q8+I9Xbo5Qbkhd0wgaSspJUz5x2fr RMmm0wb3zdSOW/08l8KjvcvyaRuxSRxVVR4rf+dRgYfbjO48avLFR8LWl4FLjxlRqUZb 9UqBfNw9j2X0UTgAO1UKzvbfDPL//BCTtkUiw95RP3Z8zv5WjheA/7HfhA+b5/IJAfov i+0ZhqpScV42xFGucxAUHcv7ctDsLWNoCGVlpqY+6FhQ6/Dlcuqpmc4oY5pwKqg5pT9o n4Aqv+tRSVZdopnsd11Q6WikdGfQxWfuOqefKHWPHMg4cJeqtcwC9262MtCc2UuxtVjI +oAQ== X-Gm-Message-State: ABy/qLZfQIdd55s2ygvAW6hDEhGtl+7GMg0zzUVpY8Y3TyFZoa2HstAG s1iU2vF2bHRBCYOztiFtnFLB8hzP00A1WSSpsKg= X-Google-Smtp-Source: APBJJlFKieEgvIexkwUqDvzm8VTOchjbc6BRGwjXrAuUMUSnLbRUOcxUfippH/revMR7YGE+oRRAGg== X-Received: by 2002:a17:903:24e:b0:1b6:6bf0:eb8f with SMTP id j14-20020a170903024e00b001b66bf0eb8fmr2768111plh.38.1688656034795; Thu, 06 Jul 2023 08:07:14 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/28] scripts/runqemu: allocate unfsd ports in a way that doesn't race or clash with unrelated processes Date: Thu, 6 Jul 2023 05:06:20 -1000 Message-Id: <343510b33650c88367f95e8d8322fae92ae901ca.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183970 From: Alexander Kanavin There is already a neat check_free_port() function for finding an available port atomically, so use that and make two additional tweaks: - no need to allocate two separate ports; per unfsd documentation they can be the same - move lockfile release until after unfsd has been shut down and the port(s) used has been freed [YOCTO #15077] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit dee96e82fb04ea99ecd6c25513c7bd368df3bd37) Signed-off-by: Steve Sakoman --- scripts/runqemu | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index f275cf7813..729b067a9f 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1001,17 +1001,14 @@ class BaseConfig(object): else: self.nfs_server = '192.168.7.1' - # Figure out a new nfs_instance to allow multiple qemus running. - ps = subprocess.check_output(("ps", "auxww")).decode('utf-8') - pattern = '/bin/unfsd .* -i .*\.pid -e .*/exports([0-9]+) ' - all_instances = re.findall(pattern, ps, re.M) - if all_instances: - all_instances.sort(key=int) - self.nfs_instance = int(all_instances.pop()) + 1 - - nfsd_port = 3049 + 2 * self.nfs_instance - mountd_port = 3048 + 2 * self.nfs_instance + nfsd_port = 3048 + self.nfs_instance + lockdir = "/tmp/qemu-port-locks" + self.make_lock_dir(lockdir) + while not self.check_free_port('localhost', nfsd_port, lockdir): + self.nfs_instance += 1 + nfsd_port += 1 + mountd_port = nfsd_port # Export vars for runqemu-export-rootfs export_dict = { 'NFS_INSTANCE': self.nfs_instance, @@ -1542,13 +1539,13 @@ class BaseConfig(object): logger.debug('Running %s' % str(cmd)) subprocess.check_call(cmd) self.release_taplock() - self.release_portlock() if self.nfs_running: logger.info("Shutting down the userspace NFS server...") cmd = ("runqemu-export-rootfs", "stop", self.rootfs) logger.debug('Running %s' % str(cmd)) subprocess.check_call(cmd) + self.release_portlock() if self.saved_stty: subprocess.check_call(("stty", self.saved_stty)) From patchwork Thu Jul 6 15:06:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26992 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8DF9C3DA41 for ; Thu, 6 Jul 2023 15:07:20 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.26474.1688656037561510634 for ; Thu, 06 Jul 2023 08:07:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=e5MUSd7g; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-666e6ecb52dso539170b3a.2 for ; Thu, 06 Jul 2023 08:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656036; x=1691248036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xlfUt5NtSgMJtBjUU4hzIrSwwsYVP6tV4OWzSgnNVV0=; b=e5MUSd7gddh/z/tszEk4wgaCW4xy1ltQ1Zb1bEU2kWawLKndv3YHmsHBmdYirswYP7 VkfSeWEj2/eld4mtTrHFYh+zcHD00uV0wR4JyZodcJcEIlepOzNYjvhv0lGColB+C/DG qdAGvJCAW9bHZGDfljD8zkpRz6J3z4m3aCwWPgWYok+TVd2v2kcQ8DQ1s4u4TKzqTOG2 XJpZg7inFjGUtdUJ6bq1V2CUuN+0Emp5H3oDwJuOuaLpFR9j5KqXdDoZzQEq/tBB4tLo md88eIiPB3vudQ5L7w8MeIrazsBj2SIDc0imbxqVfLHTBhMR2DNRF9XR4IjYbcObT4pd yJJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656036; x=1691248036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xlfUt5NtSgMJtBjUU4hzIrSwwsYVP6tV4OWzSgnNVV0=; b=Yi5W1Vl+69c4WCEucu8STTDJk2O9S3jrmt6hotqDwrBWz3oXajqpKGNt8cHQDYfjuH KE0Np/Gzr2A6DojdMGoINwDebPeGPcvA+H5M6WUL8QjnB/hmVxcWUxZvjN7gKQzzG5le gpWUoBW5tpw85an0a76FvHtAdfagXnOuzpnkFr+R3uUIM+MHbHaQpsjK4Zn9VaNBMQ1b nfrxP0dIWWMi8+4XHgThldqSJW3KHqaJyq0cLCy5r2amDJulNZxRGk12MzLy5zTZpMo9 6RBMnBQ/X/q+5srSALAYxmk1xSgNonCPQFWxsfG3QCrqR7Nr8ux8wqR1V0DsPTSQ881Y 7h9g== X-Gm-Message-State: ABy/qLYG9ZTxuoGSSYmSjug0t8EG3yWKdr7rMXJxRqUqWVXEaWxiLKuR QOfgDpOdqfznMfwF1kx4EkjlflIYxlK5pLW1jSA= X-Google-Smtp-Source: APBJJlGtOLvzSCqjNigzp9gcX3VtU1r47fWNSjpnCs2ZG5fKVqRWg1sAb/sJLjC/ivxNQSEIJZD06g== X-Received: by 2002:a05:6a20:3d90:b0:126:9f02:da6f with SMTP id s16-20020a056a203d9000b001269f02da6fmr1798878pzi.14.1688656036615; Thu, 06 Jul 2023 08:07:16 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/28] oeqa/selftest/bbtests: add non-existent prefile/postfile tests Date: Thu, 6 Jul 2023 05:06:21 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183971 From: Fabien Mahot Fixes [YOCTO #10725] Signed-off-by: Fabien Mahot Reviewed-by: Yoann Congal Signed-off-by: Richard Purdie (cherry picked from commit b0c33655fad5b2e7d96a45b6210527dfb766797b) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/bbtests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index b42bbb651d..d91c8ea82b 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -188,6 +188,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertTrue(find, "No version returned for searched recipe. bitbake output: %s" % result.output) def test_prefile(self): + # Test when the prefile does not exist + result = runCmd('bitbake -r conf/prefile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified prefile didn't exist: %s" % result.output) + # Test when the prefile exists preconf = os.path.join(self.builddir, 'conf/prefile.conf') self.track_for_cleanup(preconf) ftools.write_file(preconf ,"TEST_PREFILE=\"prefile\"") @@ -198,6 +202,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertIn('localconf', result.output) def test_postfile(self): + # Test when the postfile does not exist + result = runCmd('bitbake -R conf/postfile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified postfile didn't exist: %s" % result.output) + # Test when the postfile exists postconf = os.path.join(self.builddir, 'conf/postfile.conf') self.track_for_cleanup(postconf) ftools.write_file(postconf , "TEST_POSTFILE=\"postfile\"") From patchwork Thu Jul 6 15:06:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5BC1EB64D9 for ; Thu, 6 Jul 2023 15:07:20 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.26516.1688656039588455621 for ; Thu, 06 Jul 2023 08:07:19 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Cwk06787; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b89cfb4571so4936805ad.3 for ; Thu, 06 Jul 2023 08:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656038; x=1691248038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Z5aOcFcJNshMj3KfrK5nELgTU3xfxBqk4LATxvrofLY=; b=Cwk06787C5Pa4KcY1Uyz0MC4p+AQs+HHvArlgK5fpN+u8Hp+S91TwtxvdCr0UDny9B PP4B24bKgK91heA55Z+sPJ5iZHzM9rzA9sT9qk5EOSav2KTMG8RPjEg8cMaiZXw0MjjT Yalsp5oc8odLGAJjZ55olB7tQ/KYLsBDQixR5wEPoIfCHjrLIsuUQmWuGWf5+B1BEJwY y6l1KW1xaK+FKP6XrdZQvlffTVwyNB2bRwhpp3ZHZEJzrI3AIBt6TiwlRmw0S5MaSQx7 P3cl5v4XgiWVSXVjZn+KrG7iBx/DiNSHQQn0kXt1kV10wcfgAOampNo8gxZYc3ZqTTSy rhSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656038; x=1691248038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z5aOcFcJNshMj3KfrK5nELgTU3xfxBqk4LATxvrofLY=; b=Ugty7H4rFEevPUuNzEBCmxy4U2Iup8DtK0xgfgHMg4KLYLIPyBBFsdROZrr2dYUq4j MAOOjkZeKEqNr3hL42GQlvh9jS7RyOqYHk5LXLpXuLy3v3gRO7SYDwVZ28tmOywLfiQZ RlwQC5eFhzjC3nr4QDckN+A3T+wDsgcVOA7EW8+DoAr60MhAs7IX/F79jn9j8nlfyHoV E/2A9IDqoDXQddHIPSxc3JghsswD4u3FPvmSSJs4OkCrzs1/teG24laCcA0I+WP/yWQi IOkUugY1plofP5QRTFC0Dg+iOa2Pf1oKHEf2lHpVRRbfUoUwzwIKK2YW8KynX0niPOSn 70Cg== X-Gm-Message-State: ABy/qLacrxqzQMKhcckA//7w309HvuDVIYlrXoyLSzLVtTsNfuMRBOq8 WQ2hRGUxgoDcNjWk/b0wjZ6lYaazewuwzOd+xMA= X-Google-Smtp-Source: APBJJlFFd47rEBq5Kc78UQjuEo2hbgswBqADlls/UiPNR23m7VUjtG7e5QoU9ji5Jpzn5hryLucFzw== X-Received: by 2002:a17:902:7405:b0:1b8:4baa:52ff with SMTP id g5-20020a170902740500b001b84baa52ffmr2011970pll.47.1688656038658; Thu, 06 Jul 2023 08:07:18 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/28] maintainers.inc: unassign Adrian Bunk from wireless-regdb Date: Thu, 6 Jul 2023 05:06:22 -1000 Message-Id: <191ab08c035f1811af932775a767b5e83a95e35b.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183972 From: Alexander Kanavin We were not able to get a response about availability over email, and so the recipe has to be unassigned. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 3beb88060be9484cfe75dfa60f041b0b32214978) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index d7bf806b05..35911fec27 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -816,7 +816,7 @@ RECIPE_MAINTAINER:pn-weston-init = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-wget = "Yi Zhao " RECIPE_MAINTAINER:pn-which = "Anuj Mittal " RECIPE_MAINTAINER:pn-wic-tools = "Anuj Mittal " -RECIPE_MAINTAINER:pn-wireless-regdb = "Adrian Bunk " +RECIPE_MAINTAINER:pn-wireless-regdb = "Unassigned " RECIPE_MAINTAINER:pn-wpa-supplicant = "Changhyeok Bae " RECIPE_MAINTAINER:pn-wpebackend-fdo = "Alexander Kanavin " RECIPE_MAINTAINER:pn-x11perf = "Unassigned " From patchwork Thu Jul 6 15:06:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26998 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C10A9EB64D9 for ; Thu, 6 Jul 2023 15:07:30 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.26477.1688656041589360557 for ; Thu, 06 Jul 2023 08:07:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=f3+Lesi5; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1b89e10d356so4111335ad.3 for ; Thu, 06 Jul 2023 08:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656041; x=1691248041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3IaxelWgxqBipqT2lAhRvA/KLU378jmd2LrQz2qfzwE=; b=f3+Lesi5DLCGBBny7VPZZCErV0qEp3sif0CEP3IhyhqOXdIGYIWnL6xFsSjkVozH/Y KdPseWb/pPyAdUxucPajzQwpqBkmRXD18l/35yXUXKCL/XVATdZ3KwehRn7SIgGsAdzr 8/tcbSL/W5Au6hT8Wo2lNMKF5fv7W1UKrjt5JhxPJKo+ajHeJrNtla35/Z8tj9iXNqhP 5eC5hpztKhuOTlmMUZ1xFRItdkfDQqe6a7F0xBatJon/W2UCYdS71Q/pmcN+ZJyC9SKk fDdugXopm+zFR6S29UtnZ3avslsYN6jt3e5G02q4YRle+ivYiJSn3n0ezSeq2AB8sK3C 6q/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656041; x=1691248041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3IaxelWgxqBipqT2lAhRvA/KLU378jmd2LrQz2qfzwE=; b=X01aI9kYif/K868pc/tC1yvxqB5WXXywerKHkFJgVU88GUtHGimOyQk/S7MqD5xEs3 6vQmOFjCJlk8j9zXd9DbiEAKpz9ivgnPHM/TxoqeiHPp8qsuR3U6g+F+SSYsxxwvza6K kMswVmDMl3GyfkhT+USVf+ljuqAUYp3czc2VYDyzTqTO5F7B/rS7JJUGlWOUkWbVCiTt UfNWrimjhvrkRooXxZw9ClGPT9DuaGiOsD9JtS+HkkheqZPr23D4uRCPJv/CNNwzst5p YQEaTnV6s84RZGt2fOpBRx4bDnUWQokvYTMTqS7CtKQE1rM8vyVDhsXSx+HVOs6MTpy1 MR5w== X-Gm-Message-State: ABy/qLaAMHy1TbzosTAhh9Dn5lnKAj860nr+zK5V5RDDx5KfPQsjnFyO 41YnGK2ojak5ktRmBTmZx/XuBO5JpgiwXttNJ7c= X-Google-Smtp-Source: APBJJlFPCPBrTLKp79WEexmJb+MIAqgojujviw/40Bry1I9eLI/1S4qV7kMKbyHyyR8pO8r9GmCSaQ== X-Received: by 2002:a17:902:758b:b0:1ae:6290:26d with SMTP id j11-20020a170902758b00b001ae6290026dmr1735015pll.7.1688656040616; Thu, 06 Jul 2023 08:07:20 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/28] maintainers.inc: unassign Alistair Francis from opensbi Date: Thu, 6 Jul 2023 05:06:23 -1000 Message-Id: <61e64e7af709dd03dd4018c69a752f2eadc5372e.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183973 From: Alexander Kanavin We were not able to get a response about availability over email, and so the recipe has to be unassigned. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 60eda3dcbf96b5982a0e282fd0c3c13b0b4d7787) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 35911fec27..65db1d039a 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -541,7 +541,7 @@ RECIPE_MAINTAINER:pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER:pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER:pn-numactl = "Richard Purdie " RECIPE_MAINTAINER:pn-ofono = "Ross Burton " -RECIPE_MAINTAINER:pn-opensbi = "Alistair Francis " +RECIPE_MAINTAINER:pn-opensbi = "Unassigned " RECIPE_MAINTAINER:pn-openssh = "Unassigned " RECIPE_MAINTAINER:pn-openssl = "Alexander Kanavin " RECIPE_MAINTAINER:pn-opkg = "Alex Stewart " From patchwork Thu Jul 6 15:06:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26997 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF174C001E0 for ; Thu, 6 Jul 2023 15:07:30 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.26519.1688656043453069043 for ; Thu, 06 Jul 2023 08:07:23 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=iID0Ab+K; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1b8b2886364so5192085ad.0 for ; Thu, 06 Jul 2023 08:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656042; x=1691248042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DQeZHlitNyzVvD+ecqpdQU6oacdHdd9zUFd56FxMct0=; b=iID0Ab+KvSSmtvJ8BJkkTlO5Wv7oFcMltoF7BryokYETOQIKwaPWdNwzb5VFbSUcij /rYSSzwoemxVOLI5zGASLFfHXko4LceFqCG7OVI3spRP/bsgBw/ZbKt01a+iL8IE69hm HGFo21dvvAt+0cs4cHu1QI2DYcmdjXr9kE11Vxl8DZooXfoTDOoKJoAPJwTZB8gs5d/a YiIpVkf4mkJ0FaGBurPhI26ZkOHD/4ozwRktwqDmgTBLnPfJRjhhItJ+9xGb4VPH+Dc6 nXCTKaVzDasBJDg4VaCNBHzK6n5ITW+eWjxkIqnSatrxId0TfTzLL5UyipOTHMuyubSk ua3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656042; x=1691248042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DQeZHlitNyzVvD+ecqpdQU6oacdHdd9zUFd56FxMct0=; b=NUG3926GPjdBeQBmu7N4Urjmtg+GhEezIJKJAYU4XmGhQ5L4sW79EAqmmPhpr8Sr8U 4d4piy4Bl90cAmB5cPfJF1lsKjkuwfw5cqlxusb5/MRebV/v4lhxxonctZ+MJeVJdmSq Zv+EypIYBdyvnu0JKMILOUTlBOJ7Lkwq1ZpW2T2R0uHg2VG2BK3Cfh3LtQ/IKR975IkV tJF1umBdZoE6e/oFCV1anvcuNGd1KaBthSx69lUhsF9HCCnKOXgrxxOncxyzIpYg9dK5 8eySm6BVk2NdI+G9xy+6EFULwe58UvdBkrtwOFTcyLF3KQa9cRUzHIU/++2y8yylgfTV o28Q== X-Gm-Message-State: ABy/qLZT8n/rzmlGYfpaTuSFQHrVwGgGHKP/MPj2g9RPmy+NmpDcZMU1 ScCWTtknU245v0q2zOP4b7NrwjxLXTvyu7OWA4E= X-Google-Smtp-Source: APBJJlFbHFaY70e5WSgEIqONaF9pJzkSekSOXakBP2jI3y+UvdktzIrLAn9vX4m5fiq5KEN1cnRg4g== X-Received: by 2002:a17:902:d504:b0:1b8:9b74:636b with SMTP id b4-20020a170902d50400b001b89b74636bmr1467634plg.68.1688656042526; Thu, 06 Jul 2023 08:07:22 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/28] maintainers.inc: unassign Ricardo Neri from ovmf Date: Thu, 6 Jul 2023 05:06:24 -1000 Message-Id: <8d2e96c3a611aba63aa9a51f6b350ea8c9654e06.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183974 From: Alexander Kanavin We were not able to get a response about availability over email, and so the recipe has to be unassigned. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 56f1af6d5b3019dccbc27bb0a9692a5f1a32f87b) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 65db1d039a..1d5e070223 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -550,8 +550,8 @@ RECIPE_MAINTAINER:pn-opkg-keyrings = "Alex Stewart " RECIPE_MAINTAINER:pn-opkg-utils = "Alex Stewart " RECIPE_MAINTAINER:pn-orc = "Anuj Mittal " RECIPE_MAINTAINER:pn-os-release = "Ross Burton " -RECIPE_MAINTAINER:pn-ovmf = "Ricardo Neri " -RECIPE_MAINTAINER:pn-ovmf-shell-image = "Ricardo Neri " +RECIPE_MAINTAINER:pn-ovmf = "Unassigned " +RECIPE_MAINTAINER:pn-ovmf-shell-image = "Unassigned " RECIPE_MAINTAINER:pn-p11-kit = "Alexander Kanavin " RECIPE_MAINTAINER:pn-package-index = "Ross Burton " RECIPE_MAINTAINER:pn-pango = "Ross Burton " From patchwork Thu Jul 6 15:06:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CED42C001B0 for ; Thu, 6 Jul 2023 15:07:30 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.26520.1688656045335446475 for ; Thu, 06 Jul 2023 08:07:25 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=LoGBzPpP; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b89bc52cd1so3279985ad.1 for ; Thu, 06 Jul 2023 08:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656044; x=1691248044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=//86Hk2D8+l1YsM9s3WTgc6+my96cBgLgF0m7AwxLcE=; b=LoGBzPpPMP46e5G7T+YinR7QTpHTtr+mwTheTgGVG4fK5IkPM06wd7bnONJnJemNbX KJYWl9GEaBPZetVU4CvX+pQ8yH+5DzKZY/7XQzDkJa66XUSOt47O0RqVugsrdCV+lyoQ 7fvg5lWODwigYwPDuyoZWQbi64gZuPaILz110Oi1Pv1JU8RXNreRavVFK6uJjdV05s1W Lo41HhnT86EK68RtiRbhw35w5VDT/2o2Z01hND/0mlmrJkr9OQpsMGVZkvW0FTx3OnU2 13u4fSpfUPhw83z7Cb/EHacIgsCbvCY1SXqptPOr5rWPSTj5bd8F7wtpRBbR0ZL3uFcP 1+Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656044; x=1691248044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=//86Hk2D8+l1YsM9s3WTgc6+my96cBgLgF0m7AwxLcE=; b=Oo+PbWEsaoKpfgGBo1mw/Oj9H8xVZkpKp0/hN4zeQhtBXq2arF69Fg6aFP1kVzVUFI b2qUzcHFVGqFbZZZsyM25sz0XgKbX/hL/pYxbkBAOd4k5U1+Ywv63jsJlu3rlfV4XV67 FT9j2ntaDSRVxdc+F16nWAeg6zUAZBAaiUEmWDM2/80ylCR0DaJ6G1PteHUC/emgb7qb jUPd27SrBn/8w3CG6FMR+8rXOAh20SJUQQMXBGfwrHSArHTc7RKgFiTkES9R6CQFhZEj NN8SVUNk81rv2uRK01FisgzmlmQbxhMhjCf1fnzUtma/rZNZC2G0Sp3u7cO3nQtWOPOi dHIA== X-Gm-Message-State: ABy/qLbmIP5QksWxe/3Qe9m65R9bju/4qFoPI87wMka7hPgw7DllpeYn zrYOVv+FcIN66EG76gAr7jk7U7jIGx0mGf3qwJk= X-Google-Smtp-Source: APBJJlFGIA+rt+dXdFQA7u+GfOuVK8krbJ4PBWB5+FpN6ZPoDPSk9PsP2o/yEvIKuRxUMAMN6YWyFw== X-Received: by 2002:a17:903:2448:b0:1b8:9b1d:d7fa with SMTP id l8-20020a170903244800b001b89b1dd7famr1726098pls.59.1688656044388; Thu, 06 Jul 2023 08:07:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/28] babeltrace2: Always use BFD linker when building tests with ld-is-lld distro feature Date: Thu, 6 Jul 2023 05:06:25 -1000 Message-Id: <1c02416041498c649c517a9933ab736fca2ceae8.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183975 From: Khem Raj lld results in textrels in some .so used in tests, fixes babeltrace2-ptest: ELF binary /usr/lib/babeltrace2/ptest/tests/lib/test-plugin-plugins/plugin-minimal.so has relocations in .text babeltrace2-ptest: ELF binary /usr/lib/babeltrace2/ptest/tests/lib/test-plugin-plugins/plugin-sfs.so has relocations in .text [textrel] ERROR: babeltrace2-2.0.5-r0 do_package_qa: QA Issue: babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-ctf.so has relocations in .text babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-utils.so has relocations in .text babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so has relocations in .text [textrel] Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni (cherry picked from commit 18d443b53a0d76102fbbc1088fbcb3f8087a2b1b) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb index 146fe0b835..7ece3140f7 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb @@ -28,6 +28,7 @@ FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" ASNEEDED = "" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd ', '', d)}" RDEPENDS:${PN}-ptest += "bash gawk python3" From patchwork Thu Jul 6 15:06:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26996 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C581EEB64DC for ; Thu, 6 Jul 2023 15:07:30 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.26482.1688656047303019279 for ; Thu, 06 Jul 2023 08:07:27 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=rUQTCt/a; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1b89cfb4571so4937905ad.3 for ; Thu, 06 Jul 2023 08:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656046; x=1691248046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fEKxPU/w3F/Wibz22B9RmWDTWFnJQWyN8IO76f/Jns0=; b=rUQTCt/aG5KPaAZkKW5m5FnwxqPzAsUACEXohUhbtJDrRYmqp5jQH0i5HLyMYOH9cL PDvFaALny3qlStHwPIYqikfM7nHRtt10f+EawfMNN/5qTZGJ3UZX41cD9/YqhlQ/xWzM lNhEsOyLmTtecF32M/UnDmCZnQsMIOhGoHduUtZdDlkh6dixM10gBDLa85m0FlvodevU 16Z5/fY19+ngjpC6VxHmvYBtOXtOLoQs2WxL/cDe8Qn4q8iNS+UZHy3l504eLgYRPHBq +ukrD2Be4VlW7VHX5QHwUV8a/FMoub1cf030IjcDNzZxMyNTmptRWS9EjBcuotLiEDBy OTIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656046; x=1691248046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fEKxPU/w3F/Wibz22B9RmWDTWFnJQWyN8IO76f/Jns0=; b=P2fTk1chIXv5Dd5NRH0V/b18SiRN2eCQue0qKCAcfYWLE+D8Ge5ADlYzhjMA4ti01P ASV8NAq6yeOlzY9g9XB0gaOfiGG4yMh4Qw/g2D69dl/Mi/TUZeuIquLjRsParuOd38/3 BCUWO1UC/0HXNWUDvCdBSngCKAKlI1co+0scFLg7XzCzgYq57s4R4rJ/aqOPdQgv49fD oNauFwZsctGkHSEAqBMZbr/EF7m3RAfsX+XkndeUTw56R/yNX9iwKZWJCCfWIjwCURzP fECnCuQZ5wMK8ZNYhnAtc1aGQoHeAjPdNKxUrqUTlx+b9H3+4OkD7BMgVmkYmUtowVIM QuBg== X-Gm-Message-State: ABy/qLaT4K4lgZieWKkfII3eDeI7heTRqKfTxTqTv7LZk5i7RyGNl3T0 8NEW1epEJbvTnGIa+Xom16jvxErmcrN/NsMKmbY= X-Google-Smtp-Source: APBJJlHrLVu3lW3HI/IoDnrMUCNiZ1dVkyt9vSFZzu7N5+r6uYMDV7Kw8Ocy2kHtGeX9VdeeVcDAOg== X-Received: by 2002:a17:902:ec87:b0:1ac:8717:d436 with SMTP id x7-20020a170902ec8700b001ac8717d436mr2448948plg.60.1688656046338; Thu, 06 Jul 2023 08:07:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/28] useradd-staticids.bbclass: improve error message Date: Thu, 6 Jul 2023 05:06:26 -1000 Message-Id: <572c507736b2fcc31f7f13cb3da0d5be361838f5.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183976 From: Mikko Rapeli Current error message is difficult to read: ERROR: Nothing PROVIDES 'image' trs-image was skipped: image - image: normal username test does not have a static ID defined. Add test to one of these files It's not clear that first "image" is recipe name, second "image" is binary package name and that "test" is the user account which does not have a static ID defined. Improve the error message so that these are more explicit. Now the error message looks like: image was skipped: Recipe image, package image: normal username "test" does not have a static ID defined. Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni (cherry picked from commit 07898218f3908a83e07178b6530dfa48d55d4ec2) Signed-off-by: Steve Sakoman --- meta/classes/useradd-staticids.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 3acf59cd46..e5527f0529 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -41,7 +41,7 @@ def update_useradd_static_config(d): def handle_missing_id(id, type, pkg, files, var, value): # For backwards compatibility we accept "1" in addition to "error" error_dynamic = d.getVar('USERADD_ERROR_DYNAMIC') - msg = "%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN'), pkg, type, id) + msg = 'Recipe %s, package %s: %sname "%s" does not have a static ID defined.' % (d.getVar('PN'), pkg, type, id) if files: msg += " Add %s to one of these files: %s" % (id, files) else: From patchwork Thu Jul 6 15:06:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5716C001DD for ; Thu, 6 Jul 2023 15:07:30 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.26522.1688656049645525971 for ; Thu, 06 Jul 2023 08:07:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=5Mfk+RLR; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1b8baa836a5so5081075ad.1 for ; Thu, 06 Jul 2023 08:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656049; x=1691248049; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=e6zYdKm6UugVS2wQHdCacweCmZrFqTxGF/Ki0lM40LI=; b=5Mfk+RLRXr6WHz+segHXHlmecUWk7MQN31tYsnl7iTnGq5sde3kYMr8qAJfjWPhJC0 DWig0YUzfvt0P6RngB9lOhJPiHHhPh5SBZFhMqMTLS4Lu6mDW59+jhJBF3oTW/SLg+IY 9eQEmmWBzj3I4qrY/O+RlPWa3kDGbSlg2vy58djh4ZtCYeqnkfisfVysMl8ltIYYrsdg JBdPmyVP+6wE7aIm1CtpKV8hJ38kmpY1ybsjT3qCaARvzntBvuG4mKxhUClR5YQs2pop e/RTHQ2nB6X180KYVL9h2Dq3fLpMGWoc9FKRLtZgpxzOqIWjvcAnxFw3ovZ1Bk5q/9e8 08Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656049; x=1691248049; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e6zYdKm6UugVS2wQHdCacweCmZrFqTxGF/Ki0lM40LI=; b=De3vNGRKLMAfIcCOPW70a9K/NrHmXiu+euzWQ0xJrMQjZp5y6Oi7FKID9VFOORGtI+ 9cALiHG4hQfT8iL3gxoQQrEixfT8dm7pm9+5xFXgQ3zF8B37glmtGHXMqh/CsbtGLmVy MJ1jv19uZpYLxDKIgOZnEHm96IpN/MkEMYK4kluIiuR0f11nzGY1bGokHCVvV9FjlrMY hFUcth6B5HqzSHdMu5T8pc0P8B+Ubsg6D1Cuclimow1vJHFee57w3sCWVKh/6Xlaissg zPOAYuR7tR1uW77kpgsYGAro33kIKq2lkYWC6En/KvaLTr3MpFK+H/4wqm+gpOor93nT LnrQ== X-Gm-Message-State: ABy/qLbkkNqvEy171TOaZTxY/73aorzSRXABtDEHaRojSeHdt7E2APvM 0jm+LvzlyXczdvVFl9IVdqIOGFenBqiwgor9nGc= X-Google-Smtp-Source: APBJJlGQEDnRMeOLdqtnReYE1xNCExL9QD1pQovAHDDyyp9/skoII71ZctOBEILYugd41kvgvrAelg== X-Received: by 2002:a17:903:32ce:b0:1b8:7265:9289 with SMTP id i14-20020a17090332ce00b001b872659289mr2556793plr.13.1688656048675; Thu, 06 Jul 2023 08:07:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/28] devtool: Fix the wrong variable in srcuri_entry Date: Thu, 6 Jul 2023 05:06:27 -1000 Message-Id: <1487bdda6b443480e9ce45d8b8527ad61c2a50a4.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183977 From: Charlie Wu devtool crashes when running "update-recipe" and append changes on the recipe. "$ devtool update-recipe -a " Traceback (most recent call last): ... File "/ovss/ovss_quanta/poky/scripts/lib/devtool/standard.py", line 1636, in srcuri_entry return 'file://%s%s' % (basepath, paramstr) ^^^^^^^^ NameError: cannot access free variable 'basepath' where it is not associated with a value in enclosing scope The input variable 'fname' should have the same meaning as the variable 'basepath'. Modify the 'fname' to 'basepath' and solve the issue. Signed-off-by: Charlie Wu Signed-off-by: Alexandre Belloni (cherry picked from commit c3231756bbc2cb5641204414ad3670d7f8607ed3) Signed-off-by: Steve Sakoman --- scripts/lib/devtool/standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index e2a8335a62..7a005c9010 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1628,7 +1628,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil else: patchdir_params = {'patchdir': relpatchdir} - def srcuri_entry(fname): + def srcuri_entry(basepath): if patchdir_params: paramstr = ';' + ';'.join('%s=%s' % (k,v) for k,v in patchdir_params.items()) else: From patchwork Thu Jul 6 15:06:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C15FCEB64DD for ; Thu, 6 Jul 2023 15:07:40 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.26524.1688656051921388130 for ; Thu, 06 Jul 2023 08:07:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=MWI6M8mx; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b89b75dc1cso14012495ad.1 for ; Thu, 06 Jul 2023 08:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656051; x=1691248051; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YoHSecHF+BDh1Xdged6KLLWE1LomT7bEW0Q6GyslzfU=; b=MWI6M8mxPe42FemihScUPYu1qzesb/csyILbDRY+XlO/WA79xNegaaUV9szspq9Uj/ tsCqeWM7xiQX6+W9DlffrG0X+T8I5JMp7mo4jEHBI9k/i4HPJYFZyatXiEZ6yv3FoHjK HFSf/6gerMTad+iDA+xPP0qAlHaYHpriOG7IfUbGcM/M2LohFHNpvFGYRYcXVXn6TQfj a5kgrTvpWytOPER9KZviK70UVFbV9pfO3546/g8bikwXHHD/ov42IdD2bxfWoNZKPVNf yO7WRtZB0tSJWE0BGOh5hYwWiNrTM+v+sQBQisRAHsJxRCOz+Fh1+oHPp4PKb3WlmyX4 tIug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656051; x=1691248051; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YoHSecHF+BDh1Xdged6KLLWE1LomT7bEW0Q6GyslzfU=; b=M+vB4t56EO7ajtUYV4MleKSt2RQ2kA6O6jyMwbbJ2TGIIRTfdRikoZ5LFVLEUMCt1W F7KdFmTqJxVSyRO7nYlHdXcE/6Q6aiCuhRAKTF5zdLuwA+3VIlSMZCt98ur5ay9bw8HG uM20sqf9jP9EWVkd7X3RU64K0/unVfeXnxotk61U99eo71mZx3UNZAE0Mx3zULZQhXel DeLqORJUvln2bIWm6tGzNKivcP91GCSnCedrswJnGQzCQOHnWZm95UBANduREhcuOwoe dVMliaifvxzJqSyMiWglv0OGzDW0ca9agNDvy4b6g01abJ+GYQastFeWYyLPGgPKgzfD k22A== X-Gm-Message-State: ABy/qLaSuCbl8GB36ljcr6iaVdIPgNXqGLqK1PV+iIeltI77Tu5qGD54 /nlsk2dY2mL+8Tjo6cjvYGE3WBAeT7w+wbgwOEM= X-Google-Smtp-Source: APBJJlGwkIY7xJDSt+9/pgmirWhLPKxnZh7weT0Q/huxSntaJj9w1eHXRa0IxV0YQMammG3f/Vodkg== X-Received: by 2002:a17:902:f682:b0:1b8:c8bc:c81b with SMTP id l2-20020a170902f68200b001b8c8bcc81bmr1110347plg.21.1688656050902; Thu, 06 Jul 2023 08:07:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/28] grub: submit determinism.patch upstream Date: Thu, 6 Jul 2023 05:06:28 -1000 Message-Id: <846d8097fed9498fab7120ed61a962ff2c15746a.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183978 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 61947762e410c685f667e0af6440fb8a33cd6777) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/grub/files/determinism.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/grub/files/determinism.patch b/meta/recipes-bsp/grub/files/determinism.patch index 2828e80975..852b95a856 100644 --- a/meta/recipes-bsp/grub/files/determinism.patch +++ b/meta/recipes-bsp/grub/files/determinism.patch @@ -14,7 +14,7 @@ missing sorting of the list used to generate it. Add such a sort. Also ensure the generated unidata.c file is deterministic by sorting the keys of the dict. -Upstream-Status: Pending +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-06/index.html] Richard Purdie Signed-off-by: Naveen Saini --- From patchwork Thu Jul 6 15:06:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD727C3DA40 for ; Thu, 6 Jul 2023 15:07:40 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.26528.1688656053777169644 for ; Thu, 06 Jul 2023 08:07:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=TdrgAuJI; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b8a8154f9cso5713475ad.1 for ; Thu, 06 Jul 2023 08:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656053; x=1691248053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=B/ALYc5pOgEiQshDxDzW6psJGUuyNa6OMeX7nRHr5bA=; b=TdrgAuJIbB2alBcu4IE8GOcX9WkhKYoiZMRDHNVwOZI+GOHu3rTmMpAzinxLCnwIUI Pc9zn8v0cp3YeLv8cxXXrbcyPn+oJYyGSb0iXYTx0aBjL2NnfbjIatkVAHU+1joTHKZA WV8mBx0DHYliN9lZZWDQ1RkY6Qj22K6MUG6mgTNXJ4ucogHJyMEsSCT7WETvTwoaZV+x c1Rn37qWSc877EneaGBUQbicW4KIsXRTAxT9a3g++KLTYeeL73oMarEoGWbxmb7r1D+/ 1+eGawzyGkUfhAtnoOJXF+K2vETdH3kS9U2ivZeR2QjJDTRtU7ouLI8bmQhmtPIPOhUr vTPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656053; x=1691248053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B/ALYc5pOgEiQshDxDzW6psJGUuyNa6OMeX7nRHr5bA=; b=ACgDvrPzFwnHCtj+zJCBraAopXcqh7nM2m1VpwHCBR5HYTpwJRGsqzVkqGXqNzVgyc M/QxetgnqhiJfv9HX0XhWqqc1wcmBkAry8nYvcTbn015iAOqviKYWzPScB7gZf65TnZ/ yA5dOmdK9ly7y8ESeUH5dQNH06+6UTT5QlMG2J4+T+SI14BrfpTTqleRaXFJAswUIPkd PhNdRyXc1KgVGN06F/izqAr+jki58nTpi1XUJ/GCZMUbiLgyRBgDu9SvOoo7Uy7x6UoP /dxKJPTDNrXbeLYSQmb/pSkmdurEk41WsSUP2PSrUb7Fqak+JyDTP+JP2myOh9MkOov4 iWhw== X-Gm-Message-State: ABy/qLZl4sTUSG+z5vZcKc+PZv9HmoJ0ysLjca/8Hd0b1R4erePXoRwM V7PITPzVZeEHs2Xd3C/OxGMU9OTzZumsDW+H1PY= X-Google-Smtp-Source: APBJJlF5MANE8iAWk9vnU0rJamNgRIe9hZ5qLD4f9YrbtweyHiFEUWo0suAsUrx970eTDVi4aT+H8A== X-Received: by 2002:a17:902:d481:b0:1b8:2adc:8358 with SMTP id c1-20020a170902d48100b001b82adc8358mr3279519plg.11.1688656052805; Thu, 06 Jul 2023 08:07:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/28] strace: Disable failing test Date: Thu, 6 Jul 2023 05:06:29 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183979 From: Richard Purdie This test is failing for uncertain reasons. We have reported upstream, disable it until we can work out why this happened. The point it started failing is unclear due to other test framework issues. Signed-off-by: Richard Purdie (cherry picked from commit 2e9165a854c7b83f163479e9dbd3cb183a9d71f5) Signed-off-by: Steve Sakoman --- .../strace/strace/skip-sockopt-test.patch | 37 +++++++++++++++++++ meta/recipes-devtools/strace/strace_5.16.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/skip-sockopt-test.patch diff --git a/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch b/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch new file mode 100644 index 0000000000..5741bf8672 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch @@ -0,0 +1,37 @@ +Upstream-Status: Inappropriate [avoid this test until fixed by upstream] + +Reported at https://github.com/strace/strace/issues/257 + +root@qemux86-64:/usr/lib/strace/ptest/tests# make sockopt-sol_netlink.gen.log +FAIL: sockopt-sol_netlink.gen.test + +#root@qemux86-64:/usr/lib/strace/ptest/tests# diff sockopt-sol_netlink.dir/exp sockopt-sol_netlink.dir/out +#--- sockopt-sol_netlink.dir/exp +#+++ sockopt-sol_netlink.dir/out +#@@ -86,11 +86,11 @@ + setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, -1) = -1 EINVAL (Invalid argument) + setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, 3) = 0 + setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a803000, 4) = -1 EFAULT (Bad address) +-getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [8]) = 0 ++getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [4 => 8]) = 0 + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [5 => 8]) = 0 + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, NULL, [0 => 8]) = 0 + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [], [3 => 8]) = 0 +-getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [8]) = -1 EFAULT (Bad address) ++getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [4]) = -1 EFAULT (Bad address) + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a802ffc, 0x7fa18a7fd000) = -1 EFAULT (Bad address) + setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 4) = -1 ENOPROTOOPT (Protocol not available) + setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 5) = -1 ENOPROTOOPT (Protocol not available) + + + +Index: strace-6.3/tests/sockopt-sol_netlink.gen.test +=================================================================== +--- strace-6.3.orig/tests/sockopt-sol_netlink.gen.test ++++ strace-6.3/tests/sockopt-sol_netlink.gen.test +@@ -1,4 +1,5 @@ + #!/bin/sh -efu + # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (sockopt-sol_netlink -e trace=getsockopt,setsockopt); do not edit. + . "${srcdir=.}/init.sh" ++skip_ "Test failing after system upgrades, wait for upstream fixes" + run_strace_match_diff -e trace=getsockopt,setsockopt diff --git a/meta/recipes-devtools/strace/strace_5.16.bb b/meta/recipes-devtools/strace/strace_5.16.bb index 23ffa25d29..60d452fd17 100644 --- a/meta/recipes-devtools/strace/strace_5.16.bb +++ b/meta/recipes-devtools/strace/strace_5.16.bb @@ -14,6 +14,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-strace-fix-reproducibilty-issues.patch \ file://skip-load.patch \ file://0001-landlock-update-expected-string.patch \ + file://skip-sockopt-test.patch \ " SRC_URI[sha256sum] = "dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285" From patchwork Thu Jul 6 15:06:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27002 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8556EB64DC for ; Thu, 6 Jul 2023 15:07:40 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.26486.1688656055752649789 for ; Thu, 06 Jul 2023 08:07:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=cOab4dte; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1b8033987baso14126685ad.0 for ; Thu, 06 Jul 2023 08:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656055; x=1691248055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ha4W09TZuvouG2rC0SgoWUqzqMggcDIlvLRJe7+4OrI=; b=cOab4dteELRdvGtBKZVmyd8RhtKkWU+DQzUBrLV4G6O+H5HbraeGC6oTNvG5k7gYXx aa3CGOS1j1IfEKSJ6Vsgx0N2DugXLIO2m8vqKpLUYrG2GRpVrWOdJGCiSLMBgahgb+tY GG457mXmfObHjl0vMK7TB+eLeyFee5Y3lHEWTfHrZWUPRlNiaafKs5zY67MdO+sytTq2 8XVxB8PLQw8anOWHZMCULGpret5+dGWP1nWogBfEyvcuwUs6tAphfQEh9SUAasCHpNrs wLKeq8alLxN6xQlVsx9oEbM+uXC0foGCl+yPrPASHu23jt/CmhUeCSFC8ak0tEGLN7UW eCXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656055; x=1691248055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ha4W09TZuvouG2rC0SgoWUqzqMggcDIlvLRJe7+4OrI=; b=iSSaviQ8g95ZOOJNLVRHQwmG7npNHJoqysJvUoPf/JXZGZcIvMFl7EnkHlASSvjI8p cO7BoLeUM5dby9nhQgKDkyqh1p1mgezDYfXIw0P/82Tw6qMjFieeDXzMhJkpZIoLdkJ0 jvGpeThmUQ9oSQIgl9xD8et+Q9xz4+kKpWqgUeIzbsGZ53G68U3+mEd4hG/mv2gIHwFN biKSkmMlA6MppR33mwrkF0RpJ3q1BvFxJFMOB01BOTzPOCWYmZxx3LzbFuXdTbKxoVAC llFxZketT4hBN0+pMaW+hAWX1FKjtVRSHUL16C1At72d2LG6GkKFYjzlXaFkMoFqXura EKGA== X-Gm-Message-State: ABy/qLZmP9aMnc2AK3zcCKFbU4+IEntCnhcpanO6eeF6Eywa91S1NJJF 8dgi3iuL6wTtHSyRGKYg3sneY8eJckgfb0L97WY= X-Google-Smtp-Source: APBJJlF0yhJhZSDlw/rQFV8aKsJyTEvby+viarERNmCI3zkomlLeeQR2uESN4xHz0YU9kmB8x8+j7A== X-Received: by 2002:a17:903:11c9:b0:1a1:d54b:71df with SMTP id q9-20020a17090311c900b001a1d54b71dfmr3724343plh.0.1688656054715; Thu, 06 Jul 2023 08:07:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/28] strace: Merge two similar patches Date: Thu, 6 Jul 2023 05:06:30 -1000 Message-Id: <81af8c6fdc6f0b6617b7258c9b3e2e26a76db5c8.1688655871.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183980 From: Richard Purdie Both patches change the same paths to gawk, merge them together as we only need one patch for this. Signed-off-by: Richard Purdie (cherry picked from commit 79c0b18e29cad337640860f57683f0a170f6daab) Signed-off-by: Steve Sakoman (cherry picked from commit 6080138fd0c27db7029b5a76e69b8dc241ad8dc3) Signed-off-by: Steve Sakoman --- ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 47 ------------------- .../strace/strace/update-gawk-paths.patch | 30 ++++++++++++ meta/recipes-devtools/strace/strace_5.16.bb | 1 - 3 files changed, 30 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch deleted file mode 100644 index 235e803641..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Thu, 9 Feb 2017 01:27:49 -0800 -Subject: [PATCH] caps-abbrev.awk: fix gawk's path - -It should be /usr/bin/gawk as other scripts use in this package. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang - ---- - tests-m32/caps-abbrev.awk | 2 +- - tests-mx32/caps-abbrev.awk | 2 +- - tests/caps-abbrev.awk | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-m32/caps-abbrev.awk -+++ b/tests-m32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-mx32/caps-abbrev.awk -+++ b/tests-mx32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests/caps-abbrev.awk -+++ b/tests/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 0c683496ae..a16ede95c2 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -125,3 +125,33 @@ index dce78f5..573d9ea 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # Copyright (c) 2016 Elvira Khabirova +diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests-m32/caps-abbrev.awk ++++ b/tests-m32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # +diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests-mx32/caps-abbrev.awk ++++ b/tests-mx32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # +diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests/caps-abbrev.awk ++++ b/tests/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # diff --git a/meta/recipes-devtools/strace/strace_5.16.bb b/meta/recipes-devtools/strace/strace_5.16.bb index 60d452fd17..d97a1260d1 100644 --- a/meta/recipes-devtools/strace/strace_5.16.bb +++ b/meta/recipes-devtools/strace/strace_5.16.bb @@ -9,7 +9,6 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ - file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ file://skip-load.patch \ From patchwork Thu Jul 6 15:06:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27004 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD29BC001DD for ; Thu, 6 Jul 2023 15:07:40 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.26487.1688656057926936619 for ; Thu, 06 Jul 2023 08:07:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=jfvfvLIL; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1b8b4749013so5049215ad.2 for ; Thu, 06 Jul 2023 08:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688656057; x=1691248057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DEY17e0N9pdYyUoO7uv7ZSNvo0br11nF6vfzqY+G22c=; b=jfvfvLILfAqdHUspQH34cuV9C75XNRG/RH82rUn5WlZMGp2dw/zaGJBXdLAL9hBLBM HsCL9P/0RPXwZIOxfKHjSfhyuhww6DUn4Iy5p++ei8v5Ngy5uB09xKGlkrLNAMd0DZy4 wAtRMl1t2tGwlquOL5ewPREEl1WhK5NHCSInZU3gIiX+1Ej9uLGpRWS2EpbUekDBo36B OdfDaKMCHh6RzqpfMJMltNG0sMm7Ew9EUWs1DiSCpo1kj3tUbZ6VtQO2yYcujO2h+qc9 Mm9KRxeuVsQTwbaUyzEpFzTnzpofDeYmvxgPDxFtf7eA0cCxc5Ns4dfTmxnfniUp5HtE ciPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688656057; x=1691248057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DEY17e0N9pdYyUoO7uv7ZSNvo0br11nF6vfzqY+G22c=; b=IRkEQdcf5yEIjK3gODUkrqzy18S1KwXEuPd3uaJfOypHG45Nj6BTVwJt9Kqza/Rkgh 5Isyakp2QCgSgIjJaegEBLlaTCbhW6EgTgCtptTTSuaeNVkDo4lvPCF+i3KNsGmEFxYd vFcYDBy0lyjZCfV1oVfABuUPhgikVYocRPVYCpntsVjbIJU8h1dLUdUmsvfy6nAblDR2 IYdAkmcDzUwjNxLe83c+tKyARbQYyDtGZ1t9ORCq5iUCfcExdyBzCQgrHN8b4QkRoOfN LZFxTk4eeMFNIy0HP32LSPnLaiyZOIRtfPltOwRk8OIUSheQ6V9Bi2RRu8PX0lElA4uN nD1Q== X-Gm-Message-State: ABy/qLY5bdybHjgk8PMndStJ3o+rGVKadq30QFDzZm2GkeoiKIQ2pzhf +fuOvh2qtIJmdmyj9Wo/vo6uEVWh8zuvZMUZj9w= X-Google-Smtp-Source: APBJJlGviKDvO/OEX0Z9imtsPRNqrxGnvUvWsAdv/6oUNx1dgifnu8B7La4udk6ysRuMEg7sjejKuA== X-Received: by 2002:a17:902:758c:b0:1b8:10a:d925 with SMTP id j12-20020a170902758c00b001b8010ad925mr2134338pll.5.1688656056827; Thu, 06 Jul 2023 08:07:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id jj7-20020a170903048700b001b3df3ae3f8sm1534159plb.281.2023.07.06.08.07.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 08:07:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 28/28] strace: Update patches/tests with upstream fixes Date: Thu, 6 Jul 2023 05:06:31 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Jul 2023 15:07:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183981 From: Richard Purdie Replace the sockopt disable patch with a fix from upstream Signed-off-by: Richard Purdie (cherry picked from commit ac921989991c319ecad01bec37c4ccaa15a7b58f) Signed-off-by: Steve Sakoman (cherry picked from commit c1beb73526e3ade75bd6dae5f9310107c50f1226) Signed-off-by: Steve Sakoman --- ...b541b258baec9eba674b5d8dc30007a61542.patch | 50 +++++++++++++++++++ ...2f4494779e5c5f170ad10539bfc2dfafe967.patch | 50 +++++++++++++++++++ .../strace/strace/skip-sockopt-test.patch | 37 -------------- meta/recipes-devtools/strace/strace_5.16.bb | 3 +- 4 files changed, 102 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch create mode 100644 meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch delete mode 100644 meta/recipes-devtools/strace/strace/skip-sockopt-test.patch diff --git a/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch b/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch new file mode 100644 index 0000000000..b4c6ff99de --- /dev/null +++ b/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch @@ -0,0 +1,50 @@ +From 3bbfb541b258baec9eba674b5d8dc30007a61542 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Wed, 21 Jun 2023 08:00:00 +0000 +Subject: [PATCH] net: enhance getsockopt decoding + +When getsockopt syscall fails the kernel sometimes updates the optlen +argument, for example, NETLINK_LIST_MEMBERSHIPS updates it even if +optval is not writable. + +* src/net.c (SYS_FUNC(getsockopt)): Try to fetch and print optlen +argument on exiting syscall regardless of getsockopt exit status. + +Upstream-Status: Backport +--- + src/net.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/net.c b/src/net.c +index f68ccb947..7244b5e57 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -1038,7 +1038,7 @@ SYS_FUNC(getsockopt) + } else { + ulen = get_tcb_priv_ulong(tcp); + +- if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &rlen) < 0) { ++ if (umove(tcp, tcp->u_arg[4], &rlen) < 0) { + /* optval */ + printaddr(tcp->u_arg[3]); + tprint_arg_next(); +@@ -1047,6 +1047,19 @@ SYS_FUNC(getsockopt) + tprint_indirect_begin(); + PRINT_VAL_D(ulen); + tprint_indirect_end(); ++ } else if (syserror(tcp)) { ++ /* optval */ ++ printaddr(tcp->u_arg[3]); ++ tprint_arg_next(); ++ ++ /* optlen */ ++ tprint_indirect_begin(); ++ if (ulen != rlen) { ++ PRINT_VAL_D(ulen); ++ tprint_value_changed(); ++ } ++ PRINT_VAL_D(rlen); ++ tprint_indirect_end(); + } else { + /* optval */ + print_getsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2], diff --git a/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch b/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch new file mode 100644 index 0000000000..a0843836c2 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch @@ -0,0 +1,50 @@ +From f31c2f4494779e5c5f170ad10539bfc2dfafe967 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Sat, 24 Jun 2023 08:00:00 +0000 +Subject: [PATCH] tests: update sockopt-sol_netlink test + +Update sockopt-sol_netlink test that started to fail, likely +due to recent linux kernel commit f4e4534850a9 ("net/netlink: fix +NETLINK_LIST_MEMBERSHIPS length report"). + +* tests/sockopt-sol_netlink.c (main): Always print changing optlen value +on exiting syscall. + +Reported-by: Alexander Gordeev +--- + tests/sockopt-sol_netlink.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +Upstream-Status: Backport + +diff --git a/tests/sockopt-sol_netlink.c b/tests/sockopt-sol_netlink.c +index 82b98adc23..1c33219ac5 100644 +--- a/tests/sockopt-sol_netlink.c ++++ b/tests/sockopt-sol_netlink.c +@@ -94,7 +94,10 @@ main(void) + printf("%p", val); + else + printf("[%d]", *val); +- printf(", [%d]) = %s\n", *len, errstr); ++ printf(", [%d", (int) sizeof(*val)); ++ if ((int) sizeof(*val) != *len) ++ printf(" => %d", *len); ++ printf("]) = %s\n", errstr); + + /* optlen larger than necessary - shortened */ + *len = sizeof(*val) + 1; +@@ -150,8 +153,12 @@ main(void) + /* optval EFAULT - print address */ + *len = sizeof(*val); + get_sockopt(fd, names[i].val, efault, len); +- printf("getsockopt(%d, SOL_NETLINK, %s, %p, [%d]) = %s\n", +- fd, names[i].str, efault, *len, errstr); ++ printf("getsockopt(%d, SOL_NETLINK, %s, %p", ++ fd, names[i].str, efault); ++ printf(", [%d", (int) sizeof(*val)); ++ if ((int) sizeof(*val) != *len) ++ printf(" => %d", *len); ++ printf("]) = %s\n", errstr); + + /* optlen EFAULT - print address */ + get_sockopt(fd, names[i].val, val, len + 1); diff --git a/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch b/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch deleted file mode 100644 index 5741bf8672..0000000000 --- a/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Inappropriate [avoid this test until fixed by upstream] - -Reported at https://github.com/strace/strace/issues/257 - -root@qemux86-64:/usr/lib/strace/ptest/tests# make sockopt-sol_netlink.gen.log -FAIL: sockopt-sol_netlink.gen.test - -#root@qemux86-64:/usr/lib/strace/ptest/tests# diff sockopt-sol_netlink.dir/exp sockopt-sol_netlink.dir/out -#--- sockopt-sol_netlink.dir/exp -#+++ sockopt-sol_netlink.dir/out -#@@ -86,11 +86,11 @@ - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, -1) = -1 EINVAL (Invalid argument) - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, 3) = 0 - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a803000, 4) = -1 EFAULT (Bad address) --getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [8]) = 0 -+getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [4 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [5 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, NULL, [0 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [], [3 => 8]) = 0 --getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [8]) = -1 EFAULT (Bad address) -+getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [4]) = -1 EFAULT (Bad address) - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a802ffc, 0x7fa18a7fd000) = -1 EFAULT (Bad address) - setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 4) = -1 ENOPROTOOPT (Protocol not available) - setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 5) = -1 ENOPROTOOPT (Protocol not available) - - - -Index: strace-6.3/tests/sockopt-sol_netlink.gen.test -=================================================================== ---- strace-6.3.orig/tests/sockopt-sol_netlink.gen.test -+++ strace-6.3/tests/sockopt-sol_netlink.gen.test -@@ -1,4 +1,5 @@ - #!/bin/sh -efu - # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (sockopt-sol_netlink -e trace=getsockopt,setsockopt); do not edit. - . "${srcdir=.}/init.sh" -+skip_ "Test failing after system upgrades, wait for upstream fixes" - run_strace_match_diff -e trace=getsockopt,setsockopt diff --git a/meta/recipes-devtools/strace/strace_5.16.bb b/meta/recipes-devtools/strace/strace_5.16.bb index d97a1260d1..39082a5bc7 100644 --- a/meta/recipes-devtools/strace/strace_5.16.bb +++ b/meta/recipes-devtools/strace/strace_5.16.bb @@ -13,7 +13,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-strace-fix-reproducibilty-issues.patch \ file://skip-load.patch \ file://0001-landlock-update-expected-string.patch \ - file://skip-sockopt-test.patch \ + file://f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch \ + file://3bbfb541b258baec9eba674b5d8dc30007a61542.patch \ " SRC_URI[sha256sum] = "dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285"