From patchwork Thu Nov 30 20:57:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 35453 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 6DE49C10DC1 for ; Thu, 30 Nov 2023 20:57:50 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.5132.1701377863849181971 for ; Thu, 30 Nov 2023 12:57:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=1WRFdtZN; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6cde4aeea29so1183525b3a.2 for ; Thu, 30 Nov 2023 12:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377862; x=1701982662; darn=lists.openembedded.org; 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=wRbSnBEVBuehTRN/0+gCpXqmhnT9B2fQNz1ff9XEEB8=; b=1WRFdtZN0OkG3RSq3Qcg4hg3es62q/6YFQv8/h7jIE/iUWiMqGAAkl9ZbIjRGrcI81 e4p/be/PJ5QQGNFKqrdCt63iasCasJvOsW8P6sKWW13YRO9EDTXXL6e2qHpDTykJKedO eZV0OUacCvI2EbuMyq6fRf+I8UUaMWW/3NQro43t5f1sxZraPP4gLjxYSf2Uq25v5NrK GpKVW24L6RkcSjtxUYHN2OLi5rQAHltIyW24b5Ea7X1FJckxYAaVC9H5I0r64YOPU2v4 vBOP/j405mXUP9EkHX32hS+528Sz1q98PiiRaXKvCkQvpGQ3GpTeEEMTzdz4pWPEaWpA yU9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377862; x=1701982662; 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=wRbSnBEVBuehTRN/0+gCpXqmhnT9B2fQNz1ff9XEEB8=; b=k6TDV7/YnAUrDPVmf/NIW2sQWXZESASgktDyM1izEeXnV068/07uLgI6c4sUmYRQuc oG03bCjevqtwYeUrVfNFqZ6WkEWZsK9LXEA5Pxfb24sB2BrKfbsJ1/Y3KjIyEZpa8GLz nwawsac5BcBIvuexPnznKlNCr2rcUFvDwxdHT7nVd0BRV+8woy5QcIxxvPRSwCdG3KdQ TBiWVtvLs96+ADqH9gkHVwOon0wDMKzxFTjHFdQtbLkoMhS5GCkAWIE3GAyjvz5mekB9 DTINJqYHngYx5Ua57UepEvEOA9PcfXmxmd12EtWYJ1HScazDlhhmWU8X21GyRwxQrAhU OOjw== X-Gm-Message-State: AOJu0YzVPsxmG0M+IaWsn+XSTHeY5myRaGGWsGISkAdX84wxifL2mtDa 4jCNBjVGWcBT4qDIHaDiRjWW/2dPCUADznwQQmtysw== X-Google-Smtp-Source: AGHT+IGMdzWNaATaXyJtY9cCIDO3+l0Ksnwinryu3/7cg45OKlKVXVPRQH1uJpMUjawMk8r2Vk/niQ== X-Received: by 2002:a05:6a20:94cc:b0:18b:b02d:8b6 with SMTP id ht12-20020a056a2094cc00b0018bb02d08b6mr25261296pzb.23.1701377862115; Thu, 30 Nov 2023 12:57:42 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 01/25] avahi: backport Debian patches to fix multiple CVE's Date: Thu, 30 Nov 2023 10:57:09 -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, 30 Nov 2023 20:57:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191519 From: Vijay Anusuri import patches from ubuntu to fix CVE-2023-1981 CVE-2023-38469 CVE-2023-38470 CVE-2023-38471 CVE-2023-38472 CVE-2023-38473 Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches?h=ubuntu/jammy-security Upstream commit https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f & https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf & https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237 & https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c & https://github.com/lathiat/avahi/commit/20dec84b2480821704258bc908e7b2bd2e883b24 & https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09 & https://github.com/lathiat/avahi/commit/b675f70739f404342f7f78635d6e2dcd85a13460 & https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40 & https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797] Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/avahi/avahi_0.8.bb | 8 ++ .../avahi/files/CVE-2023-1981.patch | 58 ++++++++++ .../avahi/files/CVE-2023-38469-1.patch | 48 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470-1.patch | 57 +++++++++ .../avahi/files/CVE-2023-38470-2.patch | 52 +++++++++ .../avahi/files/CVE-2023-38471-1.patch | 73 ++++++++++++ .../avahi/files/CVE-2023-38471-2.patch | 52 +++++++++ .../avahi/files/CVE-2023-38472.patch | 45 ++++++++ .../avahi/files/CVE-2023-38473.patch | 109 ++++++++++++++++++ 10 files changed, 567 insertions(+) create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38470-1.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38470-2.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38471-1.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38471-2.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb index 4c830cc058..aa395beaf9 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb @@ -26,6 +26,14 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \ file://handle-hup.patch \ file://local-ping.patch \ file://invalid-service.patch \ + file://CVE-2023-1981.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470-1.patch \ + file://CVE-2023-38470-2.patch \ + file://CVE-2023-38471-1.patch \ + file://CVE-2023-38471-2.patch \ + file://CVE-2023-38472.patch \ " GITHUB_BASE_URI = "https://github.com/lathiat/avahi/releases/" diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch new file mode 100644 index 0000000000..4d7924d13a --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch @@ -0,0 +1,58 @@ +From a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= +Date: Thu, 17 Nov 2022 01:51:53 +0100 +Subject: [PATCH] Emit error if requested service is not found + +It currently just crashes instead of replying with error. Check return +value and emit error instead of passing NULL pointer to reply. + +Fixes #375 + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-1981.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f] +CVE: CVE-2023-1981 +Signed-off-by: Vijay Anusuri +--- + avahi-daemon/dbus-protocol.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c +index 70d7687bc..406d0b441 100644 +--- a/avahi-daemon/dbus-protocol.c ++++ b/avahi-daemon/dbus-protocol.c +@@ -375,10 +375,14 @@ static DBusHandlerResult dbus_get_alternative_host_name(DBusConnection *c, DBusM + } + + t = avahi_alternative_host_name(n); +- avahi_dbus_respond_string(c, m, t); +- avahi_free(t); ++ if (t) { ++ avahi_dbus_respond_string(c, m, t); ++ avahi_free(t); + +- return DBUS_HANDLER_RESULT_HANDLED; ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } else { ++ return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Hostname not found"); ++ } + } + + static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DBusMessage *m, DBusError *error) { +@@ -389,10 +393,14 @@ static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DB + } + + t = avahi_alternative_service_name(n); +- avahi_dbus_respond_string(c, m, t); +- avahi_free(t); ++ if (t) { ++ avahi_dbus_respond_string(c, m, t); ++ avahi_free(t); + +- return DBUS_HANDLER_RESULT_HANDLED; ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } else { ++ return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Service not found"); ++ } + } + + static DBusHandlerResult dbus_create_new_entry_group(DBusConnection *c, DBusMessage *m, DBusError *error) { diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file mode 100644 index 0000000000..85345edc10 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch @@ -0,0 +1,48 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin +Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455 + +CVE-2023-38469 + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38469-1.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +Index: avahi-0.8/avahi-core/rr.c +=================================================================== +--- avahi-0.8.orig/avahi-core/rr.c ++++ avahi-0.8/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include + #include + ++#include "dns.h" + #include "rr.h" + #include "log.h" + #include "util.h" +@@ -688,11 +689,17 @@ int avahi_record_is_valid(AvahiRecord *r + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) ++ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { + if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size; ++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + } diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file mode 100644 index 0000000000..f8f60ddca1 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch @@ -0,0 +1,65 @@ +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin +Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. +It reproduces https://github.com/lathiat/avahi/issues/455 + +Canonical notes: +nickgalanis> removed first hunk since there is no .github dir in this release + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38469-2.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 1 files changed, 14 insertions(+) + +Index: avahi-0.8/avahi-client/client-test.c +=================================================================== +--- avahi-0.8.orig/avahi-client/client-test.c ++++ avahi-0.8/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include ++#include + #include + + #include +@@ -33,6 +34,8 @@ + #include + #include + ++#include ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVA + uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVA + printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); + printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); + ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); ++ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); ++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38470-1.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38470-1.patch new file mode 100644 index 0000000000..4cca81698b --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38470-1.patch @@ -0,0 +1,57 @@ +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= +Date: Tue, 11 Apr 2023 15:29:59 +0200 +Subject: [PATCH] Ensure each label is at least one byte long + +The only allowed exception is single dot, where it should return empty +string. + +Fixes #454. + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38470-1.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c] +CVE: CVE-2023-38470 +Signed-off-by: Vijay Anusuri +--- + avahi-common/domain-test.c | 14 ++++++++++++++ + avahi-common/domain.c | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +Index: avahi-0.8/avahi-common/domain-test.c +=================================================================== +--- avahi-0.8.orig/avahi-common/domain-test.c ++++ avahi-0.8/avahi-common/domain-test.c +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAH + printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo.")); + avahi_free(s); + ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); ++ avahi_free(s); ++ ++ s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}." ++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." ++ "}.?.?.?.}.=.?.?.}"); ++ assert(s == NULL); ++ + printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff")); + printf("%i\n", avahi_domain_equal("A", "a")); + +Index: avahi-0.8/avahi-common/domain.c +=================================================================== +--- avahi-0.8.orig/avahi-common/domain.c ++++ avahi-0.8/avahi-common/domain.c +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s + } + + if (!empty) { +- if (size < 1) ++ if (size < 2) + return NULL; + + *(r++) = '.'; diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38470-2.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38470-2.patch new file mode 100644 index 0000000000..e0736bf210 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38470-2.patch @@ -0,0 +1,52 @@ +From 20dec84b2480821704258bc908e7b2bd2e883b24 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin +Date: Tue, 19 Sep 2023 03:21:25 +0000 +Subject: [PATCH] [common] bail out when escaped labels can't fit into ret + +Fixes: +``` +==93410==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7f9e76f14c16 at pc 0x00000047208d bp 0x7ffee90a6a00 sp 0x7ffee90a61c8 +READ of size 1110 at 0x7f9e76f14c16 thread T0 + #0 0x47208c in __interceptor_strlen (out/fuzz-domain+0x47208c) (BuildId: 731b20c1eef22c2104e75a6496a399b10cfc7cba) + #1 0x534eb0 in avahi_strdup avahi/avahi-common/malloc.c:167:12 + #2 0x53862c in avahi_normalize_name_strdup avahi/avahi-common/domain.c:226:12 +``` +and +``` +fuzz-domain: fuzz/fuzz-domain.c:38: int LLVMFuzzerTestOneInput(const uint8_t *, size_t): Assertion `avahi_domain_equal(s, t)' failed. +==101571== ERROR: libFuzzer: deadly signal + #0 0x501175 in __sanitizer_print_stack_trace (/home/vagrant/avahi/out/fuzz-domain+0x501175) (BuildId: 682bf6400aff9d41b64b6e2cc3ef5ad600216ea8) + #1 0x45ad2c in fuzzer::PrintStackTrace() (/home/vagrant/avahi/out/fuzz-domain+0x45ad2c) (BuildId: 682bf6400aff9d41b64b6e2cc3ef5ad600216ea8) + #2 0x43fc07 in fuzzer::Fuzzer::CrashCallback() (/home/vagrant/avahi/out/fuzz-domain+0x43fc07) (BuildId: 682bf6400aff9d41b64b6e2cc3ef5ad600216ea8) + #3 0x7f1581d7ebaf (/lib64/libc.so.6+0x3dbaf) (BuildId: c9f62793b9e886eb1b95077d4f26fe2b4aa1ac25) + #4 0x7f1581dcf883 in __pthread_kill_implementation (/lib64/libc.so.6+0x8e883) (BuildId: c9f62793b9e886eb1b95077d4f26fe2b4aa1ac25) + #5 0x7f1581d7eafd in gsignal (/lib64/libc.so.6+0x3dafd) (BuildId: c9f62793b9e886eb1b95077d4f26fe2b4aa1ac25) + #6 0x7f1581d6787e in abort (/lib64/libc.so.6+0x2687e) (BuildId: c9f62793b9e886eb1b95077d4f26fe2b4aa1ac25) + #7 0x7f1581d6779a in __assert_fail_base.cold (/lib64/libc.so.6+0x2679a) (BuildId: c9f62793b9e886eb1b95077d4f26fe2b4aa1ac25) + #8 0x7f1581d77186 in __assert_fail (/lib64/libc.so.6+0x36186) (BuildId: c9f62793b9e886eb1b95077d4f26fe2b4aa1ac25) + #9 0x5344a4 in LLVMFuzzerTestOneInput /home/vagrant/avahi/fuzz/fuzz-domain.c:38:9 +``` + +It's a follow-up to 94cb6489114636940ac683515417990b55b5d66c + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38470-2.patch?h=ubuntu/jammy-security +CVE: CVE-2023-38470 #Follow-up patch +Signed-off-by: Vijay Anusuri +--- + avahi-common/domain.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: avahi-0.8/avahi-common/domain.c +=================================================================== +--- avahi-0.8.orig/avahi-common/domain.c ++++ avahi-0.8/avahi-common/domain.c +@@ -210,7 +210,8 @@ char *avahi_normalize_name(const char *s + } else + empty = 0; + +- avahi_escape_label(label, strlen(label), &r, &size); ++ if (!(avahi_escape_label(label, strlen(label), &r, &size))) ++ return NULL; + } + + return ret_s; diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38471-1.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38471-1.patch new file mode 100644 index 0000000000..07cd3246e8 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38471-1.patch @@ -0,0 +1,73 @@ +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Mon, 23 Oct 2023 13:38:35 +0200 +Subject: [PATCH] core: extract host name using avahi_unescape_label() + +Previously we could create invalid escape sequence when we split the +string on dot. For example, from valid host name "foo\\.bar" we have +created invalid name "foo\\" and tried to set that as the host name +which crashed the daemon. + +Fixes #453 + +CVE-2023-38471 + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38471-1.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09] +CVE: CVE-2023-38471 +Signed-off-by: Vijay Anusuri +--- + avahi-core/server.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +Index: avahi-0.8/avahi-core/server.c +=================================================================== +--- avahi-0.8.orig/avahi-core/server.c ++++ avahi-0.8/avahi-core/server.c +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) + } + + int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { +- char *hn = NULL; ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; ++ char label[AVAHI_LABEL_MAX]; ++ char *hn = NULL, *h; ++ size_t len; ++ + assert(s); + + AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME); +@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServ + else + hn = avahi_normalize_name_strdup(host_name); + +- hn[strcspn(hn, ".")] = 0; ++ h = hn; ++ if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { ++ avahi_free(h); ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ } ++ ++ avahi_free(h); + +- if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) { +- avahi_free(hn); ++ h = label_escaped; ++ len = sizeof(label_escaped); ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +- } + + withdraw_host_rrs(s); + + avahi_free(s->host_name); +- s->host_name = hn; ++ s->host_name = avahi_strdup(label_escaped); ++ if (!s->host_name) ++ return AVAHI_ERR_NO_MEMORY; + + update_fqdn(s); + diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38471-2.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38471-2.patch new file mode 100644 index 0000000000..44737bfc2e --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38471-2.patch @@ -0,0 +1,52 @@ +From b675f70739f404342f7f78635d6e2dcd85a13460 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin +Date: Tue, 24 Oct 2023 22:04:51 +0000 +Subject: [PATCH] core: return errors from avahi_server_set_host_name properly + +It's a follow-up to 894f085f402e023a98cbb6f5a3d117bd88d93b09 + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38471-2.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/b675f70739f404342f7f78635d6e2dcd85a13460] +CVE: CVE-2023-38471 #Follow-up Patch +Signed-off-by: Vijay Anusuri +--- + avahi-core/server.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +Index: avahi-0.8/avahi-core/server.c +=================================================================== +--- avahi-0.8.orig/avahi-core/server.c ++++ avahi-0.8/avahi-core/server.c +@@ -1309,10 +1309,13 @@ int avahi_server_set_host_name(AvahiServ + else + hn = avahi_normalize_name_strdup(host_name); + ++ if (!hn) ++ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); ++ + h = hn; + if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { + avahi_free(h); +- return AVAHI_ERR_INVALID_HOST_NAME; ++ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); + } + + avahi_free(h); +@@ -1320,7 +1323,7 @@ int avahi_server_set_host_name(AvahiServ + h = label_escaped; + len = sizeof(label_escaped); + if (!avahi_escape_label(label, strlen(label), &h, &len)) +- return AVAHI_ERR_INVALID_HOST_NAME; ++ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); + + if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +@@ -1330,7 +1333,7 @@ int avahi_server_set_host_name(AvahiServ + avahi_free(s->host_name); + s->host_name = avahi_strdup(label_escaped); + if (!s->host_name) +- return AVAHI_ERR_NO_MEMORY; ++ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); + + update_fqdn(s); + diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file mode 100644 index 0000000000..5c63edb31f --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch @@ -0,0 +1,45 @@ +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Thu, 19 Oct 2023 17:36:44 +0200 +Subject: [PATCH] core: make sure there is rdata to process before parsing it + +Fixes #452 + +CVE-2023-38472 + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38472.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40] +CVE: CVE-2023-38472 +Signed-off-by: Vijay Anusuri +--- + avahi-client/client-test.c | 3 +++ + avahi-daemon/dbus-entry-group.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +Index: avahi-0.8/avahi-client/client-test.c +=================================================================== +--- avahi-0.8.orig/avahi-client/client-test.c ++++ avahi-0.8/avahi-client/client-test.c +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVA + assert(error == AVAHI_ERR_INVALID_RECORD); + avahi_string_list_free(txt); + ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); ++ assert(error != AVAHI_OK); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +Index: avahi-0.8/avahi-daemon/dbus-entry-group.c +=================================================================== +--- avahi-0.8.orig/avahi-daemon/dbus-entry-group.c ++++ avahi-0.8/avahi-daemon/dbus-entry-group.c +@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_g + if (!(r = avahi_record_new_full (name, clazz, type, ttl))) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); + +- if (avahi_rdata_parse (r, rdata, size) < 0) { ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { + avahi_record_unref (r); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); + } diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file mode 100644 index 0000000000..d7c69225b1 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch @@ -0,0 +1,109 @@ +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Wed, 11 Oct 2023 17:45:44 +0200 +Subject: [PATCH] common: derive alternative host name from its unescaped + version + +Normalization of input makes sure we don't have to deal with special +cases like unescaped dot at the end of label. + +Fixes #451 #487 +CVE-2023-38473 + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38473.patch?h=ubuntu/jammy-security +Upstream commit https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797] +CVE: CVE-2023-38473 +Signed-off-by: Vijay Anusuri +--- + avahi-common/alternative-test.c | 3 +++ + avahi-common/alternative.c | 27 +++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +Index: avahi-0.8/avahi-common/alternative-test.c +=================================================================== +--- avahi-0.8.orig/avahi-common/alternative-test.c ++++ avahi-0.8/avahi-common/alternative-test.c +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAH + const char* const test_strings[] = { + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", ++ ").", ++ "\\.", ++ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\", + "gurke", + "-", + " #", +Index: avahi-0.8/avahi-common/alternative.c +=================================================================== +--- avahi-0.8.orig/avahi-common/alternative.c ++++ avahi-0.8/avahi-common/alternative.c +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c + } + + char *avahi_alternative_host_name(const char *s) { ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; ++ char *alt, *r, *ret; + const char *e; +- char *r; ++ size_t len; + + assert(s); + + if (!avahi_is_valid_host_name(s)) + return NULL; + +- if ((e = strrchr(s, '-'))) { ++ if (!avahi_unescape_label(&s, label, sizeof(label))) ++ return NULL; ++ ++ if ((e = strrchr(label, '-'))) { + const char *p; + + e++; +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const + + if (e) { + char *c, *m; +- size_t l; + int n; + + n = atoi(e)+1; + if (!(m = avahi_strdup_printf("%i", n))) + return NULL; + +- l = e-s-1; ++ len = e-label-1; + +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; + +- if (!(c = avahi_strndup(s, l))) { ++ if (!(c = avahi_strndup(label, len))) { + avahi_free(m); + return NULL; + } +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const + } else { + char *c; + +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) + return NULL; + + drop_incomplete_utf8(c); +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const + avahi_free(c); + } + ++ alt = alternative; ++ len = sizeof(alternative); ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); ++ ++ avahi_free(r); ++ r = avahi_strdup(ret); ++ + assert(avahi_is_valid_host_name(r)); + + return r; From patchwork Thu Nov 30 20:57:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 35455 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 7C968C07CA9 for ; Thu, 30 Nov 2023 20:57:50 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.5256.1701377864778990804 for ; Thu, 30 Nov 2023 12:57:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=KyoM8lhm; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6cdd4aab5f5so1395729b3a.3 for ; Thu, 30 Nov 2023 12:57:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377864; x=1701982664; darn=lists.openembedded.org; 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=4GLTDWSgasL/f8u/SI//2iuDDK6xEf9cUEJ1x61o280=; b=KyoM8lhmshbGYS6fJ1J2GZF0pk61Kol1UEACrT518pOfE5yXlEbjPnitbbqCA/YUxn FjkhJYpmuRpYRv1yX19hoe7xqIBMO4HHJ5sS+jiRD8/mDFEeeHcvCSCFWf6aX59tnF1V uYb/L9eaapXQPIxUs8REBKYjq16ibV4qZvqldbKFOCDMDBy/EjUEF+s4eTpGYxUk2tAO Uj35N9ZAPRjIPS2DiIYdLnVioNNK7D+88saVnIi8aJIwI+S2AWo1MDmEs82fd/FXvQMp 9jqCtOpIKhsxZzfxAwepxGogPSgcoQsMhLs4jF/9b+V60SuYMDo+BUyd9h24EDK0OVf1 Fy6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377864; x=1701982664; 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=4GLTDWSgasL/f8u/SI//2iuDDK6xEf9cUEJ1x61o280=; b=PaBH4y0twpWUf6tggMb5qE4yOvZJcXc7w4wq5Dn4QD2mLAetK2SVw1fhVyfbODeQVh X3xhP5MtF/2SvE/sW7K4mTuz+v9TI17w2peDH021GIr3wD0HCDKoGEMS5IgJRhnuWarJ rrlVb+5AIK+U5yapsir0XyB+oZs/3DBGJGbjp/WMyiN3yVAzSzXL6sK41CG0YMFoDSFg QgKB+IP9daMiLei7hQ5pD015AAS7zuTai/klFgJNwsGsWEBMkoTcbDHksTKhhBSDc+ZQ tvzqi2RUeodqvgeeSPI12Mo8HZb7PDUBzGh8Ut/i36zVUV60YWkn5OYuhRsXel3kv1dl coVw== X-Gm-Message-State: AOJu0YxHDEAA7B675nJO7DIItYgnbX+w/9LAxn/WtQwQZkmTjWOb5YDQ G5fuP5BCEPnb2cq+aR5JMcHQbCpDArrUyX8JNKfQ7Q== X-Google-Smtp-Source: AGHT+IHkj0OXezj/2riEvoUxY6dDVft+c3zK2rlLFMmRkh/pbQLg/zaSzrjhX8eqXmFL4NFA+e/fzg== X-Received: by 2002:a05:6a20:1608:b0:18c:da:ba0b with SMTP id l8-20020a056a20160800b0018c00daba0bmr27720800pzj.44.1701377863871; Thu, 30 Nov 2023 12:57:43 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 02/25] base-passwd: upgrade 3.6.1 -> 3.6.2 Date: Thu, 30 Nov 2023 10:57:10 -1000 Message-Id: <9dc8a4b219cd8763299ca465e82bd4a5b495ea14.1701377676.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, 30 Nov 2023 20:57:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191520 From: Wang Mingyu base-passwd (3.6.2) [ Peter Kjellerstedt ] * Make it possible to configure whether to use SELinux or not. [ Gioele Barabucci ] * d/postinst: Remove code for upgrades from outdated version 3.2.2. * d/control: Remove unused w3m build dependency (closes: #1051810). * Support build profile (closes: #1051809). [ Colin Watson ] * Debconf translations: - Romanian (thanks, Remus-Gabriel Chelu; closes: #1031149). - Swedish (thanks, Peter Kvillegård; closes: #1050440). * Explicitly build-depend on docbook, since otherwise the build fails if docbook-xml happens to be installed before installing build-dependencies (closes: #1033422). [ Samuel Thibault ] * Fix non-Linux builds (closes: #1054098). 0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch removed since it's included in 3.6.2 Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit f318a13e8b6ce3ded313fa17ab80b35b936205fb) Signed-off-by: Steve Sakoman --- ...-to-configure-whether-to-use-SELinux.patch | 35 ------------------- ...e-passwd_3.6.1.bb => base-passwd_3.6.2.bb} | 3 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch rename meta/recipes-core/base-passwd/{base-passwd_3.6.1.bb => base-passwd_3.6.2.bb} (96%) diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch deleted file mode 100644 index 2cc6174e2a..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 25e3bf09bbbb04aa930ea0fd9f28809a24fb7194 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Sun, 2 Oct 2022 17:47:29 +0200 -Subject: [PATCH] Make it possible to configure whether to use SELinux or not - -Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/396c41bb35e03c5dcc727aa9f74218a45874ac1f] -Signed-off-by: Peter Kjellerstedt ---- - configure.ac | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 589df88..e46403b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,18 @@ AC_SYS_LARGEFILE - - dnl Scan for things we need - AC_CHECK_FUNCS([putgrent]) --AC_CHECK_LIB([selinux], [is_selinux_enabled]) -+ -+dnl Check for SELinux -+AC_MSG_CHECKING([whether to enable SELinux support]) -+AC_ARG_ENABLE([selinux], -+ [AS_HELP_STRING([--disable-selinux], [disable support for SELinux])], -+ [], -+ [enable_selinux=yes]) -+AC_MSG_RESULT($enable_selinux) -+AS_IF([test "x$enable_selinux" != xno], -+ [AC_CHECK_LIB([selinux], [is_selinux_enabled], [], -+ [AC_MSG_ERROR( -+ [SELinux support not available (use --disable-selinux to disable)])])]) - - dnl Check for debconf - AC_MSG_CHECKING([whether to enable debconf support]) diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb similarity index 96% rename from meta/recipes-core/base-passwd/base-passwd_3.6.1.bb rename to meta/recipes-core/base-passwd/base-passwd_3.6.2.bb index 44bcfb0199..bb4b49e6ab 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb @@ -11,12 +11,11 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar file://0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch \ file://0004-Add-an-input-group-for-the-dev-input-devices.patch \ file://0005-Add-kvm-group.patch \ - file://0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch \ file://0007-Add-wheel-group.patch \ file://0001-base-passwd-Add-the-sgx-group.patch \ " -SRC_URI[sha256sum] = "6ff369be59d586ba63c0c5fcb00f75f9953fe49db88bc6c6428f2c92866f79af" +SRC_URI[sha256sum] = "06dc78352bf38a8df76ff295e15ab5654cdefe41e62368b15bfcbbab8e4ec2a0" # the package is taken from launchpad; that source is static and goes stale # so we check the latest upstream from a directory that does get updated From patchwork Thu Nov 30 20:57: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: 35454 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 83AA3C46CA0 for ; Thu, 30 Nov 2023 20:57:50 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web10.5257.1701377866499316970 for ; Thu, 30 Nov 2023 12:57:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=KD8lq79S; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-5c239897895so1178107a12.2 for ; Thu, 30 Nov 2023 12:57:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377865; x=1701982665; darn=lists.openembedded.org; 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=ea1zRhOZMS2CfZl0IgF9WkPNoRyHRHXpx4iIv5aelmM=; b=KD8lq79SMXW1DdCdE8+FZdKRHVC+SYvyMwwv1njmoS5aj+i4gwtyUB+RrI9prRZQ7g PR9r2acTrHopZiezpb3+VFzRikueaNmKWzihiGjVf9CsAXABuIvf1XP/aE4OUe0kJDL8 ql6/tXeObm8gWJSukgEiEkysCIdtSPztY5VsMKFlwOdvWW49UT9o2UG9wjJD6o9Rh2Gk R0nqFzpGspWgrcaE8POwEvl3/yMKNeePlvTxJma1lW43agKf2qhnMkpo/SUJ73v36P9J DIFmhBE7hxmyDBxy6vRX2xxxMQIup33xQrN1mPXkfDrmQcdgO0SIsc5zHL1nBpokIX31 sqlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377865; x=1701982665; 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=ea1zRhOZMS2CfZl0IgF9WkPNoRyHRHXpx4iIv5aelmM=; b=FZ0/q7FBp1bWoTc6GoswHXuo0TmbDrsSVplCWWiGBukgrtXs8Hp105iNxNDMnro5uZ SJFgEHwkjETxMgmo+cNcHvr/7q7son5odpYcFT7rJNkTUFPWfdRWl0Wc9DDR4zaiDTbS FjPC6ajOcFGAvgHVPIn4SGYm8TtCWhI1hZ5wX/NHwglDBFjPpsI9C2xdTLK1p521U95x a8AwlDElBgGflEpk7S0EVWeo14XZnyp7RfqgyKUrBf6jTKfa0YsCbbUF6ZBJX9sOgqFU iP/Ns/2nlMw9JPJarhOh1NYxh17T4J3b7InpXwHb9e4pRMZi+naP5DdfDAZ/thj6N12i wShQ== X-Gm-Message-State: AOJu0YyOeOCDq1g7c0M6hMGWiEYSjJ9juahJHXqmd51jdXA0Fs/z+Yvj zo37DbV9CuJH0f4agv0iWB/tETZirHS3uu+eFttoYw== X-Google-Smtp-Source: AGHT+IEY29LridnaoWgMfzBKpZDoL4sohMvkJabVLWEa3krsuY95Fu6ekqLxcOyet+ZCUTH7tuWyMQ== X-Received: by 2002:a05:6a20:7d89:b0:189:b618:1736 with SMTP id v9-20020a056a207d8900b00189b6181736mr27885713pzj.57.1701377865628; Thu, 30 Nov 2023 12:57:45 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:45 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 03/25] enchant2: upgrade 2.6.1 -> 2.6.2 Date: Thu, 30 Nov 2023 10:57:11 -1000 Message-Id: <9da704f23bc9538c6fa6fb075fe2c28e7751c8a4.1701377676.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, 30 Nov 2023 20:57:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191521 From: Wang Mingyu Changelog: =========== Documents exclude files: each personal word list is paired with an exclude file that contains words the user considers invalid. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit f0877cebd2c990d9d98fc348032742c2d9fb4254) Signed-off-by: Steve Sakoman --- .../enchant/{enchant2_2.6.1.bb => enchant2_2.6.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/enchant/{enchant2_2.6.1.bb => enchant2_2.6.2.bb} (92%) diff --git a/meta/recipes-support/enchant/enchant2_2.6.1.bb b/meta/recipes-support/enchant/enchant2_2.6.2.bb similarity index 92% rename from meta/recipes-support/enchant/enchant2_2.6.1.bb rename to meta/recipes-support/enchant/enchant2_2.6.2.bb index a3510a8705..38d3245d20 100644 --- a/meta/recipes-support/enchant/enchant2_2.6.1.bb +++ b/meta/recipes-support/enchant/enchant2_2.6.2.bb @@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 groff-native" inherit autotools pkgconfig github-releases SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[sha256sum] = "f24e12469137ae1d03140bb9032a47a5947c36f4d1e2f12b929061005eb15279" +SRC_URI[sha256sum] = "6686a728e56e760f8dee09a22f0fb53b46ee9dbe7d64cf9e5bb35a658bff7e1d" GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" From patchwork Thu Nov 30 20:57: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: 35452 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 67FC5C46CA3 for ; Thu, 30 Nov 2023 20:57:50 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.5134.1701377868481508253 for ; Thu, 30 Nov 2023 12:57:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=EpAxE0+C; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6cddc148285so1402569b3a.2 for ; Thu, 30 Nov 2023 12:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377867; x=1701982667; darn=lists.openembedded.org; 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=zOCVirXEJrougbL26dLFCdLXOzDK0fFdFy7ZV2MzId0=; b=EpAxE0+CfY+prolLCXeFfEvWFwyVr+e/dvLr0nwGs86esLdmKeoD0hB/tJb/bZxhj8 Iuq9g7h/GKdMoxyRGH+SOgFqR34jViS5GQKxLFu441hBaEzs9NKHwEXP5B9Dvh5b5nR3 pLbqK6WE77FBS125AEjyqcL5nGjBkoB7kdtbMicrvmc0ua1H+i/LYzBZ+bxnXj/s04zW uSYHuxLfPfFL4eLRY4/+WHUSw8732S67uaw/BHrMUU18c6iAOiqiuuwx7gEt4Wv4Pxr5 fNjXgQmqUk5tji1VFQu95SOix8gGEij+nWnze0jHMSCuFPfaXEUFjWQcayRs9mr8IqdA UP8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377867; x=1701982667; 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=zOCVirXEJrougbL26dLFCdLXOzDK0fFdFy7ZV2MzId0=; b=aA26nXtQf6vYym7cJXCZrNv4U2SmnEg9Uk0wCzehLwwA5hB/vRbfwMCcmguwHUVZp6 mf+gDWkY2TThQJf/60jP3CqYelaSnZ4Q9Qq0UNYnFfhxlbr2iR9xZvEPfe3yfffraTYC uhTJ1PtZoGWcmnxPW3R8i/Uitat4HZqGsSr7ZIiEl7JTVyiOMI3Cf41iQ/JXC5uYev+G V/StfO+L33HUddpZewCIk729/HPcKPsTUVQWEX6tdwszvSJEb2arkAAkd4yvwP4CpSoq UjGyAYOXYQEivUSGxduQfoxXtUW+iKEJIrVE0UcNJBLpg3Un0bomwLgmFDduJGV5zbqd nvFg== X-Gm-Message-State: AOJu0YzCk7pkxuru6HYcsEFdaGiB9hRwENcOaLKFKWiNq9QpBeT6mwhr 0glAlmNfVTH1ZvN2CU9dlH4Ug4M/AmvqM46jljvrAQ== X-Google-Smtp-Source: AGHT+IFewzTNdhglqET/CzY+5LcqoQn9acR5aluF+UrGFDB67JtWGFSECOdb4u9O8I98FbXVg302kQ== X-Received: by 2002:a05:6a00:3907:b0:6c4:d76a:68ff with SMTP id fh7-20020a056a00390700b006c4d76a68ffmr28873455pfb.17.1701377867177; Thu, 30 Nov 2023 12:57:47 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 04/25] harfbuzz: upgrade 8.2.1 -> 8.2.2 Date: Thu, 30 Nov 2023 10:57:12 -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, 30 Nov 2023 20:57:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191522 From: Wang Mingyu Changelog: =========== - Fix regression from 8.1.0 in shaping fonts with duplicate feature tags. - Fix regression from 8.2.0 in parsing CSS-style feature strings. - Variable fonts instanciation now handles more tables. - Various CMake build improvements. - various fixes to build without errors with gcc 4.9.2. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 7380afcb41db7b1a93c716af567d4a30a71dddcd) Signed-off-by: Steve Sakoman --- .../harfbuzz/{harfbuzz_8.2.1.bb => harfbuzz_8.2.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/harfbuzz/{harfbuzz_8.2.1.bb => harfbuzz_8.2.2.bb} (95%) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_8.2.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_8.2.2.bb similarity index 95% rename from meta/recipes-graphics/harfbuzz/harfbuzz_8.2.1.bb rename to meta/recipes-graphics/harfbuzz/harfbuzz_8.2.2.bb index df41af29f9..ce1a6bed65 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_8.2.1.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_8.2.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \ " SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "0fec78f98c9c8faf228957a201c8846f809452c20f8445eb092a1ba6f22dbea5" +SRC_URI[sha256sum] = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3" DEPENDS += "glib-2.0-native" From patchwork Thu Nov 30 20:57: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: 35458 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 7B02AC46CA3 for ; Thu, 30 Nov 2023 20:58:00 +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.5135.1701377870361395985 for ; Thu, 30 Nov 2023 12:57:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=0lG+HDH1; 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-6cde4aeea29so1183600b3a.2 for ; Thu, 30 Nov 2023 12:57:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377869; x=1701982669; darn=lists.openembedded.org; 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=/48nr0ez3BWOos+vY3tHm3qySJMAMuS0ho8rIIEdTo4=; b=0lG+HDH1XFHh97r6g5adzPxWjBMUoCInZ+K4MQEwJF/GwxCxQSSd9W3VT/DrTNphi4 KelrQS/LCZjAmmhHQ4Wsv6YtYnSZpOAZ4fyDBllqDo08oC1kydDE1Qf6ePRMrhVXQbyE 6rWlCex/MCKMHhzeyTA4cUZYzEyvXqrlKp+uzrCfwnJlrdj24Vbniwk0uLcS6w6Z2eKl TypijS+X/UOH217fzqLVoSXhHVJzst+BBRJ49V3OVffVdogJ6E2UgLK5lXDUmDiRSvbw eD8bsHzxneVDqui2sWtsrQxJ6HyhrP72ajsPhaCwtblNSM9EeFLhahET6ZpJ1HWyPzIn ST0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377869; x=1701982669; 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=/48nr0ez3BWOos+vY3tHm3qySJMAMuS0ho8rIIEdTo4=; b=LAiswgRMJMPuwqYsqOk1zWrxuKyxGvSwXdQsMOEhWHxE9lVdTeyOLpKuUqpXvHizro v0+vQbLFOMSKFkO/jnhpPBk8NVfKQFiL+rVM4J38fi7uuAqvdpft2ZZiQ1dLqPxUxbRh 8zYWJpPY4XvNAfA3OrzPrJenw2zFbBgK32poeJxSszC0YGWZP8ovbebrXF93btVjwfGh AXU1vFVFt6E2iCUVZUIgOi5ZVTm1Dj4ULKr6JiJdfJzaAdBfp+r7Uq0MlVF+UDgjKoEb oD9P/CjjY6Dxvz4o9CyvPlJYgylV1/NfDGdQepxY4/1ZYBA0Q2PNRaLSqYZ3UeI5ut8u 7GzQ== X-Gm-Message-State: AOJu0Yz0JkntDJeBO9AsxItgjcGDRLmWXQctkoGMKcREIoG+Al+d8AY5 7EXWpkhOf6PoVJcRlH/W5ZwR6wvTAFr1UhpIkVhe5Q== X-Google-Smtp-Source: AGHT+IG2LzaM/Sk0q0Vc3/akvqey5NM44PhpknGZpIHXDiE8XtWDKK7KwURtjcAL74Aw8IPF+WA+FQ== X-Received: by 2002:a05:6a00:21c4:b0:6cb:a1fe:18c0 with SMTP id t4-20020a056a0021c400b006cba1fe18c0mr23721127pfj.8.1701377869319; Thu, 30 Nov 2023 12:57:49 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:48 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 05/25] libjpeg-turbo: upgrade 3.0.0 -> 3.0.1 Date: Thu, 30 Nov 2023 10:57:13 -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, 30 Nov 2023 20:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191523 From: Wang Mingyu Changelog: ============= 1. The x86-64 SIMD functions now use a standard stack frame, prologue, and epilogue so that debuggers and profilers can reliably capture backtraces from within the functions. 2. Fixed two minor issues in the interblock smoothing algorithm that caused mathematical (but not necessarily perceptible) edge block errors when decompressing progressive JPEG images exactly two MCU blocks in width or that use vertical chrominance subsampling. 3. Fixed a regression introduced by 3.0 beta2[6] that, in rare cases, caused the C Huffman encoder (which is not used by default on x86 and Arm CPUs) to generate incorrect results if the Neon SIMD extensions were explicitly disabled at build time (by setting the 'WITH_SIMD' CMake variable to '0') in an AArch64 build of libjpeg-turbo. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit f1d2ffb6c7282751919a7057ffc445db71866f96) Signed-off-by: Steve Sakoman --- .../jpeg/{libjpeg-turbo_3.0.0.bb => libjpeg-turbo_3.0.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/jpeg/{libjpeg-turbo_3.0.0.bb => libjpeg-turbo_3.0.1.bb} (97%) diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb similarity index 97% rename from meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb rename to meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb index 146d80008c..99ed82dac4 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb @@ -10,7 +10,7 @@ DEPENDS:append:x86:class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa" +SRC_URI[sha256sum] = "22429507714ae147b3acacd299e82099fce5d9f456882fc28e252e4579ba2a75" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/" From patchwork Thu Nov 30 20:57: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: 35459 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 9995EC07CA9 for ; Thu, 30 Nov 2023 20:58:00 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.5137.1701377871869882745 for ; Thu, 30 Nov 2023 12:57:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ZiTfjYD1; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6cb55001124so2006685b3a.0 for ; Thu, 30 Nov 2023 12:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377871; x=1701982671; darn=lists.openembedded.org; 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=nF0jdoayT9HI9N2Nsw+cCLmqowJwntAF/b4jWwamH3o=; b=ZiTfjYD1w5VMe5Qfn9M0ryC/KdooFhMqfe10G9993/5Rw0d/JdFXTqgh5osiH/qo7i hS8FHQeS+YhNJeKW4R/1Zl5a9PH2twMIrSbb92j5WFDhzVBnfnCyBxgFg72cNeQC3KEj yeeP3JaGqsGvJPk0YahVrLK9l2SfVFFXiBx6f3bK816OYKly+Hyl6MtUudu5TgRbGSHv urNWJGI0WSN2+WLcyZX4t56wI1y+M+Vt7MngGfcuiY2BItPPRW+hFJYX3swKGOOLy98w w1z6q5cqPiszAHUITxEagj+CTnBhXKtUIptIdP2cS8gRQfB4JIEUjox2QaYQteGQg82j o6SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377871; x=1701982671; 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=nF0jdoayT9HI9N2Nsw+cCLmqowJwntAF/b4jWwamH3o=; b=Gia5pATcV+NN4g1TdhvmRSojhr6+24dRgcKSOBYGMSQ2NnQ9vsV9mjdefW9co40fY+ gsZKSQWggkgmbNgHFADPbpJNo2lSQaFBN/QjtIMyEIKiOU7EwuEy8iEfaAjJKiynKF3x kz+O0cZ3nmmO8zIN3Lsj3e5BdN5LX4Z8zlDBB0nnqZDzPWI2GWK0b8lEQhj5gcUOMnRU RPCgxa3N2dZ5YYLuZqDcGsuf9iRBnF5UH8GCT7Ebzb/7QL0/ChBHxSUByPlTti6rgtK6 F3WgnjFWS5rWgSRMC3uPxykVt+Hjsrj3EBzuCAAdId8RNXfhnm4WoDNoSoxtbragZz5T AUVw== X-Gm-Message-State: AOJu0YxETKf6IyJTG4zzN9xwkJmyHn7t/BAlk/hXHTgWup/1EJTqqPbN izArI8ZFGT1lzclCJBXyQReSaqm/0Jb1d2DLDMHepQ== X-Google-Smtp-Source: AGHT+IFlAxhT4+JMhIM8oK1hK+B/CQE0VHPswaEVv3Nr4iLJqfpFRONxiNKh4GF1Ys9M2SxMx0vh6g== X-Received: by 2002:a05:6a20:3944:b0:18b:b858:17a5 with SMTP id r4-20020a056a20394400b0018bb85817a5mr30812109pzg.28.1701377871067; Thu, 30 Nov 2023 12:57:51 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:50 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 06/25] python3-urllib3: Upgrade to 2.0.7 Date: Thu, 30 Nov 2023 10:57:14 -1000 Message-Id: <99885e0914365f9c4bbb5584e9ab3d244dc58499.1701377676.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, 30 Nov 2023 20:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191524 From: Khem Raj Addresses CVE-2023-45803 [1] [1] https://github.com/urllib3/urllib3/commit/4e98d57809dacab1cbe625fddeec1a290c478ea9 ( cherry-pick from commit befec4d3591bb0dce0e256cf338eb541b2a56b98 ) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- .../{python3-urllib3_2.0.6.bb => python3-urllib3_2.0.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-urllib3_2.0.6.bb => python3-urllib3_2.0.7.bb} (87%) diff --git a/meta/recipes-devtools/python/python3-urllib3_2.0.6.bb b/meta/recipes-devtools/python/python3-urllib3_2.0.7.bb similarity index 87% rename from meta/recipes-devtools/python/python3-urllib3_2.0.6.bb rename to meta/recipes-devtools/python/python3-urllib3_2.0.7.bb index cd2a9dd4ef..c286838086 100644 --- a/meta/recipes-devtools/python/python3-urllib3_2.0.6.bb +++ b/meta/recipes-devtools/python/python3-urllib3_2.0.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" -SRC_URI[sha256sum] = "b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564" +SRC_URI[sha256sum] = "c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84" inherit pypi python_hatchling From patchwork Thu Nov 30 20:57:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 35463 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 AEB27C46CC5 for ; Thu, 30 Nov 2023 20:58:00 +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.5138.1701377874014480048 for ; Thu, 30 Nov 2023 12:57:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=0CcfO9IV; 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-6cbe5b6ec62so1384412b3a.1 for ; Thu, 30 Nov 2023 12:57:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377873; x=1701982673; darn=lists.openembedded.org; 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=dsK5WARfnErpRQfJ28g1492peRb8yuvLE+vQenZZ7Fw=; b=0CcfO9IVyUYCdSQXYG73aNuIdkD/Mal0xObBqxKXvOgtDyV3mOfPkGQ7DjFaQhx3h8 m4Q4jDY55pxlUUaySRhX+HEOCDhWigtAzBIlEti72OTVH2sstsZLe/FghEE6oLzZyLbR mkDoQZOr/zDdQStCFoxbEKhFP24ly1plJyqC4+Tb1R7vuiKJsneAzqpcs/ag81vsF3av 7eA80BDHDdoYShSzLhCOBHeFx/P+M+x9JqYzSofRJ4Zbz5CPjVeWUF3XIEN+uM3wwPdx c8Iej8b8Eshrgk1wtsmnrb8kSQ+BXHF6RqlPfp881rGWRN2H9umOc7gKg8zb/RqYpvf8 53NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377873; x=1701982673; 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=dsK5WARfnErpRQfJ28g1492peRb8yuvLE+vQenZZ7Fw=; b=ki5UOpeN7Pe/8NAknZvt9jjg9QJ1OH0C1y+9biqtQtRxXwBEBgtf9Jka25M7o9jDtz sMK5ZHqRqNxzDVg5dZHDySF6VQPAXlxxsdG55UNdzHZRoMQGyJ25HL8sZrfXmBL9Xkma S593C3Z3H5KxGfvM5y2IElxgG9xy92VtScUr/DGIYE5tva8Yh8skOQuiqECHDWks2rEy CR1pUrk8HWoeUcT56kAEjZOsT/M+O2H5siH/UydrDST39HchlbVhsd0GxA5sYHwy4dC3 EIlb1I6sDTigyzOzKulQJygLxFUEMZ/EVMyD2n1ttgz5M/ZYXr+SYuFDJQTwzMUXROh8 GZZQ== X-Gm-Message-State: AOJu0Yw0JojPyGLVIswekTPKGY9SJxeZJ+pVTzxn9zQtR6UNPDwAVY4L uZmeVWdH3ysu1WrxbQbTzuSLUfm3cWsZERcQznMdPA== X-Google-Smtp-Source: AGHT+IHhZ634bUEd4WMc85BvSpkaaew2XWn9yso6bz80xrIrYkgMwGe98oUXgQ3UyjO8KHg1GcjHWg== X-Received: by 2002:a05:6a00:1ca6:b0:6cd:fd5c:3c01 with SMTP id y38-20020a056a001ca600b006cdfd5c3c01mr95559pfw.15.1701377872636; Thu, 30 Nov 2023 12:57:52 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 07/25] qemu: Upgrade 8.1.0 -> 8.1.2 Date: Thu, 30 Nov 2023 10:57:15 -1000 Message-Id: <3ab0c546f656a86dfbf716bb8f4d1d8b27f16692.1701377676.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, 30 Nov 2023 20:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191525 From: Richard Purdie Drop three backport patches as they're applied upstream. ( cherry-pick from commit 7480ff9064a74858e83e0ae275dbdb78dd6fc2a4 ) Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- ...u-native_8.1.0.bb => qemu-native_8.1.2.bb} | 0 ...e_8.1.0.bb => qemu-system-native_8.1.2.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 5 +- ...t-data-in-bounds-in-iotlb_to_section.patch | 42 ----- ...u-Use-async_run_on_cpu-in-tcg_commit.patch | 157 ------------------ .../qemu/qemu/CVE-2023-42467.patch | 49 ------ .../qemu/{qemu_8.1.0.bb => qemu_8.1.2.bb} | 0 7 files changed, 1 insertion(+), 252 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_8.1.0.bb => qemu-native_8.1.2.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_8.1.0.bb => qemu-system-native_8.1.2.bb} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch rename meta/recipes-devtools/qemu/{qemu_8.1.0.bb => qemu_8.1.2.bb} (100%) diff --git a/meta/recipes-devtools/qemu/qemu-native_8.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_8.1.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_8.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_8.1.2.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_8.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 78c495516f..5ab2cb83b4 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,18 +29,15 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ - file://0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch \ - file://0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch \ file://fixedmeson.patch \ file://fixmips.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ - file://CVE-2023-42467.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55" +SRC_URI[sha256sum] = "541526a764576eb494d2ff5ec46aeb253e62ea29035d1c23c0a8af4e6cd4f087" SRC_URI:append:class-target = " file://cross.patch" SRC_URI:append:class-nativesdk = " file://cross.patch" diff --git a/meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch b/meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch deleted file mode 100644 index 7380e16ab3..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 86e4f93d827d3c1efd00cd8a906e38a2c0f2b5bc Mon Sep 17 00:00:00 2001 -From: Richard Henderson -Date: Fri, 25 Aug 2023 14:06:58 -0700 -Subject: [PATCH] softmmu: Assert data in bounds in iotlb_to_section -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Acked-by: Alex Bennée -Suggested-by: Alex Bennée -Signed-off-by: Richard Henderson - -Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/86e4f93d827d3c1efd00cd8a906e38a2c0f2b5bc] ---- - softmmu/physmem.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/softmmu/physmem.c b/softmmu/physmem.c -index 3df73542e1..7597dc1c39 100644 ---- a/softmmu/physmem.c -+++ b/softmmu/physmem.c -@@ -2413,9 +2413,15 @@ MemoryRegionSection *iotlb_to_section(CPUState *cpu, - int asidx = cpu_asidx_from_attrs(cpu, attrs); - CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx]; - AddressSpaceDispatch *d = qatomic_rcu_read(&cpuas->memory_dispatch); -- MemoryRegionSection *sections = d->map.sections; -+ int section_index = index & ~TARGET_PAGE_MASK; -+ MemoryRegionSection *ret; -+ -+ assert(section_index < d->map.sections_nb); -+ ret = d->map.sections + section_index; -+ assert(ret->mr); -+ assert(ret->mr->ops); - -- return §ions[index & ~TARGET_PAGE_MASK]; -+ return ret; - } - - static void io_mem_init(void) --- -2.34.1 - diff --git a/meta/recipes-devtools/qemu/qemu/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch b/meta/recipes-devtools/qemu/qemu/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch deleted file mode 100644 index 8289b45991..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 0d58c660689f6da1e3feff8a997014003d928b3b Mon Sep 17 00:00:00 2001 -From: Richard Henderson -Date: Fri, 25 Aug 2023 16:13:17 -0700 -Subject: [PATCH] softmmu: Use async_run_on_cpu in tcg_commit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -After system startup, run the update to memory_dispatch -and the tlb_flush on the cpu. This eliminates a race, -wherein a running cpu sees the memory_dispatch change -but has not yet seen the tlb_flush. - -Since the update now happens on the cpu, we need not use -qatomic_rcu_read to protect the read of memory_dispatch. - -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1826 -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1834 -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1846 -Tested-by: Alex Bennée -Reviewed-by: Alex Bennée -Signed-off-by: Richard Henderson - -Upstream-Status: Backport [0d58c660689f6da1e3feff8a997014003d928b3b] ---- - accel/tcg/cpu-exec-common.c | 30 ---------------------------- - include/exec/cpu-common.h | 1 - - softmmu/physmem.c | 40 +++++++++++++++++++++++++++---------- - 3 files changed, 29 insertions(+), 42 deletions(-) - -Index: qemu-8.1.0/accel/tcg/cpu-exec-common.c -=================================================================== ---- qemu-8.1.0.orig/accel/tcg/cpu-exec-common.c -+++ qemu-8.1.0/accel/tcg/cpu-exec-common.c -@@ -33,36 +33,6 @@ void cpu_loop_exit_noexc(CPUState *cpu) - cpu_loop_exit(cpu); - } - --#if defined(CONFIG_SOFTMMU) --void cpu_reloading_memory_map(void) --{ -- if (qemu_in_vcpu_thread() && current_cpu->running) { -- /* The guest can in theory prolong the RCU critical section as long -- * as it feels like. The major problem with this is that because it -- * can do multiple reconfigurations of the memory map within the -- * critical section, we could potentially accumulate an unbounded -- * collection of memory data structures awaiting reclamation. -- * -- * Because the only thing we're currently protecting with RCU is the -- * memory data structures, it's sufficient to break the critical section -- * in this callback, which we know will get called every time the -- * memory map is rearranged. -- * -- * (If we add anything else in the system that uses RCU to protect -- * its data structures, we will need to implement some other mechanism -- * to force TCG CPUs to exit the critical section, at which point this -- * part of this callback might become unnecessary.) -- * -- * This pair matches cpu_exec's rcu_read_lock()/rcu_read_unlock(), which -- * only protects cpu->as->dispatch. Since we know our caller is about -- * to reload it, it's safe to split the critical section. -- */ -- rcu_read_unlock(); -- rcu_read_lock(); -- } --} --#endif -- - void cpu_loop_exit(CPUState *cpu) - { - /* Undo the setting in cpu_tb_exec. */ -Index: qemu-8.1.0/include/exec/cpu-common.h -=================================================================== ---- qemu-8.1.0.orig/include/exec/cpu-common.h -+++ qemu-8.1.0/include/exec/cpu-common.h -@@ -133,7 +133,6 @@ static inline void cpu_physical_memory_w - { - cpu_physical_memory_rw(addr, (void *)buf, len, true); - } --void cpu_reloading_memory_map(void); - void *cpu_physical_memory_map(hwaddr addr, - hwaddr *plen, - bool is_write); -Index: qemu-8.1.0/softmmu/physmem.c -=================================================================== ---- qemu-8.1.0.orig/softmmu/physmem.c -+++ qemu-8.1.0/softmmu/physmem.c -@@ -680,8 +680,7 @@ address_space_translate_for_iotlb(CPUSta - IOMMUTLBEntry iotlb; - int iommu_idx; - hwaddr addr = orig_addr; -- AddressSpaceDispatch *d = -- qatomic_rcu_read(&cpu->cpu_ases[asidx].memory_dispatch); -+ AddressSpaceDispatch *d = cpu->cpu_ases[asidx].memory_dispatch; - - for (;;) { - section = address_space_translate_internal(d, addr, &addr, plen, false); -@@ -2412,7 +2411,7 @@ MemoryRegionSection *iotlb_to_section(CP - { - int asidx = cpu_asidx_from_attrs(cpu, attrs); - CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx]; -- AddressSpaceDispatch *d = qatomic_rcu_read(&cpuas->memory_dispatch); -+ AddressSpaceDispatch *d = cpuas->memory_dispatch; - int section_index = index & ~TARGET_PAGE_MASK; - MemoryRegionSection *ret; - -@@ -2487,23 +2486,42 @@ static void tcg_log_global_after_sync(Me - } - } - -+static void tcg_commit_cpu(CPUState *cpu, run_on_cpu_data data) -+{ -+ CPUAddressSpace *cpuas = data.host_ptr; -+ -+ cpuas->memory_dispatch = address_space_to_dispatch(cpuas->as); -+ tlb_flush(cpu); -+} -+ - static void tcg_commit(MemoryListener *listener) - { - CPUAddressSpace *cpuas; -- AddressSpaceDispatch *d; -+ CPUState *cpu; - - assert(tcg_enabled()); - /* since each CPU stores ram addresses in its TLB cache, we must - reset the modified entries */ - cpuas = container_of(listener, CPUAddressSpace, tcg_as_listener); -- cpu_reloading_memory_map(); -- /* The CPU and TLB are protected by the iothread lock. -- * We reload the dispatch pointer now because cpu_reloading_memory_map() -- * may have split the RCU critical section. -+ cpu = cpuas->cpu; -+ -+ /* -+ * Defer changes to as->memory_dispatch until the cpu is quiescent. -+ * Otherwise we race between (1) other cpu threads and (2) ongoing -+ * i/o for the current cpu thread, with data cached by mmu_lookup(). -+ * -+ * In addition, queueing the work function will kick the cpu back to -+ * the main loop, which will end the RCU critical section and reclaim -+ * the memory data structures. -+ * -+ * That said, the listener is also called during realize, before -+ * all of the tcg machinery for run-on is initialized: thus halt_cond. - */ -- d = address_space_to_dispatch(cpuas->as); -- qatomic_rcu_set(&cpuas->memory_dispatch, d); -- tlb_flush(cpuas->cpu); -+ if (cpu->halt_cond) { -+ async_run_on_cpu(cpu, tcg_commit_cpu, RUN_ON_CPU_HOST_PTR(cpuas)); -+ } else { -+ tcg_commit_cpu(cpu, RUN_ON_CPU_HOST_PTR(cpuas)); -+ } - } - - static void memory_map_init(void) diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch deleted file mode 100644 index 86ab7cf81a..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7cfcc79b0ab800959716738aff9419f53fc68c9c Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Thu, 5 Oct 2023 06:01:10 +0000 -Subject: [PATCH] hw/scsi/scsi-disk: Disallow block sizes smaller than 512 - [CVE-2023-42467] - -We are doing things like - - nb_sectors /= (s->qdev.blocksize / BDRV_SECTOR_SIZE); - -in the code here (e.g. in scsi_disk_emulate_mode_sense()), so if -the blocksize is smaller than BDRV_SECTOR_SIZE (=512), this crashes -with a division by 0 exception. Thus disallow block sizes of 256 -bytes to avoid this situation. - -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1813 -CVE: 2023-42467 -Signed-off-by: Thomas Huth -Message-ID: <20230925091854.49198-1-thuth@redhat.com> -Signed-off-by: Paolo Bonzini - -CVE: CVE-2023-42467 - -Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/7cfcc79b0ab800959716738aff9419f53fc68c9c] - -Signed-off-by: Yogita Urade ---- - hw/scsi/scsi-disk.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c -index e0d79c796..477ee2bcd 100644 ---- a/hw/scsi/scsi-disk.c -+++ b/hw/scsi/scsi-disk.c -@@ -1628,9 +1628,10 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) - * Since the existing code only checks/updates bits 8-15 of the block - * size, restrict ourselves to the same requirement for now to ensure - * that a block size set by a block descriptor and then read back by -- * a subsequent SCSI command will be the same -+ * a subsequent SCSI command will be the same. Also disallow a block -+ * size of 256 since we cannot handle anything below BDRV_SECTOR_SIZE. - */ -- if (bs && !(bs & ~0xff00) && bs != s->qdev.blocksize) { -+ if (bs && !(bs & ~0xfe00) && bs != s->qdev.blocksize) { - s->qdev.blocksize = bs; - trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); - } --- -2.40.0 diff --git a/meta/recipes-devtools/qemu/qemu_8.1.0.bb b/meta/recipes-devtools/qemu/qemu_8.1.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_8.1.0.bb rename to meta/recipes-devtools/qemu/qemu_8.1.2.bb From patchwork Thu Nov 30 20:57: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: 35461 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 AEABDC46CA9 for ; Thu, 30 Nov 2023 20:58:00 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.5140.1701377875399781983 for ; Thu, 30 Nov 2023 12:57:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=GKkfRpJs; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6cbe716b511so1407109b3a.3 for ; Thu, 30 Nov 2023 12:57:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377874; x=1701982674; darn=lists.openembedded.org; 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=aR0sNvsIDrPgt44HAwyi4g1vlxO3gpmty61bBam4NnA=; b=GKkfRpJs/YIbtvZRB2GKH411CeEocQzng+aZuN/jS8BNRgG1sWbnIXxwuIgNUR3lrV gE16MnxpisPMVO8ovnnVvjapr1ERHkWH0GnoQE/2IFxafrPzuMuyGwbCbRvnf9rjhGPW p/Xihp3LrVbu0GL8+bxJGOP2RIdfpyiUFbCz3K5rw9zAl3HGE2lOQ6F64F/18849eMj0 pu3mWPj6GkcSxaLBQoO96s3rt4T6bG/S2x52iJ+7DWs7+9y3u7gXQZHrZ8PqNmQGc3MJ KuNf0ee1U1/H0yAGED8odg2/+jXlCZ0aY96S09/okWIWZ1ZG77USFJXcDCMSEsGiARbQ UErA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377874; x=1701982674; 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=aR0sNvsIDrPgt44HAwyi4g1vlxO3gpmty61bBam4NnA=; b=k1yhEdVGA9BvmKdUjx0NisYHcDqsx4dlBVo/F5YdsKgP8Ik6GXHXjidfoAJx3Rlqmx 3FQly+9k8Qy9DvU9jbu3hIbkSaLPQF2l6ZfQSwPaKVQ3MmXW6E4x34cFkoxHBEKL2BEn M4o6FxREDottXvPgNvZkKqtjya4mjw5nZ/wQCat86EtwQCPS0tUWzbmLyHAMaoExlMVU +oei2grgGTBvho6C/jZ3SZoxROj9hH3FIfJl42E/9kvEcUDUJJVPrDlXq9DsocJuesVY onFTiOCfcdicSvl+stXkCODon/bjvlFvyMBU5r6YXF+Ex5i/RHuwQlKHcf2lHqcFGMeY q/8w== X-Gm-Message-State: AOJu0YwsmHb2Fm4ibXxyfv6p77JhJSyHGAm4nWrgNBw3n0thuRodwf8K oOYJCkAZ/LaAV2qsVG3MjY5l3Vv78oQy/0WUpTrGyw== X-Google-Smtp-Source: AGHT+IGaEr8ltDU2pruDmtMhFCcvxKyH3Cv5SIb+f4iyDv1+F7o0xnna2KddmI+bMn0RLJ/Rj5M66A== X-Received: by 2002:a05:6a20:3944:b0:18b:3168:d1a1 with SMTP id r4-20020a056a20394400b0018b3168d1a1mr26847858pzg.46.1701377874507; Thu, 30 Nov 2023 12:57:54 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:54 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 08/25] xwayland: upgrade to 23.2.2 Date: Thu, 30 Nov 2023 10:57: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, 30 Nov 2023 20:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191526 From: Ross Burton e4487cae1 Bump version to 23.2.2 1e8478455 Xi/randr: fix handling of PropModeAppend/Prepend (CVE-2023-5367) 829a99117 Switch to libbsd-overlay 4f8a851b6 xwayland: Cancel the EI disconnect timer when freed cc79b2a83 glamor: xv: Fix invalid accessing of plane attributes for NV12 07c18c90e xwayland: Give up on EI on setup failure 10353a01a xwayland: Add an option to enable EI portal support 4f8e209d2 xwayland/glamor/gbm: Set GBM_BO_USE_LINEAR if only LINEAR modifier is supported c9a842e60 xwayland/present: Handle NULL window_priv in xwl_present_cleanup 2bd43be92 glamor: fixes GL_INVALID_ENUM errors on ES if there is no quads ( cherry-pick from commit 7d0fc94d09db76d4c4d6ca9d2da1b30768f68c9e ) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- .../xwayland/{xwayland_23.2.1.bb => xwayland_23.2.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_23.2.1.bb => xwayland_23.2.2.bb} (95%) diff --git a/meta/recipes-graphics/xwayland/xwayland_23.2.1.bb b/meta/recipes-graphics/xwayland/xwayland_23.2.2.bb similarity index 95% rename from meta/recipes-graphics/xwayland/xwayland_23.2.1.bb rename to meta/recipes-graphics/xwayland/xwayland_23.2.2.bb index e97a921a96..9feac147db 100644 --- a/meta/recipes-graphics/xwayland/xwayland_23.2.1.bb +++ b/meta/recipes-graphics/xwayland/xwayland_23.2.2.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "eebc2692c3aa80617d78428bc6ec7b91b254a98214d2a70e997098503cd6ef90" +SRC_URI[sha256sum] = "9f7c0938d2a41e941ffa04f99c35e5db2bcd3eec034afe8d35d5c810a22eb0a8" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" From patchwork Thu Nov 30 20:57: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: 35462 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 8D17BC46CA0 for ; Thu, 30 Nov 2023 20:58:00 +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.web10.5265.1701377877318672659 for ; Thu, 30 Nov 2023 12:57:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YvklGdS/; 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-6cdcef8b400so1413734b3a.1 for ; Thu, 30 Nov 2023 12:57:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377876; x=1701982676; darn=lists.openembedded.org; 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=tfPwZ58poDFwP0TEseVSL9NTdIQmTLLrtCrgZUnSuz0=; b=YvklGdS/eZdM6K4gfasKZoNYf3bkUpfUhq16yAcb9Nm3TWu1vo9inGrZcbHITftYWq 3RgwzAQXMAqZTOoa/2Nt0Xi6cQJQasCkt0NEDQJZDb9E18Ej7OVWQku2CVuoiZam9fQB uyXUcQAuQIYR7vVCIbftCm87+OEN4iuze5DB53TG75rDB2RbKKa0dPcTvuDGsL/I9PT8 VT6dVGdEyYr+W+/CKf3ZREYwWPkgIVFVB7WhBH3RVHsfDQ+wgzO0xzFXAiFhJ2Qq1jbX qsdVrzD79zlg9ISEp29l9QT262dMQm63cn0py0gl4H6dGOk4G6bHpDEaDseNGycISdQX wUZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377876; x=1701982676; 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=tfPwZ58poDFwP0TEseVSL9NTdIQmTLLrtCrgZUnSuz0=; b=VrWnI4DqhTW7C8NdcYevG7FKLYahIXjsk9++ImNWILpYL/+HYryWssxlcZmfJ2QY5n e6TjrkFck+QtFBH/E7BjVh/UhDST21hIUUxIW1w7XE2lMgTBuPyjPDR2aR9GxMJjqWUj UgS0jQjN9zYb/1KilaYlwhormDhxY28UlUsHZOo32/MpQuKPsIx18xY30k5GbjZrZ5xf aqMltEXvp/7RvxA10DE+n9hBrzQuNedtmFMHMXBUd+ap12GPI0FrE72q8eNJuhEqIyBW 7dy2F9MaD3XixvcdE4B0KgMxMsOB7P/e5jI40u0veMfkkPhM9SYDQa2YfHq3Q0OBzIUO mKpA== X-Gm-Message-State: AOJu0Yy8nQy1LaNYRV3Cu4a2SH1zcqmGNawNf+tyZ4GLcp/nvOBmhUfE X30fu1TDy2A9/mGQ6r9gsfMlUSj9Orv7pHJhI4esBA== X-Google-Smtp-Source: AGHT+IGQ1WO9Dvz7pM9qhDTeRjC2yq3jJdzIHTJB2WT7E/DlyRI4Da1BOAdOt4dazhhf24VxW9I9Bg== X-Received: by 2002:a05:6a00:8d94:b0:6cd:ec0b:61ae with SMTP id im20-20020a056a008d9400b006cdec0b61aemr2931569pfb.0.1701377876167; Thu, 30 Nov 2023 12:57:56 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:55 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 09/25] linux-firmware: create separate packages Date: Thu, 30 Nov 2023 10:57:17 -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, 30 Nov 2023 20:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191527 From: Fahad Arslan This is in continuation of earlier commit: 3ddddfc14f805fe7572bba129605869fb848fed4 linux-firmware: create separate package for cirrus and cnm firmwares And creates separate sub packages for firmwares corresponding to following list of licenses: LICENSE.amphion_vpu LICENCE.cw1200 LICENSE.ice_enhanced LICENCE.mediatek LICENCE.microchip LICENCE.moxa LICENSE.nxp_mc_firmware LICENCE.OLPC LICENCE.phanfw LICENCE.qla2xxx LICENCE.ti-keystone LICENCE.wl1251 LICENCE.xc4000 LICENCE.xc5000 LICENCE.xc5000c Signed-off-by: Fahad Arslan Signed-off-by: Alexandre Belloni (cherry picked from commit c110e5708465a6becc611acf97f166302a17ebdf) Signed-off-by: Dmitry Baryshkov Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20230804.bb | 232 +++++++++++++++++- 1 file changed, 228 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb index 1dbe8374bc..0e8005bfc9 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb @@ -12,6 +12,7 @@ LICENSE = "\ & Firmware-amdgpu \ & Firmware-amd-ucode \ & Firmware-amlogic_vdec \ + & Firmware-amphion_vpu \ & Firmware-atheros_firmware \ & Firmware-atmel \ & Firmware-broadcom_bcm43xx \ @@ -32,6 +33,7 @@ LICENSE = "\ & Firmware-i915 \ & Firmware-ibt_firmware \ & Firmware-ice \ + & Firmware-ice_enhanced \ & Firmware-it913x \ & Firmware-iwlwifi_firmware \ & Firmware-IntcSST2 \ @@ -39,11 +41,14 @@ LICENSE = "\ & Firmware-linaro \ & Firmware-Lontium \ & Firmware-Marvell \ + & Firmware-mediatek \ + & Firmware-microchip \ & Firmware-moxa \ & Firmware-myri10ge_firmware \ & Firmware-netronome \ & Firmware-nvidia \ & Firmware-nxp \ + & Firmware-nxp_mc_firmware \ & Firmware-OLPC \ & Firmware-ath9k-htc \ & Firmware-phanfw \ @@ -78,6 +83,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENSE.amdgpu;md5=a2589a05ea5b6bd2b7f4f623c7e7a649 \ file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ + file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \ @@ -99,6 +105,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \ + file://LICENSE.ice_enhanced;md5=f305cfc31b64f95f774f9edd9df0224d \ file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=2ce6786e0fc11ac6e36b54bb9b799f1b \ @@ -107,12 +114,14 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \ file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ + file://LICENCE.microchip;md5=db753b00305675dfbf120e3f24a47277 \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ file://LICENSE.nxp;md5=cca321ca1524d6a1e4fed87486cd82dc \ + file://LICENSE.nxp_mc_firmware;md5=9dc97e4b279b3858cae8879ae2fe5dd7 \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ @@ -152,6 +161,7 @@ NO_GENERIC_LICENSE[Firmware-agere] = "LICENCE.agere" NO_GENERIC_LICENSE[Firmware-amdgpu] = "LICENSE.amdgpu" NO_GENERIC_LICENSE[Firmware-amd-ucode] = "LICENSE.amd-ucode" NO_GENERIC_LICENSE[Firmware-amlogic_vdec] = "LICENSE.amlogic_vdec" +NO_GENERIC_LICENSE[Firmware-amphion_vpu] = "LICENSE.amphion_vpu" NO_GENERIC_LICENSE[Firmware-atheros_firmware] = "LICENCE.atheros_firmware" NO_GENERIC_LICENSE[Firmware-atmel] = "LICENSE.atmel" NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx] = "LICENCE.broadcom_bcm43xx" @@ -173,6 +183,7 @@ NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" NO_GENERIC_LICENSE[Firmware-ibt_firmware] = "LICENCE.ibt_firmware" NO_GENERIC_LICENSE[Firmware-ice] = "LICENSE.ice" +NO_GENERIC_LICENSE[Firmware-ice_enhanced] = "LICENSE.ice_enhanced" NO_GENERIC_LICENSE[Firmware-IntcSST2] = "LICENCE.IntcSST2" NO_GENERIC_LICENSE[Firmware-it913x] = "LICENCE.it913x" NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" @@ -181,11 +192,13 @@ NO_GENERIC_LICENSE[Firmware-linaro] = "LICENCE.linaro" NO_GENERIC_LICENSE[Firmware-Lontium] = "LICENSE.Lontium" NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" NO_GENERIC_LICENSE[Firmware-mediatek] = "LICENCE.mediatek" +NO_GENERIC_LICENSE[Firmware-microchip] = "LICENCE.microchip" NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" NO_GENERIC_LICENSE[Firmware-netronome] = "LICENCE.Netronome" NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" NO_GENERIC_LICENSE[Firmware-nxp] = "LICENSE.nxp" +NO_GENERIC_LICENSE[Firmware-nxp_mc_firmware] = "LICENSE.nxp_mc_firmware" NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw" @@ -240,14 +253,22 @@ do_install() { } -PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ +PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ + ${PN}-cw1200-license ${PN}-cw1200 \ + ${PN}-ralink-license ${PN}-ralink \ ${PN}-mt7601u-license ${PN}-mt7601u \ + ${PN}-mt7650-license ${PN}-mt7650 \ + ${PN}-mt76x2-license ${PN}-mt76x2 \ ${PN}-radeon-license ${PN}-radeon \ ${PN}-amdgpu-license ${PN}-amdgpu \ ${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \ + ${PN}-mediatek-license ${PN}-mediatek \ + ${PN}-microchip-license ${PN}-microchip \ + ${PN}-moxa-license ${PN}-moxa \ ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 \ ${PN}-sd8887 ${PN}-sd8897 ${PN}-sd8997 ${PN}-usb8997 \ ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \ + ${PN}-ti-keystone-license ${PN}-ti-keystone \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rs9113 ${PN}-rs9116 \ ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ @@ -291,7 +312,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-bcm43xx-hdr \ ${PN}-cirrus-license ${PN}-cirrus \ ${PN}-cnm-license ${PN}-cnm \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ + ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ ${PN}-gplv2-license ${PN}-carl9170 \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ \ @@ -317,6 +338,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-ibt-misc \ ${PN}-i915-license ${PN}-i915 \ ${PN}-ice-license ${PN}-ice \ + ${PN}-ice-enhanced-license ${PN}-ice-enhanced \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ ${PN}-bnx2-mips \ ${PN}-liquidio \ @@ -333,7 +355,10 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-nxp9098-sdio \ ${PN}-nxpiw416-sdio \ ${PN}-nxpiw612-sdio \ + ${PN}-nxp-mc-license ${PN}-nxp-mc \ ${PN}-netronome-license ${PN}-netronome \ + ${PN}-olpc-license ${PN}-olpc \ + ${PN}-phanfw-license ${PN}-phanfw \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license ${PN}-qcom-yamato-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ @@ -350,13 +375,38 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qcom-sdm845-adreno ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-qcom-sdm845-thundercomm-db845c-sensors \ ${PN}-qcom-sm8250-adreno ${PN}-qcom-sm8250-audio ${PN}-qcom-sm8250-compute \ + ${PN}-qla2xxx ${PN}-qla2xxx-license \ ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \ ${PN}-lt9611uxc ${PN}-lontium-license \ ${PN}-whence-license \ + ${PN}-wl1251-license ${PN}-wl1251 \ + ${PN}-xc4000-license ${PN}-xc4000 \ + ${PN}-xc5000-license ${PN}-xc5000 \ + ${PN}-xc5000c-license ${PN}-xc5000c \ ${PN}-license \ " +# For Amphion VPU +LICENSE:${PN}-amphion-vpu = "Firmware-amphion_vpu" +LICENSE:${PN}-amphion-vpu-license = "Firmware-amphion_vpu" + +FILES:${PN}-amphion-vpu = "${nonarch_base_libdir}/firmware/amphion/*" +FILES:${PN}-amphion-vpu-license = " \ + ${nonarch_base_libdir}/firmware/LICENSE.amphion_vpu \ +" +RDEPENDS:${PN}-amphion-vpu += "${PN}-amphion-vpu-license" + +# For cw1200 +LICENSE:${PN}-cw1200 = "Firmware-cw1200" +LICENSE:${PN}-cw1200-license = "Firmware-cw1200" + +FILES:${PN}-cw1200 = "${nonarch_base_libdir}/firmware/wsm_22.bin" +FILES:${PN}-cw1200-license = "${nonarch_base_libdir}/firmware/LICENCE.cw1200" + +RDEPENDS:${PN}-cw1200 += "${PN}-cw1200-license" + # For atheros +LICENSE:${PN}-ar5523 = "Firmware-atheros_firmware" LICENSE:${PN}-ar9170 = "Firmware-atheros_firmware" LICENSE:${PN}-ath3k = "Firmware-atheros_firmware" LICENSE:${PN}-ath6k = "Firmware-atheros_firmware" @@ -364,6 +414,9 @@ LICENSE:${PN}-ath9k = "Firmware-atheros_firmware" LICENSE:${PN}-atheros-license = "Firmware-atheros_firmware" FILES:${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware" +FILES:${PN}-ar5523 = " \ + ${nonarch_base_libdir}/firmware/ar5523.bin \ +" FILES:${PN}-ar9170 = " \ ${nonarch_base_libdir}/firmware/ar9170*.fw \ " @@ -382,6 +435,7 @@ FILES:${PN}-ath9k = " \ ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \ " +RDEPENDS:${PN}-ar5523 += "${PN}-atheros-license" RDEPENDS:${PN}-ar9170 += "${PN}-atheros-license" RDEPENDS:${PN}-ath6k += "${PN}-atheros-license" RDEPENDS:${PN}-ath9k += "${PN}-atheros-license" @@ -445,11 +499,73 @@ LICENSE:${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware" FILES:${PN}-mt7601u-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware" FILES:${PN}-mt7601u = " \ ${nonarch_base_libdir}/firmware/mediatek/mt7601u.bin \ + ${nonarch_base_libdir}/firmware/mt7601u.bin \ " - RDEPENDS:${PN}-mt7601u += "${PN}-mt7601u-license" +# For MediaTek Bluetooth USB driver 7650 +LICENSE:${PN}-mt7650 = "Firmware-ralink_a_mediatek_company_firmware" +LICENSE:${PN}-mt7650-license = "Firmware-ralink_a_mediatek_company_firmware" + +FILES:${PN}-mt7650-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware \ +" +FILES:${PN}-mt7650 = " \ + ${nonarch_base_libdir}/firmware/mediatek/mt7650.bin \ + ${nonarch_base_libdir}/firmware/mt7650.bin \ +" +RDEPENDS:${PN}-mt7650 += "${PN}-mt7650-license" + +# For MediaTek MT76x2 Wireless MACs +LICENSE:${PN}-mt76x2 = "Firmware-ralink_a_mediatek_company_firmware" +LICENSE:${PN}-mt76x2-license = "Firmware-ralink_a_mediatek_company_firmware" + +FILES:${PN}-mt76x2-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware \ +" +FILES:${PN}-mt76x2 = " \ + ${nonarch_base_libdir}/firmware/mediatek/mt7662.bin \ + ${nonarch_base_libdir}/firmware/mt7662.bin \ + ${nonarch_base_libdir}/firmware/mediatek/mt7662_rom_patch.bin \ + ${nonarch_base_libdir}/firmware/mt7662_rom_patch.bin \ +" +RDEPENDS:${PN}-mt76x2 += "${PN}-mt76x2-license" + +# For MediaTek +LICENSE:${PN}-mediatek = "Firmware-mediatek" +LICENSE:${PN}-mediatek-license = "Firmware-mediatek" + +FILES:${PN}-mediatek = " \ + ${nonarch_base_libdir}/firmware/mediatek/* \ + ${nonarch_base_libdir}/firmware/vpu_d.bin \ + ${nonarch_base_libdir}/firmware/vpu_p.bin \ +" +FILES:${PN}-mediatek-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.mediatek \ +" +RDEPENDS:${PN}-mediatek += "${PN}-mediatek-license" + +# For Microchip +LICENSE:${PN}-microchip = "Firmware-microchip" +LICENSE:${PN}-microchip-license = "Firmware-microchip" + +FILES:${PN}-microchip = "${nonarch_base_libdir}/firmware/microchip/*" +FILES:${PN}-microchip-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.microchip \ +" +RDEPENDS:${PN}-microchip += "${PN}-microchip-license" + +# For MOXA +LICENSE:${PN}-moxa = "Firmware-moxa" +LICENSE:${PN}-moxa-license = "Firmware-moxa" + +FILES:${PN}-moxa = "${nonarch_base_libdir}/firmware/moxa" +FILES:${PN}-moxa-license = "${nonarch_base_libdir}/firmware/LICENCE.moxa" + +RDEPENDS:${PN}-moxa += "${PN}-moxa-license" + # For radeon + LICENSE:${PN}-radeon = "Firmware-radeon" LICENSE:${PN}-radeon-license = "Firmware-radeon" @@ -604,6 +720,16 @@ RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common" RDEPENDS:${PN}-nxpiw416-sdio += "${PN}-nxp-license" RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-license" +# For nxp-mc +LICENSE:${PN}-nxp-mc = "Firmware-nxp_mc_firmware" +LICENSE:${PN}-nxp-mc-license = "Firmware-nxp_mc_firmware" + +FILES:${PN}-nxp-mc= "${nonarch_base_libdir}/firmware/dpaa2/mc/*" +FILES:${PN}-nxp-mc-license = " \ + ${nonarch_base_libdir}/firmware/LICENSE.nxp_mc_firmware \ +" +RDEPENDS:${PN}-nxp-mc += "${PN}-nxp-mc-license" + # For Nvidia LICENSE:${PN}-nvidia-gpu = "Firmware-nvidia" LICENSE:${PN}-nvidia-tegra = "Firmware-nvidia" @@ -626,6 +752,37 @@ RDEPENDS:${PN}-nvidia-gpu += "${PN}-nvidia-license" RDEPENDS:${PN}-nvidia-tegra += "${PN}-nvidia-license" RDEPENDS:${PN}-nvidia-tegra-k1 += "${PN}-nvidia-license" +# For OLPC +LICENSE:${PN}-olpc = "Firmware-OLPC" +LICENSE:${PN}-olpc-license = "Firmware-OLPC" + +FILES:${PN}-olpc = " \ + ${nonarch_base_libdir}/firmware/libertas/lbtf_sdio.bin \ + ${nonarch_base_libdir}/firmware/lbtf_usb.bin \ + ${nonarch_base_libdir}/firmware/libertas/usb8388_olpc.bin \ +" +FILES:${PN}-olpc-license = "${nonarch_base_libdir}/firmware/LICENCE.OLPC" + +RDEPENDS:${PN}-olpc += "${PN}-olpc-license" + +# For phanfw +LICENSE:${PN}-phanfw = "Firmware-phanfw" +LICENSE:${PN}-phanfw-license = "Firmware-phanfw" + +FILES:${PN}-phanfw = "${nonarch_base_libdir}/firmware/phanfw.bin" +FILES:${PN}-phanfw-license = "${nonarch_base_libdir}/firmware/LICENCE.phanfw" + +RDEPENDS:${PN}-phanfw += "${PN}-phanfw-license" + +# For qla2xxx +LICENSE:${PN}-qla2xxx = "Firmware-qla2xxx" +LICENSE:${PN}-qla2xxx-license = "Firmware-qla2xxx" + +FILES:${PN}-qla2xxx = "${nonarch_base_libdir}/firmware/ql2*" +FILES:${PN}-qla2xxx-license = "${nonarch_base_libdir}/firmware/LICENCE.qla2xxx" + +RDEPENDS:${PN}-qla2xxx += "${PN}-qla2xxx-license" + # For RSI RS911x WiFi LICENSE:${PN}-rs9113 = "WHENCE" LICENSE:${PN}-rs9116 = "WHENCE" @@ -691,6 +848,18 @@ RDEPENDS:${PN}-rtl8761 += "${PN}-rtl-license" RDEPENDS:${PN}-rtl8822 += "${PN}-rtl-license" RDEPENDS:${PN}-rtl8168 += "${PN}-whence-license" +# For TI wl1251 +LICENSE:${PN}-wl1251 = "Firmware-wl1251" +LICENSE:${PN}-wl1251-license = "Firmware-wl1251" + +FILES:${PN}-wl1251 = " \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl1251-fw.bin \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl1251-nvs.bin \ +" +FILES:${PN}-wl1251-license = "${nonarch_base_libdir}/firmware/LICENCE.wl1251" + +RDEPENDS:${PN}-wl1251 += "${PN}-wl1251-license" + # For ti-connectivity LICENSE:${PN}-wlcommon = "Firmware-ti-connectivity" LICENSE:${PN}-wl12xx = "Firmware-ti-connectivity" @@ -720,6 +889,16 @@ FILES:${PN}-wl18xx = " \ RDEPENDS:${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" RDEPENDS:${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" +# For ti-keystone +LICENSE:${PN}-ti-keystone = "Firmware-ti-keystone" +LICENSE:${PN}-ti-keystone-license = "Firmware-ti-keystone" + +FILES:${PN}-ti-keystone = "${nonarch_base_libdir}/firmware/ti-keystone/*" +FILES:${PN}-ti-keystone-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.ti-keystone \ +" +RDEPENDS:${PN}-ti-keystone += "${PN}-ti-keystone-license" + # For vt6656 LICENSE:${PN}-vt6656 = "Firmware-via_vt6656" LICENSE:${PN}-vt6656-license = "Firmware-via_vt6656" @@ -731,6 +910,35 @@ FILES:${PN}-vt6656 = " \ RDEPENDS:${PN}-vt6656 = "${PN}-vt6656-license" +# For xc4000 +LICENSE:${PN}-xc4000 = "Firmware-xc4000" +LICENSE:${PN}-xc4000-license = "Firmware-xc4000" + +FILES:${PN}-xc4000 = "${nonarch_base_libdir}/firmware/dvb-fe-xc4000-1.4.1.fw" +FILES:${PN}-xc4000-license = "${nonarch_base_libdir}/firmware/LICENCE.xc4000" + +RDEPENDS:${PN}-xc4000 += "${PN}-xc4000-license" + +# For xc5000 +LICENSE:${PN}-xc5000 = "Firmware-xc5000" +LICENSE:${PN}-xc5000-license = "Firmware-xc5000" + +FILES:${PN}-xc5000 = "${nonarch_base_libdir}/firmware/dvb-fe-xc5000-1.6.114.fw" +FILES:${PN}-xc5000-license = "${nonarch_base_libdir}/firmware/LICENCE.xc5000" + +RDEPENDS:${PN}-xc5000 += "${PN}-xc5000-license" + +# For xc5000c +LICENSE:${PN}-xc5000c = "Firmware-xc5000c" +LICENSE:${PN}-xc5000c-license = "Firmware-xc5000c" + +FILES:${PN}-xc5000c = " \ + ${nonarch_base_libdir}/firmware/dvb-fe-xc5000c-4.1.30.7.fw \ +" +FILES:${PN}-xc5000c-license = "${nonarch_base_libdir}/firmware/LICENCE.xc5000c" + +RDEPENDS:${PN}-xc5000c += "${PN}-xc5000c-license" + # For broadcom # for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e " \${PN}-$pkg \\"; done | sort -u @@ -1053,10 +1261,26 @@ FILES:${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" FILES:${PN}-i915 = "${nonarch_base_libdir}/firmware/i915" RDEPENDS:${PN}-i915 = "${PN}-i915-license" +# For ice-enhanced +LICENSE:${PN}-ice-enhanced = "Firmware-ice_enhanced" +LICENSE:${PN}-ice-enhanced-license = "Firmware-ice_enhanced" + +FILES:${PN}-ice-enhanced = " \ + ${nonarch_base_libdir}/firmware/intel/ice/ddp-comms/* \ + ${nonarch_base_libdir}/firmware/intel/ice/ddp-wireless_edge/* \ +" +FILES:${PN}-ice-enhanced-license = " \ + ${nonarch_base_libdir}/firmware/LICENSE.ice_enhanced \ +" +RDEPENDS:${PN}-ice-enhanced = "${PN}-ice-enhanced-license" + LICENSE:${PN}-ice = "Firmware-ice" LICENSE:${PN}-ice-license = "Firmware-ice" FILES:${PN}-ice-license = "${nonarch_base_libdir}/firmware/LICENSE.ice" -FILES:${PN}-ice = "${nonarch_base_libdir}/firmware/intel/ice" +FILES:${PN}-ice = " \ + ${nonarch_base_libdir}/firmware/intel/ice/ddp/* \ + ${nonarch_base_libdir}/firmware/intel/ice/ddp-lag/* \ +" RDEPENDS:${PN}-ice = "${PN}-ice-license" FILES:${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst" From patchwork Thu Nov 30 20:57: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: 35457 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 75374C4167B for ; Thu, 30 Nov 2023 20:58:00 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.5144.1701377878578196136 for ; Thu, 30 Nov 2023 12:57:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=2VsnlcNO; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6cbe716b511so1407162b3a.3 for ; Thu, 30 Nov 2023 12:57:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377877; x=1701982677; darn=lists.openembedded.org; 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=CWjoAO92hMADJzgu5K7k88QUSg63MHURWf8XwQs8s58=; b=2VsnlcNOUS967OWGjGG/Zi5CotF7wpa3nklDRJyxOiBajg4TrsCcUS8bEsQUWt16GA 7eM089+9UKBqpfTgDALDCB6XVTMe5Rb/Vsjbwsq2XpCeiUQJ/Ny1QOae79612fOP18fu eqAwdyyDnf+b5gnOBZf/qTOXa4F8YgF617c9ngTofpV8poAemj37bQRvqRkBB6ZAcU0D hq/EfrUYpAa3nYdf6UwLPj/0pteORWCcbFGvSJEXznT3qul0kiGA8FosnXYw+KWmjEt0 xj8w9MSru39uJU3wOj1maIMKoDnpLYZDJnYC19vF5MFGefizt4KivuEDKAr0VnzsXHMp XDsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377877; x=1701982677; 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=CWjoAO92hMADJzgu5K7k88QUSg63MHURWf8XwQs8s58=; b=cvxGNMjvrk3m4fmZWzZw5TeK57eUF98aaS7PWbq7lnxxgp8utjyiy4cnZFNXDjW9mk dDL37WmfG37EbsqEYS0FZcq3pxQygR3EnIM/XTJvW/KyRb4sduxTZUPUJlVDbYVKsHvl Pc1mz8UbsmS/UMGSaKF6mk+/vmx6RlYqb89ORotVOpV3yWGnnwOrfmMCgAROhh9/2xiX PQBH1WhEEiTZPTiHgiEtu2gpzH+eN9S/wVhTk4lKQLLENvmpdKdIBm3EL+T6bombUI9l shhSRpp9L2gEn7wIH67sPwEoMSAYKUywCQBQ4ox4E2BOboTPbQNW23RujWKqKWTLnbh5 hu8g== X-Gm-Message-State: AOJu0Yz83x/9yC8SIdDroR41GAyupGnb3UnIv+cMfMsi366lXn2L+dAS 7lqs7409vAO4XRWzIKJ4VfBUkGK3r9LszdMO02f8Cg== X-Google-Smtp-Source: AGHT+IGpXtvsslQGDdT/1ZyRGJXo5c25X8OlPhPqpT4WiY5IPA4vf2IXgC3Oxei0eqVFu2a2LLZoJw== X-Received: by 2002:a05:6a00:854:b0:68f:ece2:ac2a with SMTP id q20-20020a056a00085400b0068fece2ac2amr25036662pfk.27.1701377877691; Thu, 30 Nov 2023 12:57:57 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:57 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 10/25] linux-firmware: add new fw file to ${PN}-rtl8821 Date: Thu, 30 Nov 2023 10:57:18 -1000 Message-Id: <753a56079375b542e0e22a5bfb76804aa975eeb3.1701377676.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, 30 Nov 2023 20:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191528 From: Bastian Krause Extend the linux-firmware-rtl8821 package with rtw8821 firmware files for Realtek RTL8821 variants. Signed-off-by: Bastian Krause Signed-off-by: Alexandre Belloni (cherry picked from commit 23c945938f8d8bcf5fbd6d9b840ec319aaa40c62) Signed-off-by: Dmitry Baryshkov Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb index 0e8005bfc9..33be741a0a 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb @@ -825,6 +825,7 @@ FILES:${PN}-rtl8723 = " \ " FILES:${PN}-rtl8821 = " \ ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \ + ${nonarch_base_libdir}/firmware/rtw88/rtw8821*.bin \ " FILES:${PN}-rtl8761 = " \ ${nonarch_base_libdir}/firmware/rtl_bt/rtl8761*.bin \ From patchwork Thu Nov 30 20:57:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 35460 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 8CB2CC10DC1 for ; Thu, 30 Nov 2023 20:58:00 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.5146.1701377880186697758 for ; Thu, 30 Nov 2023 12:58:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=nYpm/Waq; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6cdd214bce1so1399768b3a.3 for ; Thu, 30 Nov 2023 12:58:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377879; x=1701982679; darn=lists.openembedded.org; 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=rxDWKdpAQmaUK1OoFnL2xEF3rteHWdKdyFnp/baJ5wM=; b=nYpm/WaqAK/24IVdTWOxlX0T0xF2zzZAzt8ACTuwId7J1sptpcqUZvUjttpAyBmhuk oQ8lMSPuGnv1kC5AV245K8nBZovDdsbiOT27SgWBYZtd8kKKYz6b7aemKdiQ45YI0OyI TKAPMJCZxpeFhm8JlqCEsaD3ptHKASTNXSHqPiE33sYyrz/zj/T590abUWh64IlIFVP2 J7zU07MaegA427k6EWLxv4UTHTQ6zXeyNb1R6hUGvaZBIBmeYRIFzTFCIBISzjzxg6Gr JhQpe612+EUznyq8xdbRO6eqTLiDLgj3uJ3mOU/xWshcSeboRCMRj6nXjWqFgZEJwYk8 mIug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377879; x=1701982679; 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=rxDWKdpAQmaUK1OoFnL2xEF3rteHWdKdyFnp/baJ5wM=; b=QahBIz0dC96FZ9aU7j3xAVSsgQaaWj+9Ws4T8IqR6ROLKd9rxXHa3WBLypKqwiDXoo gxn5kncAqFk4S+uOUVU+VWdKOrppMAzI8ZkFYugu50olIj9pSOfDo5e0tF7wj3OhkYS3 SSYM3Tgf2EOERjWIJ14y8mT2OjnVqTFrmV+OZAqWlE3Gp5symaojiR3UzUOihcn9FNqY 2jDzfY2v5u6hbRB3QdVhrHETk8vz/4jghZfl/0kUuevkf5ulzSjNxT0OAVaxoR3VqfUa vYUVGpcXYYF5N8CJjYsryis8v7facYQzRycSFivG3O4Lw2sEREzWXy1qJclFiI6Qr8oN fuUw== X-Gm-Message-State: AOJu0Yx9FW2bQGKFgcRvn5HxzAmEGZDBJbfJbBX8xKyO4nc6f0pvFHWO lsZDbH+s+ZFZT9mF+xP8KhqyVaTJRWrZgsWGG1D4WA== X-Google-Smtp-Source: AGHT+IEaIF53eQSxelRC+eGPnGdy7FDWYosVyEywm0fCK8pAsoYcNSfCtK1OF1wbeeCaDHpSUYh6Bg== X-Received: by 2002:a05:6a20:8f1a:b0:18c:4b78:37a8 with SMTP id b26-20020a056a208f1a00b0018c4b7837a8mr22946969pzk.45.1701377879235; Thu, 30 Nov 2023 12:57:59 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.57.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:57:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 11/25] linux-firmware: upgrade 20230804 -> 20231030 Date: Thu, 30 Nov 2023 10:57:19 -1000 Message-Id: <4027a2961d023c3788ec6d08b8f55b2b64bbc005.1701377676.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, 30 Nov 2023 20:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191529 From: Dmitry Baryshkov License-Update: additional firmwares Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit 7c725d1f2ed9a271d39d899ac2534558c2d103fc) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20230804.bb => linux-firmware_20231030.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20230804.bb => linux-firmware_20231030.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index 33be741a0a..fd38253dfd 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -151,7 +151,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "41f9a48bf27971b126a36f9344594dcd" +WHENCE_CHKSUM = "ceb5248746d24d165b603e71b288cf75" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -237,7 +237,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "88d46c543847ee3b03404d4941d91c92974690ee1f6fdcbee9cef3e5f97db688" +SRC_URI[sha256sum] = "c98d200fc4a3120de1a594713ce34e135819dff23e883a4ed387863ba25679c7" inherit allarch From patchwork Thu Nov 30 20:57: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: 35468 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 AC598C4167B for ; Thu, 30 Nov 2023 20:58:10 +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.5148.1701377881757661674 for ; Thu, 30 Nov 2023 12:58:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=n96/jrYo; 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-6cc02e77a9cso1369416b3a.0 for ; Thu, 30 Nov 2023 12:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377881; x=1701982681; darn=lists.openembedded.org; 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=8TxCZiVrtw3m4MrN00NPriz7JcQHq+MmYRw3VhMfNBA=; b=n96/jrYo8VFwrsj2zUM+aR8P0tDUuiF3GBAvU/yQx/MDTk23JswMHKXkdYYAkvD1oW DUL/SJWHG2zJ+lS+DDEiY5qU0c+lSEp8LD15HpsWqP0JuzZgFLWsoVoGr2njf/Yf2y0Z 5v/aD7z4YYI0wL+vfVPC5nDHlteMXJGaMnkQf4l07tRRz9zhees2etcLvjva0TNL/QJh y5IRAs7tNPXikfWW3Gk11i+mlFqLRr60b4k7t/deWyia6+zsH647OEgl+PHml4EubTNL efEAykFkMn8WFSkq3ijRBZMExU9Iiy8bYR+5xdiY8674lAUqpZYqnrej1Z5hPMGHPsPi aeIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377881; x=1701982681; 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=8TxCZiVrtw3m4MrN00NPriz7JcQHq+MmYRw3VhMfNBA=; b=cjTo3PSrm47FkMJXN/B+dIDuLdMwQdKRQIuD7zI+ckNfT2n8USK8iCAicWTHAVi9y0 YZkVQen5WnNx/7iy7UTxDqnY7R9dQ31smTKaDUsQm1s8mbYcVxFQFQ+olZHjJ1h6tF9S wNgsbd1tmcrGV73OtvPtZ01cnDjBNzqDwc/eJQqeHttFskF2zPp8ZPFfqYVhNAVMo0my /a2QxiwX2fFMhecu2dHspJxRlI84SgYU+TCVGT16mB1Sbg+bpfnHqQfmZSou1Tsj2SSq xeClQZBCq2WT2erS4qrkPiTIMgDpXBfCbOI9FOy+VUtuO5dtieIDvBDGcybHNVjLQtth XxNQ== X-Gm-Message-State: AOJu0YyS0luz9P4OXSnzLBb7Gq+E6TlRbqXl9gR4Q6f/e5WUMmt+mliL K6S6YKN2144fnfQiTOiZJvNYZuJRWKB+S/KBk7vgzg== X-Google-Smtp-Source: AGHT+IH7Ra0WFlLKeoDz8zyOj6TuLKnG9xcG7cCrs+stIv44ICJ92IXRvD90HxoJu3O9KeHccAA9nw== X-Received: by 2002:a05:6a20:e68c:b0:18b:cd6c:5147 with SMTP id mz12-20020a056a20e68c00b0018bcd6c5147mr24836734pzb.8.1701377880942; Thu, 30 Nov 2023 12:58:00 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 12/25] linux-firmware: add missing depenencies on license packages Date: Thu, 30 Nov 2023 10:57:20 -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, 30 Nov 2023 20:58:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191530 From: Dmitry Baryshkov Several Adreno packages lack dependency on the package with the license file. Add corresponding RDEPENDS. Fixes: bf00a042d2fa ("linux-firmware: split platform-specific Adreno shaders to separate packages") Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit 9b9f7fef59cca72c3cd0aedd040a15e77ad5a2b2) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index fd38253dfd..895d36cc02 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -1380,16 +1380,19 @@ RDEPENDS:${PN}-qcom-adreno-a650 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a660 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8016-modem = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8016-wifi = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-apq8096-adreno = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8096-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8096-modem = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-sensors = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-sdm845-adreno = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sdm845-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sdm845-compute = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sdm845-modem = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sdm845-thundercomm-db845c-sensors = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-sm8250-adreno = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sm8250-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sm8250-compute = "${PN}-qcom-license" From patchwork Thu Nov 30 20:57: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: 35466 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 C9816C07CA9 for ; Thu, 30 Nov 2023 20:58:10 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.5153.1701377883187780122 for ; Thu, 30 Nov 2023 12:58:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=popOBRlb; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6cde4aeea29so1183801b3a.2 for ; Thu, 30 Nov 2023 12:58:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377882; x=1701982682; darn=lists.openembedded.org; 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=kSKHBupi9ByocfX5O00GdeaOMBAxWuM9HZ0IgwD96mQ=; b=popOBRlblVTfgRcbxr0DssCA6yne4ETZsJ7Z2UcHKl+KN0UslEyjMfiAt1etB+iG7A UdCdG6WZqnEI4jSc9pK03uDLFUO4qT3UaEbWijkE7tB8xOxNmgfcNRxDYH/TRQhj6aHi J/W65ipDhcY2XQVG78uCyoQrQyAdl1vwo8CzqiqcRWzHjHtk6YAszfNEohyS/kBPI5oH Sdg3QGfQsQucz2jorgX1QBqCSu2yS/FrbaxGjfMWVO9aOWgYzA5t61Y5rgvJRSWo7XEa gkHbNs62xiaxm1iRkbFvCrT4b9LQSnieOF7XPPM7QSbJ1/5Bg5N4JwmZ7sFS5LmtTa9i ychA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377882; x=1701982682; 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=kSKHBupi9ByocfX5O00GdeaOMBAxWuM9HZ0IgwD96mQ=; b=NT9RkT06bZLWpHIfMK1MykgqPkw9doV5xUvHVa8W12frf9+CGsX48u3wf7401HxXJH h0BKzzW+SDaB9zmikjG/6zZA8eC2De2d7GHDzTXb/1/7A6NFwCPO1z00TSRdvna6gLWl bXbEC1AZqpwWOdSamcJzWxHIfoP1lPX623AF28UaKmjVO+qeH3bdY20t1YLL9sDG7xcx JZVJ+OfVnNy33/BsGrdUkHKuZCqG4DmZVMDgZxYKyTzJl1M4MW4i+PwwWoWWn/zXun3S Hy78O8qO0X3ADk5UzOA9lpoaL/74jM7KA72VZq6XppO/0Y5O6yz8Kvl8H3jV9ygdpvrz qk+Q== X-Gm-Message-State: AOJu0YwIzqj33MnxhYpLqEGx/dbHFIyoUUra21OjIQVTuzFrOEKb6JgK POY3HEu8pmQSPQoizX2co/6jbNB7EiOekMzVjw0RTg== X-Google-Smtp-Source: AGHT+IEjHJxjsYRHsLZMJp7CXD2V593aaa5xUqNgscizHgkMvmBTaoMEMmqTmdRaFpIHEZ9HGDfhZw== X-Received: by 2002:a05:6a20:144e:b0:18a:d766:cae1 with SMTP id a14-20020a056a20144e00b0018ad766cae1mr21111620pzi.54.1701377882413; Thu, 30 Nov 2023 12:58:02 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 13/25] linux-firmware: add notice file to sdm845 modem firmware Date: Thu, 30 Nov 2023 10:57: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, 30 Nov 2023 20:58:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191531 From: Dmitry Baryshkov Follow the upstream change (which moved wlanmdsp and notice files from ath10k to sdm845 dir) and include notice file into the sdm845 modem firmware package. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit e03d1b9cc06ae23a8abc8a30b1c09bd997465400) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index 895d36cc02..2d446848fd 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -1359,7 +1359,7 @@ FILES:${PN}-qcom-sc8280xp-lenovo-x13s-sensors = "${nonarch_base_libdir}/firmware FILES:${PN}-qcom-sdm845-adreno = "${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" FILES:${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES:${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" -FILES:${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" +FILES:${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/notice.txt_wlanmdsp" FILES:${PN}-qcom-sdm845-thundercomm-db845c-sensors = "${nonarch_base_libdir}/firmware/qcom/sdm845/Thundercomm/db845c/slpi*.*" FILES:${PN}-qcom-sm8250-adreno = "${nonarch_base_libdir}/firmware/qcom/sm8250/a650*.*" FILES:${PN}-qcom-sm8250-audio = "${nonarch_base_libdir}/firmware/qcom/sm8250/adsp*.*" From patchwork Thu Nov 30 20:57: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: 35467 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 C99A2C46CA0 for ; Thu, 30 Nov 2023 20:58:10 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.5273.1701377885251979741 for ; Thu, 30 Nov 2023 12:58:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aPK/UIbS; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6cdedb683f9so857792b3a.0 for ; Thu, 30 Nov 2023 12:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377884; x=1701982684; darn=lists.openembedded.org; 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=IDRlV2ZmYYXqdxogTav9VlOCAxLOUiyDOAw3pcZEz7k=; b=aPK/UIbSjEaw0y6HmpximXvflWWNHZXazEZ9cZb6lFeoV1a81OFla0IeAjTKUGjUvu vedH40pn1dMJvABiOsjCuOTrtH6h3YEnoGBdycnrxYgC9BnjQex9RqRgi8ylC40izyCZ v0n5Jf6xXFEe1sgWmKNVAs/pmjwxd2w7HcBGBW6ZCtfW1qL/NPJvhBHUAnKG7xQ/BKjO ccVpLswY56gjnOhxRMuKNd405jteLl8uj/iifwFuyxO+2bifOG294IXdn+MfGfwXQm3+ UW+ru0dwN3sExDL7DICmFNCnp1LqZKfenxfq3En7ZnVXYCPaQRZtsQbU5RnW2q2RkpLN dnQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377884; x=1701982684; 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=IDRlV2ZmYYXqdxogTav9VlOCAxLOUiyDOAw3pcZEz7k=; b=NsB3cnECYsrzUIBzhzqxjB1167EF1KMaImgjzjjqYznWKxohTc6wfxxI5vGYkASp/V wOM6ZZL988cEFoTz3INWmAyQtt5PPUIVLArg+YNna82EQu8dcBJtSUrTJlhe1L832Ei7 Pq9QETVY0kJxOPwwE+eoHsoqJnROCF7Ftb8JfBWmELKDnMXSdPyvpDND0GieCneSYs66 2pKe/Kg+jby1mMGcs9rZUtp1uipQWjimv0vxrR8QHUGPCbw2fKtheTiyxbVqh3gXER6W HMZbqSWbZfGqAPyQI5PnQWRh1jpJwr/J1vEaXtssO0bFS2uXfkUflurYuXHOqOasUtKp 2t4g== X-Gm-Message-State: AOJu0YxE2h4DdQ+DoqAvC2LeBIARF4Y9ceUhx/A+OazPC5+ATfZ1Z2Rk cT8QA9VQSw9FMDEDd5Q66Y5EFlycx3a+OPMdJcvzWQ== X-Google-Smtp-Source: AGHT+IFDPul5eIwZAfZdUcwWMNKtdUoAEztVO/uQ76Qj4oPa6TCIC9aLbKLFGaJuJioK8mb8JkUmeA== X-Received: by 2002:a05:6a00:23c1:b0:6cb:8cb8:2f79 with SMTP id g1-20020a056a0023c100b006cb8cb82f79mr24431920pfc.22.1701377883940; Thu, 30 Nov 2023 12:58:03 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 14/25] linux-firmware: add audio topology symlink to the X13's audio package Date: Thu, 30 Nov 2023 10:57:22 -1000 Message-Id: <49c756b5752d1e0c9957deb336c86a5fb8fc8abd.1701377676.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, 30 Nov 2023 20:58:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191532 From: Dmitry Baryshkov Add new symlink required for the sound driver to find the audio topology to the linux-firmware--qcom-sc8280xp-lenovo-x13s-audio package. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit 313135eaa236872e4aa5f698515a3363eb75601f) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index 2d446848fd..800c621d6d 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -1352,7 +1352,7 @@ FILES:${PN}-qcom-apq8096-adreno = "${nonarch_base_libdir}/firmware/qcom/apq8096/ FILES:${PN}-qcom-apq8096-audio = "${nonarch_base_libdir}/firmware/qcom/apq8096/adsp*.*" FILES:${PN}-qcom-apq8096-modem = "${nonarch_base_libdir}/firmware/qcom/apq8096/mba.mbn ${nonarch_base_libdir}/firmware/qcom/apq8096/modem*.* ${nonarch_base_libdir}/firmware/qcom/apq8096/wlanmdsp.mbn" FILES:${PN}-qcom-sc8280xp-lenovo-x13s-compat = "${nonarch_base_libdir}/firmware/qcom/LENOVO/21BX" -FILES:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*adsp*.* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin" +FILES:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*adsp*.* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin ${nonarch_base_libdir}/firmware/qcom/sc8280xp/SC8280XP-LENOVO-X13S-tplg.bin" FILES:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn" FILES:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*cdsp*.*" FILES:${PN}-qcom-sc8280xp-lenovo-x13s-sensors = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*slpi*.*" From patchwork Thu Nov 30 20:57: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: 35469 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 D7296C10DC2 for ; Thu, 30 Nov 2023 20:58:10 +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.5156.1701377886540269841 for ; Thu, 30 Nov 2023 12:58:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=NQXOSNgT; 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-6cdd584591eso1409439b3a.2 for ; Thu, 30 Nov 2023 12:58:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377886; x=1701982686; darn=lists.openembedded.org; 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=b1IEPeV7y9azAnEQc+JMcCj6y3anlcPqDkSElaKKwJw=; b=NQXOSNgT00e/N2trPkJ7nZJA4cQvCGo7hTLSZbO+RjcsqAiZByCsg9LV7im1icvbpB e9ZbVXx8nkgjKwORbubfV0OBWxkPfnfaERYsieI7uVcx9sJV2v7WfufpcbbskbfiUAFB iQVketQZoE6meah9ID3/gxJNfbfLzM5O7efN5Cm/tqzRyWb9XM+ArkzSNzuL2L/nw01H 02G5QVYdZGxSlZFh2a+n+vH/5bjL+A0wgvKweANTWAlPFWvGraZMJMp//z/t+A5Jzd7i VS8ACWQ3yabIKziWNxzI8oM3EnyWMUtGlSo36ZCcPEFVDKEb72ZypR4lAH6IuCwVLlJa gJjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377886; x=1701982686; 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=b1IEPeV7y9azAnEQc+JMcCj6y3anlcPqDkSElaKKwJw=; b=bNpNb03N1HNcKYSmQEXJjMBYlh9lCHUmIT9fRquJBqsRfUdx/r1vu1bs4ROPAHlCJU 5S1L4xIUYq3B9UHXPy2bzWPMkl35cEFBurdk5XFwse1JoXdZ91w1y3a2Td0OSlnXu//n DM8WM56xNyD6LyJxxSP9c7XoJYISUN2LfSJCFUz3us9h4jFdSnCna0MryA27CMNV4Yed fuKHZST5vvAigODKF8tPsb2TMoUf9TdPg4Z3YQibVpEWhyDPfOQqBdfLzF+cRXuH2fFQ /OgnK+K9xKPnxOHO5Focz+8RW2/3KpupFDxQyKdYrhGYImgcxLkI/u+wnI9vqShXXHtw cHeg== X-Gm-Message-State: AOJu0Yysj+Mcivk7mFvX2A3dWrq+KYvkrC95L//Fmcu06B9mFTfS5N51 xdWGVvBsF/XfbNMJ3324N3uOQzJBiXDaTRzfTJ7Vnw== X-Google-Smtp-Source: AGHT+IHj2oJRF48x4t4AHm96/rDVlMjxjtsQmcn2nnfbkjBATP5ZJrJSPzYGMjcJO+HM7J+Dkp0KKg== X-Received: by 2002:a05:6a00:8d3:b0:68e:41e9:10be with SMTP id s19-20020a056a0008d300b0068e41e910bemr25889044pfu.20.1701377885646; Thu, 30 Nov 2023 12:58:05 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 15/25] linux-firmware: package firmware for Qualcomm Adreno a702 Date: Thu, 30 Nov 2023 10:57:23 -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, 30 Nov 2023 20:58:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191533 From: Dmitry Baryshkov Separate firmware for the Quacomm Adreno A702 GPU, found on Qualcomm QCM2290 / QRB2210 platforms. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit ad24c24dc534b2da7dbd858e1436f8c0d1e86809) Signed-off-by: Steve Sakoman --- .../recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index 800c621d6d..bd46f08724 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -364,7 +364,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ ${PN}-qcom-vpu-1.0 ${PN}-qcom-vpu-2.0 \ ${PN}-qcom-adreno-a2xx ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a4xx ${PN}-qcom-adreno-a530 \ - ${PN}-qcom-adreno-a630 ${PN}-qcom-adreno-a650 ${PN}-qcom-adreno-a660 \ + ${PN}-qcom-adreno-a630 ${PN}-qcom-adreno-a650 ${PN}-qcom-adreno-a660 ${PN}-qcom-adreno-a702 \ ${PN}-qcom-apq8016-modem ${PN}-qcom-apq8016-wifi \ ${PN}-qcom-apq8096-adreno ${PN}-qcom-apq8096-audio ${PN}-qcom-apq8096-modem \ ${PN}-qcom-sc8280xp-lenovo-x13s-compat \ @@ -1313,6 +1313,7 @@ LICENSE:${PN}-qcom-adreno-a530 = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a630 = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a650 = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a660 = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a702 = "Firmware-qcom" LICENSE:${PN}-qcom-apq8016-modem = "Firmware-qcom" LICENSE:${PN}-qcom-apq8016-wifi = "Firmware-qcom" LICENSE:${PN}-qcom-apq8096-audio = "Firmware-qcom" @@ -1346,6 +1347,7 @@ FILES:${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.fw*" FILES:${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.*" FILES:${PN}-qcom-adreno-a650 = "${nonarch_base_libdir}/firmware/qcom/a650*.*" FILES:${PN}-qcom-adreno-a660 = "${nonarch_base_libdir}/firmware/qcom/a660*.*" +FILES:${PN}-qcom-adreno-a702 = "${nonarch_base_libdir}/firmware/qcom/a702*.*" FILES:${PN}-qcom-apq8016-modem = "${nonarch_base_libdir}/firmware/qcom/apq8016/mba.mbn ${nonarch_base_libdir}/firmware/qcom/apq8016/modem.mbn" FILES:${PN}-qcom-apq8016-wifi = "${nonarch_base_libdir}/firmware/qcom/apq8016/wcnss.mbn ${nonarch_base_libdir}/firmware/qcom/apq8016/WCNSS*" FILES:${PN}-qcom-apq8096-adreno = "${nonarch_base_libdir}/firmware/qcom/apq8096/a530_zap.mbn ${nonarch_base_libdir}/firmware/qcom/a530_zap.mdt" @@ -1378,6 +1380,7 @@ RDEPENDS:${PN}-qcom-adreno-a530 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a630 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a650 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a660 = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-adreno-a702 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8016-modem = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8016-wifi = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8096-adreno = "${PN}-qcom-license" From patchwork Thu Nov 30 20:57: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: 35464 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 B90C3C10DC1 for ; Thu, 30 Nov 2023 20:58:10 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.5159.1701377888531078151 for ; Thu, 30 Nov 2023 12:58:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DI25hO5u; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6cdd9c53270so1238286b3a.1 for ; Thu, 30 Nov 2023 12:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377887; x=1701982687; darn=lists.openembedded.org; 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=XGmgJgEpFbQdwaKYmG2zBEJE/1Nr3BMBYZrySWv0HlM=; b=DI25hO5uDQ/AFhe6S6qBRgC5+/WmMGnE21NbgjU8MgoUJMO+G9XtK9HRuku5CrAS23 UenuerF6cC8ZYqi+UB3pG28j8l9E07xZYfOKyh4XKuxMfLVtJlnSInuIxgNGkkHVkXvB 3GBfqe96IcgH4Pts/psZvXO9rSFdJnUxeV+jxugIpcK41Vync3u1ftUd0id0f0YlTOh0 lwuw6t9MYiewmu3XU1wVWIVFwkse7EP51f+VPK90yc4GIUxFYFmouJeQmwyGGRJb96g2 L1rwUYO8+2NmRhpImg1OFEuCyoUJm/7XqgVwkQDe0Zf1k6ZcH8f3xcYZv5PYeZXtiIhF i0mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377887; x=1701982687; 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=XGmgJgEpFbQdwaKYmG2zBEJE/1Nr3BMBYZrySWv0HlM=; b=VbAIxw83vxG51Ol2kaFmdUVt232P8H9b2fTW3on1eZwXX+xW+YQGheZDDKTZuZKaOJ mmywXqF/db4OsObDoC3Qoa76UzJZcduVAjE7G/nCThuYCI8nk4Xg/f1LE/ey9WFO3lPO FrncKGf0W3Fg6BmT/NA7GhNMje4RlPu3oJq9/ZyC61m0hB0Jb/b+aCrYzfHukV35NbgB EJ330ohal+CIcRt+aqFWa9sjxeoynbmJQZMU/A0AUgIx0h4IAU/zRlHstwGv53CQlAdX YokLtghdEAlNm/9SXYRo2oG5vo4swyD37+f5Y6+h5RD0uUVN7/5H7e7dVQSPaGGxtn+o AQCw== X-Gm-Message-State: AOJu0YzZhjP2pSKNMZEUbFXu9+6HUGWyM6WJV3ojDyn8wPVJ7rs614Uj iHmvFCWTtN5wT3AE70ymdNfvdz1mp9JtYO3r75sl6Q== X-Google-Smtp-Source: AGHT+IFddorW10H8jz07IGhfqIUfg1y03mL7c+87s8ViBNYUVUQs+wG9aH0288tPf1ZekcUxFPshFA== X-Received: by 2002:a05:6a00:448b:b0:6cd:f0c8:52b9 with SMTP id cu11-20020a056a00448b00b006cdf0c852b9mr2368458pfb.25.1701377887190; Thu, 30 Nov 2023 12:58:07 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 16/25] linux-firmware: package firmware for Qualcomm QCM2290 / QRB4210 Date: Thu, 30 Nov 2023 10:57:24 -1000 Message-Id: <11d1f62d4ccf0239e62fb4f8e9a71ba442cf410d.1701377676.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, 30 Nov 2023 20:58:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191534 From: Dmitry Baryshkov Package firmware files for the Qualcomm QCM2290 and QRB4210 platforms. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit bc4170ca691df3eefa39fffd31c280b3ead111a9) Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20231030.bb | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index bd46f08724..55e0d7f712 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -367,6 +367,9 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-qcom-adreno-a630 ${PN}-qcom-adreno-a650 ${PN}-qcom-adreno-a660 ${PN}-qcom-adreno-a702 \ ${PN}-qcom-apq8016-modem ${PN}-qcom-apq8016-wifi \ ${PN}-qcom-apq8096-adreno ${PN}-qcom-apq8096-audio ${PN}-qcom-apq8096-modem \ + ${PN}-qcom-qcm2290-adreno ${PN}-qcom-qcm2290-audio ${PN}-qcom-qcm2290-modem ${PN}-qcom-qcm2290-wifi \ + ${PN}-qcom-qrb4210-adreno ${PN}-qcom-qrb4210-audio ${PN}-qcom-qrb4210-compute \ + ${PN}-qcom-qrb4210-modem ${PN}-qcom-qrb4210-wifi \ ${PN}-qcom-sc8280xp-lenovo-x13s-compat \ ${PN}-qcom-sc8280xp-lenovo-x13s-audio \ ${PN}-qcom-sc8280xp-lenovo-x13s-adreno \ @@ -1319,6 +1322,15 @@ LICENSE:${PN}-qcom-apq8016-wifi = "Firmware-qcom" LICENSE:${PN}-qcom-apq8096-audio = "Firmware-qcom" LICENSE:${PN}-qcom-apq8096-adreno = "Firmware-qcom" LICENSE:${PN}-qcom-apq8096-modem = "Firmware-qcom" +LICENSE:${PN}-qcom-qcm2290-adreno = "Firmware-qcom" +LICENSE:${PN}-qcom-qcm2290-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-qcm2290-modem = "Firmware-qcom" +LICENSE:${PN}-qcom-qcm2290-wifi = "Firmware-qcom" +LICENSE:${PN}-qcom-qrb4210-adreno = "Firmware-qcom" +LICENSE:${PN}-qcom-qrb4210-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-qrb4210-compute = "Firmware-qcom" +LICENSE:${PN}-qcom-qrb4210-modem = "Firmware-qcom" +LICENSE:${PN}-qcom-qrb4210-wifi = "Firmware-qcom" LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "Firmware-qcom & Firmware-linaro" LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "Firmware-qcom" LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "Firmware-qcom" @@ -1353,6 +1365,15 @@ FILES:${PN}-qcom-apq8016-wifi = "${nonarch_base_libdir}/firmware/qcom/apq8016/wc FILES:${PN}-qcom-apq8096-adreno = "${nonarch_base_libdir}/firmware/qcom/apq8096/a530_zap.mbn ${nonarch_base_libdir}/firmware/qcom/a530_zap.mdt" FILES:${PN}-qcom-apq8096-audio = "${nonarch_base_libdir}/firmware/qcom/apq8096/adsp*.*" FILES:${PN}-qcom-apq8096-modem = "${nonarch_base_libdir}/firmware/qcom/apq8096/mba.mbn ${nonarch_base_libdir}/firmware/qcom/apq8096/modem*.* ${nonarch_base_libdir}/firmware/qcom/apq8096/wlanmdsp.mbn" +FILES:${PN}-qcom-qcm2290-adreno = "${nonarch_base_libdir}/firmware/qcom/qcm2290/a702_zap.mbn" +FILES:${PN}-qcom-qcm2290-audio = "${nonarch_base_libdir}/firmware/qcom/qcm2290/adsp*.*" +FILES:${PN}-qcom-qcm2290-modem = "${nonarch_base_libdir}/firmware/qcom/qcm2290/modem*.*" +FILES:${PN}-qcom-qcm2290-wifi = "${nonarch_base_libdir}/firmware/qcom/qcm2290/wlanmdsp.mbn" +FILES:${PN}-qcom-qrb4210-adreno = "${nonarch_base_libdir}/firmware/qcom/qrb4210/a610_zap.mbn" +FILES:${PN}-qcom-qrb4210-audio = "${nonarch_base_libdir}/firmware/qcom/qrb4210/adsp*.*" +FILES:${PN}-qcom-qrb4210-compute = "${nonarch_base_libdir}/firmware/qcom/qrb4210/cdsp*.*" +FILES:${PN}-qcom-qrb4210-modem = "${nonarch_base_libdir}/firmware/qcom/qrb4210/modem*.*" +FILES:${PN}-qcom-qrb4210-wifi = "${nonarch_base_libdir}/firmware/qcom/qrb4210/wlanmdsp.mbn" FILES:${PN}-qcom-sc8280xp-lenovo-x13s-compat = "${nonarch_base_libdir}/firmware/qcom/LENOVO/21BX" FILES:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*adsp*.* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin ${nonarch_base_libdir}/firmware/qcom/sc8280xp/SC8280XP-LENOVO-X13S-tplg.bin" FILES:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn" @@ -1386,6 +1407,15 @@ RDEPENDS:${PN}-qcom-apq8016-wifi = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8096-adreno = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8096-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-apq8096-modem = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qcm2290-adreno = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qcm2290-audio = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qcm2290-modem = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qcm2290-wifi = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qrb4210-adreno = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qrb4210-audio = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qrb4210-compute = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qrb4210-modem = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-qrb4210-wifi = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "${PN}-qcom-license" From patchwork Thu Nov 30 20:57: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: 35465 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 AC5C2C46CA3 for ; Thu, 30 Nov 2023 20:58:10 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web10.5276.1701377889985535752 for ; Thu, 30 Nov 2023 12:58:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=KarrnVTC; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-5bcfc508d14so1113336a12.3 for ; Thu, 30 Nov 2023 12:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377889; x=1701982689; darn=lists.openembedded.org; 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=LXfni2FUNNrS2M2JkKg2nGhF3caYPn+79r4nKv9VFxQ=; b=KarrnVTCb63Rmkc93CQQogoFmo0XRRAG94n9qTGy2Gfrevp5f1pkhmVcS+fOCna/6j FC3QceYFUwUO5g921W60IRovK/0t4xheTIcx+P//JfYSJ4wjqjKZQl4Y5NOb2Mv9YOto 6c21xsHAEdirVqA48E6dZ3995DSQJe1zVgOtdYmwZc8PfQEUHFyglZjhEqX0+lnbEYLm cIfw9/fhFiPv3gWLM6O/z7Yl2lnDst1QTYCV/aGt4XUlTSj7WrpGYWo7zKdb5U3Y7S0S +Y2561EWBIJa1d+myKEiqnOoj1qdcay0GFnQkGPlgS4nKjMqbWbG2JRCZsPEvW9Q51eY sjEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377889; x=1701982689; 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=LXfni2FUNNrS2M2JkKg2nGhF3caYPn+79r4nKv9VFxQ=; b=Lk4hjTQh4NxQOloyuND0WHWeTI1C2abZXkHYyX7sKKt4GcIfhC25Y75JyOGcBdaPSr 9vvZ/O5kaHSikUSsNFav+2CrkcyQZsABHnxfOom81dw7PorVf8N73Q/UjgQwZJ4zIBHN WlKql2+SFlp94hxsB4Eeq/ZbqrT5RYAmqic4+hHGAdvUmMBT3UfpHHAqEBwlv/oSpNKq L6lXC5CjWyeY6F+iZB+t2LJcoWgPmDofXGS3n8FmcTJtJesrQFcmNfiRYIkaeuaLCupi C9mXaFNttG0xI6PtdE7ReaIo8OkN5MZvYS2yeBq32VIobjF8Bg8vmeorG/RkZsnNJjFB ozOw== X-Gm-Message-State: AOJu0YyCNQfK3RYwOcJoeADZH/XoxEhEAgQjJ8m6YakaWYZsyowpMiKI 8EU5+0+c488uuIZV6h72wDLlcMrqHsSoJiBVYUHBTw== X-Google-Smtp-Source: AGHT+IFChXEh4HLAdrUirk+iFQGNUh5AeN7PGka5P8fME0mPgsGTNGgDoXR2pT+/Ye2hyVo80w/Kcg== X-Received: by 2002:a05:6a20:a10a:b0:18b:4632:af0b with SMTP id q10-20020a056a20a10a00b0018b4632af0bmr27672102pzk.17.1701377889084; Thu, 30 Nov 2023 12:58:09 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 17/25] linux-firmware: package Qualcomm Venus 6.0 firmware Date: Thu, 30 Nov 2023 10:57:25 -1000 Message-Id: <247d5b997b4d8a3c72f2004c1df069f7f88fed38.1701377676.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, 30 Nov 2023 20:58:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191535 From: Dmitry Baryshkov Package firmware for the Qualcomm video encoder / decoder (venus) core, version 6.0 Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit 51a64bd01adf3a81086e6368af01abaf4081a515) Signed-off-by: Steve Sakoman --- .../recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index 55e0d7f712..be8cb9b3e9 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -361,7 +361,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-phanfw-license ${PN}-phanfw \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license ${PN}-qcom-yamato-license \ - ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ + ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 ${PN}-qcom-venus-6.0 \ ${PN}-qcom-vpu-1.0 ${PN}-qcom-vpu-2.0 \ ${PN}-qcom-adreno-a2xx ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a4xx ${PN}-qcom-adreno-a530 \ ${PN}-qcom-adreno-a630 ${PN}-qcom-adreno-a650 ${PN}-qcom-adreno-a660 ${PN}-qcom-adreno-a702 \ @@ -1307,6 +1307,7 @@ LICENSE:${PN}-qcom-venus-1.8 = "Firmware-qcom" LICENSE:${PN}-qcom-venus-4.2 = "Firmware-qcom" LICENSE:${PN}-qcom-venus-5.2 = "Firmware-qcom" LICENSE:${PN}-qcom-venus-5.4 = "Firmware-qcom" +LICENSE:${PN}-qcom-venus-6.0 = "Firmware-qcom" LICENSE:${PN}-qcom-vpu-1.0 = "Firmware-qcom" LICENSE:${PN}-qcom-vpu-2.0 = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a2xx = "Firmware-qcom Firmware-qcom-yamato" @@ -1350,6 +1351,7 @@ FILES:${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES:${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" FILES:${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" FILES:${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" +FILES:${PN}-qcom-venus-6.0 = "${nonarch_base_libdir}/firmware/qcom/venus-6.0/*" FILES:${PN}-qcom-vpu-1.0 = "${nonarch_base_libdir}/firmware/qcom/vpu-1.0/*" FILES:${PN}-qcom-vpu-2.0 = "${nonarch_base_libdir}/firmware/qcom/vpu-2.0/*" FILES:${PN}-qcom-adreno-a2xx = "${nonarch_base_libdir}/firmware/qcom/leia_*.fw ${nonarch_base_libdir}/firmware/qcom/yamato_*.fw" @@ -1392,6 +1394,7 @@ RDEPENDS:${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-5.2 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-5.4 = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-venus-6.0 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-vpu-1.0 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-vpu-2.0 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a2xx = "${PN}-qcom-license ${PN}-qcom-yamato-license" From patchwork Thu Nov 30 20:57: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: 35473 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 CF454C46CA3 for ; Thu, 30 Nov 2023 20:58:20 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.5161.1701377891520341757 for ; Thu, 30 Nov 2023 12:58:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=OTAAngy5; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6cdd584591eso1409532b3a.2 for ; Thu, 30 Nov 2023 12:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377891; x=1701982691; darn=lists.openembedded.org; 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=2lI6E/nOQcSKeEVxiKH+5zcL7ZBC1AY8HXqBv+wmwLY=; b=OTAAngy5w/ipQk0Ef9EZCYFLQW+JeOPPvQXis4SxSw0qXNDD2LJeNHwvUXizn9Vqo2 aaiuRSLyEmzbePrmvN59Qq81N5QSBgsWl2J2p9c1QLIgYHRUd6vKSXgS7Pu06yah//KT Uh9vYVWc0AHFkT9UgDo+Vl/t+VvpqbDckYT+VmjZkHexXs+v7PfIUHiXxB6PdFMBPkQS 9VQtu2rLN1sUQNLmhSMx5TaTRnGhApOjjv9kjI56hzkq33jApcwVlZB1UH+9bITA0gec TXJHKJm3khYocGH4KIpENNDuea2/XuH43pbCyKeR1Hwg1kYafxpWT707MSOK8izBsdRE vVsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377891; x=1701982691; 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=2lI6E/nOQcSKeEVxiKH+5zcL7ZBC1AY8HXqBv+wmwLY=; b=eudiYLuJ1Tbq8trM8NeKWqQxqiZ0mN9GaUKiFjwDOoFrlOQ0o+UnEws1+FAx1faICg E41VNFKg0s476dgdDguETdfj/B8SlaYen7dSb3YuwFlvRwPG4SA+6DWTwv4yzf3cL4Kq Lcxj3WgjUP1a9nQpMXrBzsW/WNfzOLz+KjSzavpREBS+Ybj9FjHl6JUddLdaCisi1RgE iFHIiE/RytluVyxJmUDpYPWu77QzUuwdp5O5tNKxJNHfDYVoGLrmK4jPg7yw/r66x4Re WAA92ILWXOHdeinPlzjvq7tdxlCxA0vi6jTldGmKfJKZJOPiwbZ7nMVd3JtyQ8VVIrRK hFPw== X-Gm-Message-State: AOJu0YxnxNLgrRm7FuOQkkUiIY6m8coNicnKQHGo5E5L6ga4nTszMjtY GRX8McMEotTDoRQ8mdvpa+e1f4Tgkpo/yxOYJO1bTQ== X-Google-Smtp-Source: AGHT+IG7rs8lRdeAVDKWbNCrzxB4jmjcAd9db64CPoqJkJUENThNx9X78Vv3eupk3+e5kA4C4C3MCA== X-Received: by 2002:a05:6a00:2d28:b0:6cb:daec:8b75 with SMTP id fa40-20020a056a002d2800b006cbdaec8b75mr23254964pfb.22.1701377890685; Thu, 30 Nov 2023 12:58:10 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:10 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 18/25] linux-firmware: package Robotics RB5 sensors DSP firmware Date: Thu, 30 Nov 2023 10:57:26 -1000 Message-Id: <3c33f44d7f4a13bb5ae734bc38de894f0acae783.1701377676.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, 30 Nov 2023 20:58:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191536 From: Dmitry Baryshkov Add package with sensors DSP firmware for Qualcomm Robotics RB5 platform. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit 195df10fcbfa1ef7e073d3332943458064519ae0) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index be8cb9b3e9..c0394b9b3b 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb @@ -378,6 +378,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-qcom-sdm845-adreno ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-qcom-sdm845-thundercomm-db845c-sensors \ ${PN}-qcom-sm8250-adreno ${PN}-qcom-sm8250-audio ${PN}-qcom-sm8250-compute \ + ${PN}-qcom-sm8250-thundercomm-rb5-sensors \ ${PN}-qla2xxx ${PN}-qla2xxx-license \ ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \ ${PN}-lt9611uxc ${PN}-lontium-license \ @@ -1344,6 +1345,7 @@ LICENSE:${PN}-qcom-sdm845-thundercomm-db845c-sensors = "Firmware-qcom" LICENSE:${PN}-qcom-sm8250-audio = "Firmware-qcom" LICENSE:${PN}-qcom-sm8250-adreno = "Firmware-qcom" LICENSE:${PN}-qcom-sm8250-compute = "Firmware-qcom" +LICENSE:${PN}-qcom-sm8250-thundercomm-rb5-sensors = "Firmware-qcom" FILES:${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" FILES:${PN}-qcom-yamato-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom_yamato" @@ -1389,6 +1391,7 @@ FILES:${PN}-qcom-sdm845-thundercomm-db845c-sensors = "${nonarch_base_libdir}/fir FILES:${PN}-qcom-sm8250-adreno = "${nonarch_base_libdir}/firmware/qcom/sm8250/a650*.*" FILES:${PN}-qcom-sm8250-audio = "${nonarch_base_libdir}/firmware/qcom/sm8250/adsp*.*" FILES:${PN}-qcom-sm8250-compute = "${nonarch_base_libdir}/firmware/qcom/sm8250/cdsp*.*" +FILES:${PN}-qcom-sm8250-thundercomm-rb5-sensors = "${nonarch_base_libdir}/firmware/qcom/sm8250/Thundercomm/RB5/slpi*.*" RDEPENDS:${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-4.2 = "${PN}-qcom-license" @@ -1431,6 +1434,7 @@ RDEPENDS:${PN}-qcom-sdm845-thundercomm-db845c-sensors = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sm8250-adreno = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sm8250-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sm8250-compute = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-sm8250-thundercomm-rb5-sensors = "${PN}-qcom-license" RRECOMMENDS:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${PN}-qcom-sc8280xp-lenovo-x13s-compat" RRECOMMENDS:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${PN}-qcom-sc8280xp-lenovo-x13s-compat" From patchwork Thu Nov 30 20:57: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: 35470 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 DD1FAC46CA0 for ; Thu, 30 Nov 2023 20:58:20 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web10.5281.1701377893408165653 for ; Thu, 30 Nov 2023 12:58:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=xV+sOQFg; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6cdd214bce1so1399977b3a.3 for ; Thu, 30 Nov 2023 12:58:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377892; x=1701982692; darn=lists.openembedded.org; 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=GadeYSvcL7/chx/rTIFntvF2enZ1SUvbfiBB7MAs5XA=; b=xV+sOQFgRIUWiTkq566Y3sQVrCSeba8Toa6yP71vb/ha0oOaCeKgU8myKmtUBkmcvD bSm+T0x/Da8+2FtRsMCiz5hAfbN/BgO9KHPxzL6+4ecTwcuq/AxczeifB64r0mmxy6uY ULoR+AKXM9T2Dvurl6WYOT2/NK4DvFULp8bm4/sq2MaW+LZpkmJY2TeXdpuqwH2Wycvr CIp2rv+9Y+GNvVq7sSZOuBqcVRJkrCmEfrmiUW5xbItKh8mZfgycQT5Jfkg9BFNNq8iO rAXHlzDOC1LgPcavzMtNXTIxBCNRmTb+Z2vYWJP/gsRe80W+n+A3wcTklqMgo91mg70S M5Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377892; x=1701982692; 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=GadeYSvcL7/chx/rTIFntvF2enZ1SUvbfiBB7MAs5XA=; b=Eo806hFZNnXCPkF/xupZ9OUDv5oF5mU5BHYwGnUE1P7Qj0MTds3NdFjFIeUJVDdAqT k2CKroYLSRkWI+p1Q4EMl6/768Vt0yLdbmnuQ984MjiBigS2ONQKKKNDLfSwb9aTSYvk KshY2j2EjlZwKgzVHIdfvoQnCius91ueeKRqqTRIMinxl8R8S5l4qmjQxMz4CK+RmxTY 4am3gwXxIzlPLVUS03eB0HI3YT+/QNq7DIbH722Q2LZcuYK/ab1rfKdojq56xSyNlSZZ TQ2W5qyoXZePVB5z7rT2iWtMUfV8QDy3B4IJyXI8Ds9Shl9WMQQOZgt90Utm5kwITlXZ kVSQ== X-Gm-Message-State: AOJu0YyQ9K1SXZHn11yha4GTxWLo+U//+F329wxbIex9yxpTtHbDQ9Lx ++ORy0zoy/7FoJIQgYS298lfZqJ4d9PpgnBlhyHJUA== X-Google-Smtp-Source: AGHT+IEIRlqgkn7OUMdS08i8lA4ROVFDDW/4NabCTv/tVNAg3mPeuKH3EHXSh5L2+8NstWuSVQaqQA== X-Received: by 2002:a05:6a00:2410:b0:6cb:903a:b064 with SMTP id z16-20020a056a00241000b006cb903ab064mr25014498pfh.22.1701377892328; Thu, 30 Nov 2023 12:58:12 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:12 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 19/25] lsb-release: use https for UPSTREAM_CHECK_URI Date: Thu, 30 Nov 2023 10:57:27 -1000 Message-Id: <2060e7ba146a1e87d402af9557cdd5ce959a7bf6.1701377676.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, 30 Nov 2023 20:58:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191537 From: Tim Orling http:// results in 301 Moved Permanently and redirects to https:// Also drop SRC_URI[md5sum]. Signed-off-by: Tim Orling Signed-off-by: Alexandre Belloni (cherry picked from commit 4bb3e1dd642802a16ac9526df4098d6dcb97a795) Signed-off-by: Steve Sakoman --- meta/recipes-extended/lsb/lsb-release_1.4.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index ad16554e98..00d8183a4f 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -14,10 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar file://help2man-reproducibility.patch \ " -SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lsb/files/lsb_release/" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lsb/files/lsb_release/" UPSTREAM_CHECK_REGEX = "/lsb_release/(?P(\d+[\.\-_]*)+)/" CLEANBROKEN = "1" From patchwork Thu Nov 30 20:57: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: 35474 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 E717CC07CA9 for ; Thu, 30 Nov 2023 20:58:20 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.5282.1701377894903192947 for ; Thu, 30 Nov 2023 12:58:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=uTnRKxpF; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5c194b111d6so1167872a12.0 for ; Thu, 30 Nov 2023 12:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377894; x=1701982694; darn=lists.openembedded.org; 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=Tjr1RYqS9hLvb+dQHc8WH1Eht5yA2zr8NykdXhqJFJY=; b=uTnRKxpFwNo2tfj9xojq+VUVC0XnOQtBOdDw4GYb/22B+FlobdumYO2hsoBfftpm07 WqPkMNPFC68Lj5QeJGom0Aht0Po31G6TFF82IGKXbCWWZfQ/wSNsMqExnv5J+UT1GmBj JYCa8KlvsgNQss9yaToZ4JoGpe8blq/JCgxpbn/FpyiYYbu0eO7eLv77r39NbHsZWFDh 0Nw5UXOKlUQ+Wm9vuGEkiNRRX/fZK9Pg+jnPQ7BuPsg24Ro40jN5KJ/awnY8umppt+6X VaZ2qNoCL79KDHj9oPh56UkX/ea9QwiuyvlUGXmKTeTjE+6zrnhzr9kbZrajbtgFe4iR FQ0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377894; x=1701982694; 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=Tjr1RYqS9hLvb+dQHc8WH1Eht5yA2zr8NykdXhqJFJY=; b=dtrSFxXB5jhKdqgYQ2rXmXEfRJ8Cqaqbme7dfV3ZFKAU6pLLXJpQQimPiChaaSSPnt Kl9qmsDa3GQSFjuE0LqRtT8Hy8knHqY0syLjutUSTPRr8FvQYD9lAnwZX84yvobLhiUM ZQY1lf55UTdJ7NuwyQH5eD2O/9U78OhQ46wMuZYZ1ZTA5VRw1K/lT66L/EPZ65lzq2jX Ra0srI09CocdzoyJGY3pd3vmfgW7rF7GHWtnpyuBHEIb/VQPTkjoPGW40+5UWY6LZ2H5 3FdGnQmmyl6c3EbasqieTcyC7xCTRFp6VxMYWmyXJhwRhlzSvzb0CzlO+1p8+uX3s6yI qNIg== X-Gm-Message-State: AOJu0YzMXid5TjemCrlc5/co2wB/AgPFtts+4amXmr9gQlKqx1kYZUC6 rzYeqfk6JpdqcaAUWAogU2GBOwKwagHZhHpDRvGODA== X-Google-Smtp-Source: AGHT+IG72LcMBDaHerJVrQYVGgMWUssh2M9wg5+FbqGUFd30Wy+J2FGK7BUe2jDTO9Vzw749O/3/TA== X-Received: by 2002:a05:6a20:42a3:b0:187:ce5a:2a90 with SMTP id o35-20020a056a2042a300b00187ce5a2a90mr32502878pzj.51.1701377893965; Thu, 30 Nov 2023 12:58:13 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 20/25] strace: backport fix for so_peerpidfd-test Date: Thu, 30 Nov 2023 10:57:28 -1000 Message-Id: <40127d0427d02d0c44d17b9959c5eae4d91d3f10.1701377676.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, 30 Nov 2023 20:58:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191538 From: Randy MacLeod Backport the fix for the so_peerpidfd-test: 44cf51a38 tests: fix so_peerpidfd test and drop the patch that skipped that test. Signed-off-by: Randy MacLeod Signed-off-by: Alexandre Belloni (cherry picked from commit 0a52da6530ebba08f9a3b30d5098b0c3ef1730d7) Signed-off-by: Steve Sakoman --- .../skip-test-so_peerpidfd.gen.test.patch | 25 --------------- .../strace/tests-fix-so_peerpidfd-test.patch | 32 +++++++++++++++++++ meta/recipes-devtools/strace/strace_6.5.bb | 2 +- 3 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch create mode 100644 meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch diff --git a/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch b/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch deleted file mode 100644 index 5c73e1f10e..0000000000 --- a/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 002d9f2512245536dfc8d62db429d97e2216ec3a Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Fri, 6 Oct 2023 12:08:23 -0700 -Subject: [PATCH] skip tests/so_peerpidfd.gen.test - -Upstream-Status: Inappropriate - -Signed-off-by: Randy MacLeod ---- - tests/so_peerpidfd.gen.test | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/so_peerpidfd.gen.test b/tests/so_peerpidfd.gen.test -index 64ad3a2..f89da9f 100755 ---- a/tests/so_peerpidfd.gen.test -+++ b/tests/so_peerpidfd.gen.test -@@ -1,4 +1,5 @@ - #!/bin/sh -efu - # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (so_peerpidfd --trace=getsockopt -y); do not edit. - . "${srcdir=.}/init.sh" -+skip_ "Test fails due to apparently trivial log format differences" - run_strace_match_diff --trace=getsockopt -y --- -2.39.0 - diff --git a/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch b/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch new file mode 100644 index 0000000000..62f73d3643 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch @@ -0,0 +1,32 @@ +From 44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Sat, 14 Oct 2023 08:00:00 +0000 +Subject: [PATCH] tests: fix so_peerpidfd test + +* tests/so_peerpidfd.c (print_pidfd): Fix expected output. + +Fixes: v6.5~38 "net: implement decoding of SO_PEERPIDFD socket option" +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2243631 + +Upstream-Status: Backport [https://github.com/strace/strace/commit/44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d] +Signed-off-by: Randy MacLeod +--- + tests/so_peerpidfd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/so_peerpidfd.c b/tests/so_peerpidfd.c +index 33988edec..dfad1c434 100644 +--- a/tests/so_peerpidfd.c ++++ b/tests/so_peerpidfd.c +@@ -37,7 +37,7 @@ print_pidfd(int *p) + if (rc < 0) + printf("%p", p); + else +- printf("%d%s", *p, pidfd_suffix); ++ printf("[%d%s]", *p, pidfd_suffix); + } + + static void +-- +2.34.1 + diff --git a/meta/recipes-devtools/strace/strace_6.5.bb b/meta/recipes-devtools/strace/strace_6.5.bb index d6475e8db9..d1536b1e8d 100644 --- a/meta/recipes-devtools/strace/strace_6.5.bb +++ b/meta/recipes-devtools/strace/strace_6.5.bb @@ -14,7 +14,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ - file://skip-test-so_peerpidfd.gen.test.patch \ + file://tests-fix-so_peerpidfd-test.patch \ " SRC_URI[sha256sum] = "dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980" From patchwork Thu Nov 30 20:57: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: 35475 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 F2D59C10DC2 for ; Thu, 30 Nov 2023 20:58:20 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.5169.1701377896642580343 for ; Thu, 30 Nov 2023 12:58:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zUuNfKei; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6cbbfdf72ecso1403179b3a.2 for ; Thu, 30 Nov 2023 12:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377896; x=1701982696; darn=lists.openembedded.org; 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=ytAB1BaDcjZYa4VIx2T7xNgSudiGgtuNgmJOwxzsJwo=; b=zUuNfKeiHG0/shw8+FCkvdvvdTXHhs01f1xn24F78G15nbyZJ3gQS7uGrjU+9qBlgr AGoDUSY/7Qu6JoGLHub4tBTvOPcDgeEdrhN6F4GPj9TXn+8wav/+nZfzyDun1jLooqGX MvEH0TwCjb3mFhJyI6HgMbupQtg0iW27n/312hnF+UtPGP1IYnyg95tG5nLpwG2sB2va tZ/jY0xtime5VZ7KEBe2VfKAfM6HZogsOm7JxI2AZHULETAvDI0ZgA3+upmXjaqaTtRs IRcRnPLfBRPCkdiPlAlMX4PJAyGNT9wWaCOtbzsw17/DUC7t7XIdA/1rAIWnVl+PbWJW NRxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377896; x=1701982696; 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=ytAB1BaDcjZYa4VIx2T7xNgSudiGgtuNgmJOwxzsJwo=; b=kelRg7ANJJAR094bPde0s8o+WxVJ6/Vk803fJkxWeI2/g7fV+dP7QGb0NvGWCJeCbf ZB+Fz2g8QJQWz70x6rVZzUsHTmXnmDBv9OVC7nMWXUfN2oUeUYPubKOMa47GlkZmCDUd dk9NMPeTdPFEfF1BhAvSjEM2+dk3FitmxP8KFcjW8bX8IUtG/WqSiKBKkdYOKKXlom5T dk0s5A0G+hdUMVcKQSOaxJ5n2b/zHA4QGuMfZ7zTJbvjogZjZW5AAt7bLdUArFk5IzYa JZwacnXoYLVNLahuEltp6deLLEQGUKyeHNuyauzyvVo/ZHJ2li7ohzGuRWryDKUmsr6I e/Qg== X-Gm-Message-State: AOJu0YwuOKUHyXfoxU6atHtWtQrcRnuDyLA06V5NSQBIVmERP4OoIqno vof8UiFUTnH0jlATaFPy4vI12r/0vet1EPaMsXkKow== X-Google-Smtp-Source: AGHT+IHsdQ39HD47/a5d+Zy4TCUDO+BxE+hXrX7zcoPEszd+HYJbElbaOLgCRaSYpIy5ZFTaBstprQ== X-Received: by 2002:a05:6a20:8f15:b0:18c:1248:bb17 with SMTP id b21-20020a056a208f1500b0018c1248bb17mr27027019pzk.21.1701377895583; Thu, 30 Nov 2023 12:58:15 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 21/25] openssl: improve handshake test error reporting Date: Thu, 30 Nov 2023 10:57: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, 30 Nov 2023 20:58:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191539 From: William Lyu Fixes [YOCTO #15225] Yocto Bug #15255 is not reproducible. To obtain more useful information for debugging, the OpenSSL test code is improved so that more detailed state information in the handshake loop is printed when an error occurs. Signed-off-by: William Lyu Signed-off-by: Alexandre Belloni (cherry picked from commit 5bf9a70f580357badd01f39822998985654b0bfc) Signed-off-by: Steve Sakoman --- ...ke-history-reporting-when-test-fails.patch | 374 ++++++++++++++++++ .../openssl/openssl_3.1.4.bb | 1 + 2 files changed, 375 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch new file mode 100644 index 0000000000..aa2e5bb800 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch @@ -0,0 +1,374 @@ +From 5ba65051fea0513db0d997f0ab7cafb9826ed74a Mon Sep 17 00:00:00 2001 +From: William Lyu +Date: Fri, 20 Oct 2023 16:22:37 -0400 +Subject: [PATCH] Added handshake history reporting when test fails + +Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22481] + +Signed-off-by: William Lyu +--- + test/helpers/handshake.c | 139 +++++++++++++++++++++++++++++---------- + test/helpers/handshake.h | 70 +++++++++++++++++++- + test/ssl_test.c | 44 +++++++++++++ + 3 files changed, 218 insertions(+), 35 deletions(-) + +diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c +index e0422469e4..ae2ad59dd4 100644 +--- a/test/helpers/handshake.c ++++ b/test/helpers/handshake.c +@@ -1,5 +1,5 @@ + /* +- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved. ++ * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy +@@ -24,6 +24,102 @@ + #include + #endif + ++/* Shamelessly copied from test/helpers/ssl_test_ctx.c */ ++/* Maps string names to various enumeration type */ ++typedef struct { ++ const char *name; ++ int value; ++} enum_name_map; ++ ++static const enum_name_map connect_phase_names[] = { ++ {"Handshake", HANDSHAKE}, ++ {"RenegAppData", RENEG_APPLICATION_DATA}, ++ {"RenegSetup", RENEG_SETUP}, ++ {"RenegHandshake", RENEG_HANDSHAKE}, ++ {"AppData", APPLICATION_DATA}, ++ {"Shutdown", SHUTDOWN}, ++ {"ConnectionDone", CONNECTION_DONE} ++}; ++ ++static const enum_name_map peer_status_names[] = { ++ {"PeerSuccess", PEER_SUCCESS}, ++ {"PeerRetry", PEER_RETRY}, ++ {"PeerError", PEER_ERROR}, ++ {"PeerWaiting", PEER_WAITING}, ++ {"PeerTestFail", PEER_TEST_FAILURE} ++}; ++ ++static const enum_name_map handshake_status_names[] = { ++ {"HandshakeSuccess", HANDSHAKE_SUCCESS}, ++ {"ClientError", CLIENT_ERROR}, ++ {"ServerError", SERVER_ERROR}, ++ {"InternalError", INTERNAL_ERROR}, ++ {"HandshakeRetry", HANDSHAKE_RETRY} ++}; ++ ++/* Shamelessly copied from test/helpers/ssl_test_ctx.c */ ++static const char *enum_name(const enum_name_map *enums, size_t num_enums, ++ int value) ++{ ++ size_t i; ++ for (i = 0; i < num_enums; i++) { ++ if (enums[i].value == value) { ++ return enums[i].name; ++ } ++ } ++ return "InvalidValue"; ++} ++ ++const char *handshake_connect_phase_name(connect_phase_t phase) ++{ ++ return enum_name(connect_phase_names, OSSL_NELEM(connect_phase_names), ++ (int)phase); ++} ++ ++const char *handshake_status_name(handshake_status_t handshake_status) ++{ ++ return enum_name(handshake_status_names, OSSL_NELEM(handshake_status_names), ++ (int)handshake_status); ++} ++ ++const char *handshake_peer_status_name(peer_status_t peer_status) ++{ ++ return enum_name(peer_status_names, OSSL_NELEM(peer_status_names), ++ (int)peer_status); ++} ++ ++static void save_loop_history(HANDSHAKE_HISTORY *history, ++ connect_phase_t phase, ++ handshake_status_t handshake_status, ++ peer_status_t server_status, ++ peer_status_t client_status, ++ int client_turn_count, ++ int is_client_turn) ++{ ++ HANDSHAKE_HISTORY_ENTRY *new_entry = NULL; ++ ++ /* ++ * Create a new history entry for a handshake loop with statuses given in ++ * the arguments. Potentially evicting the oldest entry when the ++ * ring buffer is full. ++ */ ++ ++(history->last_idx); ++ history->last_idx &= MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK; ++ ++ new_entry = &((history->entries)[history->last_idx]); ++ new_entry->phase = phase; ++ new_entry->handshake_status = handshake_status; ++ new_entry->server_status = server_status; ++ new_entry->client_status = client_status; ++ new_entry->client_turn_count = client_turn_count; ++ new_entry->is_client_turn = is_client_turn; ++ ++ /* Evict the oldest handshake loop entry when the ring buffer is full. */ ++ if (history->entry_count < MAX_HANDSHAKE_HISTORY_ENTRY) { ++ ++(history->entry_count); ++ } ++} ++ + HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void) + { + HANDSHAKE_RESULT *ret; +@@ -719,15 +815,6 @@ static void configure_handshake_ssl(SSL *server, SSL *client, + SSL_set_post_handshake_auth(client, 1); + } + +-/* The status for each connection phase. */ +-typedef enum { +- PEER_SUCCESS, +- PEER_RETRY, +- PEER_ERROR, +- PEER_WAITING, +- PEER_TEST_FAILURE +-} peer_status_t; +- + /* An SSL object and associated read-write buffers. */ + typedef struct peer_st { + SSL *ssl; +@@ -1074,17 +1161,6 @@ static void do_shutdown_step(PEER *peer) + } + } + +-typedef enum { +- HANDSHAKE, +- RENEG_APPLICATION_DATA, +- RENEG_SETUP, +- RENEG_HANDSHAKE, +- APPLICATION_DATA, +- SHUTDOWN, +- CONNECTION_DONE +-} connect_phase_t; +- +- + static int renegotiate_op(const SSL_TEST_CTX *test_ctx) + { + switch (test_ctx->handshake_mode) { +@@ -1162,19 +1238,6 @@ static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer, + } + } + +-typedef enum { +- /* Both parties succeeded. */ +- HANDSHAKE_SUCCESS, +- /* Client errored. */ +- CLIENT_ERROR, +- /* Server errored. */ +- SERVER_ERROR, +- /* Peers are in inconsistent state. */ +- INTERNAL_ERROR, +- /* One or both peers not done. */ +- HANDSHAKE_RETRY +-} handshake_status_t; +- + /* + * Determine the handshake outcome. + * last_status: the status of the peer to have acted last. +@@ -1539,6 +1602,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( + + start = time(NULL); + ++ save_loop_history(&(ret->history), ++ phase, status, server.status, client.status, ++ client_turn_count, client_turn); ++ + /* + * Half-duplex handshake loop. + * Client and server speak to each other synchronously in the same process. +@@ -1560,6 +1627,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( + 0 /* server went last */); + } + ++ save_loop_history(&(ret->history), ++ phase, status, server.status, client.status, ++ client_turn_count, client_turn); ++ + switch (status) { + case HANDSHAKE_SUCCESS: + client_turn_count = 0; +diff --git a/test/helpers/handshake.h b/test/helpers/handshake.h +index 78b03f9f4b..b9967c2623 100644 +--- a/test/helpers/handshake.h ++++ b/test/helpers/handshake.h +@@ -1,5 +1,5 @@ + /* +- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. ++ * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy +@@ -12,6 +12,11 @@ + + #include "ssl_test_ctx.h" + ++#define MAX_HANDSHAKE_HISTORY_ENTRY_BIT 4 ++#define MAX_HANDSHAKE_HISTORY_ENTRY (1 << MAX_HANDSHAKE_HISTORY_ENTRY_BIT) ++#define MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK \ ++ ((1 << MAX_HANDSHAKE_HISTORY_ENTRY_BIT) - 1) ++ + typedef struct ctx_data_st { + unsigned char *npn_protocols; + size_t npn_protocols_len; +@@ -22,6 +27,63 @@ typedef struct ctx_data_st { + char *session_ticket_app_data; + } CTX_DATA; + ++typedef enum { ++ HANDSHAKE, ++ RENEG_APPLICATION_DATA, ++ RENEG_SETUP, ++ RENEG_HANDSHAKE, ++ APPLICATION_DATA, ++ SHUTDOWN, ++ CONNECTION_DONE ++} connect_phase_t; ++ ++/* The status for each connection phase. */ ++typedef enum { ++ PEER_SUCCESS, ++ PEER_RETRY, ++ PEER_ERROR, ++ PEER_WAITING, ++ PEER_TEST_FAILURE ++} peer_status_t; ++ ++typedef enum { ++ /* Both parties succeeded. */ ++ HANDSHAKE_SUCCESS, ++ /* Client errored. */ ++ CLIENT_ERROR, ++ /* Server errored. */ ++ SERVER_ERROR, ++ /* Peers are in inconsistent state. */ ++ INTERNAL_ERROR, ++ /* One or both peers not done. */ ++ HANDSHAKE_RETRY ++} handshake_status_t; ++ ++/* Stores the various status information in a handshake loop. */ ++typedef struct handshake_history_entry_st { ++ connect_phase_t phase; ++ handshake_status_t handshake_status; ++ peer_status_t server_status; ++ peer_status_t client_status; ++ int client_turn_count; ++ int is_client_turn; ++} HANDSHAKE_HISTORY_ENTRY; ++ ++typedef struct handshake_history_st { ++ /* Implemented using ring buffer. */ ++ /* ++ * The valid entries are |entries[last_idx]|, |entries[last_idx-1]|, ++ * ..., etc., going up to |entry_count| number of entries. Note that when ++ * the index into the array |entries| becomes < 0, we wrap around to ++ * the end of |entries|. ++ */ ++ HANDSHAKE_HISTORY_ENTRY entries[MAX_HANDSHAKE_HISTORY_ENTRY]; ++ /* The number of valid entries in |entries| array. */ ++ size_t entry_count; ++ /* The index of the last valid entry in the |entries| array. */ ++ size_t last_idx; ++} HANDSHAKE_HISTORY; ++ + typedef struct handshake_result { + ssl_test_result_t result; + /* These alerts are in the 2-byte format returned by the info_callback. */ +@@ -77,6 +139,8 @@ typedef struct handshake_result { + char *cipher; + /* session ticket application data */ + char *result_session_ticket_app_data; ++ /* handshake loop history */ ++ HANDSHAKE_HISTORY history; + } HANDSHAKE_RESULT; + + HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void); +@@ -95,4 +159,8 @@ int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, + CTX_DATA *server2_ctx_data, + CTX_DATA *client_ctx_data); + ++const char *handshake_connect_phase_name(connect_phase_t phase); ++const char *handshake_status_name(handshake_status_t handshake_status); ++const char *handshake_peer_status_name(peer_status_t peer_status); ++ + #endif /* OSSL_TEST_HANDSHAKE_HELPER_H */ +diff --git a/test/ssl_test.c b/test/ssl_test.c +index ea608518f9..9d6b093c81 100644 +--- a/test/ssl_test.c ++++ b/test/ssl_test.c +@@ -26,6 +26,44 @@ static OSSL_LIB_CTX *libctx = NULL; + /* Currently the section names are of the form test-, e.g. test-15. */ + #define MAX_TESTCASE_NAME_LENGTH 100 + ++static void print_handshake_history(const HANDSHAKE_HISTORY *history) ++{ ++ size_t first_idx; ++ size_t i; ++ size_t cur_idx; ++ const HANDSHAKE_HISTORY_ENTRY *cur_entry; ++ const char header_template[] = "|%14s|%16s|%16s|%16s|%17s|%14s|"; ++ const char body_template[] = "|%14s|%16s|%16s|%16s|%17d|%14s|"; ++ ++ TEST_info("The following is the server/client state " ++ "in the most recent %d handshake loops.", ++ MAX_HANDSHAKE_HISTORY_ENTRY); ++ ++ TEST_note("==================================================" ++ "=================================================="); ++ TEST_note(header_template, ++ "phase", "handshake status", "server status", ++ "client status", "client turn count", "is client turn"); ++ TEST_note("+--------------+----------------+----------------" ++ "+----------------+-----------------+--------------+"); ++ ++ first_idx = (history->last_idx - history->entry_count + 1) & ++ MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK; ++ for (i = 0; i < history->entry_count; ++i) { ++ cur_idx = (first_idx + i) & MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK; ++ cur_entry = &(history->entries)[cur_idx]; ++ TEST_note(body_template, ++ handshake_connect_phase_name(cur_entry->phase), ++ handshake_status_name(cur_entry->handshake_status), ++ handshake_peer_status_name(cur_entry->server_status), ++ handshake_peer_status_name(cur_entry->client_status), ++ cur_entry->client_turn_count, ++ cur_entry->is_client_turn ? "true" : "false"); ++ } ++ TEST_note("==================================================" ++ "=================================================="); ++} ++ + static const char *print_alert(int alert) + { + return alert ? SSL_alert_desc_string_long(alert) : "no alert"; +@@ -388,6 +426,12 @@ static int check_test(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) + ret &= check_client_sign_type(result, test_ctx); + ret &= check_client_ca_names(result, test_ctx); + } ++ ++ /* Print handshake loop history if any check fails. */ ++ if (!ret) { ++ print_handshake_history(&(result->history)); ++ } ++ + return ret; + } + +-- +2.25.1 + diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.4.bb b/meta/recipes-connectivity/openssl/openssl_3.1.4.bb index b1d5d8766f..0fe4e76808 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.1.4.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.1.4.bb @@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ file://fix_random_labels.patch \ + file://0001-Added-handshake-history-reporting-when-test-fails.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Thu Nov 30 20:57: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: 35472 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 D8BAEC10DC1 for ; Thu, 30 Nov 2023 20:58:20 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web10.5286.1701377897989523503 for ; Thu, 30 Nov 2023 12:58:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JBYjtGcC; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-5bdf5a025c1so1190305a12.0 for ; Thu, 30 Nov 2023 12:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377897; x=1701982697; darn=lists.openembedded.org; 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=Cbd+Cl+Qj7bYuZe7b2CXOk3eawraFJqgmZymdAdB/ns=; b=JBYjtGcChEjzAIi2QoQU45y6rVzT6FKo+Wll7R5ZvLGTNUw6ANOU/8/MsRE6Urisvc TuT/bES6KEldkvrO2E0/vtTbJi1NO1qMFQAl6o8Xu/xpq8TnPp6jbxkGe16H9nmANZII L5F6gTpoNew2fQ3qmvsG7mMguE3sRjUdWrvWOhU7c2GWyWclM9B2+JyTpILG2B+oyFaW anpLZzB0EnA61UAjYOaIHuR2qG31SVmAU7vRfnTI0tAj4ZmtJ3EK+43Ss8SP86tumIN0 Yais2fhkq9tfUoNxFfx06PPbfrZ/uzXVDE19t2jg9X0ycAEj0i5OHkkkP5qAk512qmuY SnaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377897; x=1701982697; 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=Cbd+Cl+Qj7bYuZe7b2CXOk3eawraFJqgmZymdAdB/ns=; b=UKdrIrNHThwKwhi4btoxb2Xe8zHu6Ib051rPKRHU7HYMKXHOPAu4KBW8yCjm8QWzJC 8kuUSh4ABo6onEJ2qpz3av278ZCKjh7xNJSyyK3XvuFvAH5uh7tVX0DEI/BO2UAsiMVK SuD1L9ymR5dbYOIXGjGGmYk3vtdI7ZskhnnSZjr7aLFeiDlsnW5aV006BL0fyJBFM2g6 XDrAwBmh+H3zalPA/fELGmuHnZp6K7HjUFQ2b71tuNBi0vuRl14D25n5QPAZMc8nXBqs OULtDqVJI/rk7Li1xpGVAFs1R9J79MDHdhQbXrUbooNJOdgP2LPQTlOHbgfizJVObF7T 9kNw== X-Gm-Message-State: AOJu0YxeQOM+xr/H0JwhPC/oSREjqiLlFbIpIzeTg1ex7sjeTSLJNMr6 8KiEHi2BQHpDwND4yHnHCixuw/0D4EAwBxrsjTO7tA== X-Google-Smtp-Source: AGHT+IFK7S1XTUois8CtD/WDl3qliAv9jpQIR3tqpP8cdUcGSg14P7sYSxNaKBb6g4DfLnX7dl8fSQ== X-Received: by 2002:a05:6a20:6a22:b0:18c:346c:d59f with SMTP id p34-20020a056a206a2200b0018c346cd59fmr21732220pzk.62.1701377897124; Thu, 30 Nov 2023 12:58:17 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 22/25] systemd: fix DynamicUser issue Date: Thu, 30 Nov 2023 10:57:30 -1000 Message-Id: <5420215a3415f08c1d961fca2e3d8258f82fb7f1.1701377676.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, 30 Nov 2023 20:58:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191540 From: Chen Qi The DynamicUser needs libnss-systemd to be installed to function well. The tweaks to nsswitch.conf should be conditional on PACKAGECONFIG values. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni (cherry picked from commit ba3a78c08cb0ce08afde049610d3172b9e3b0695) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd_254.4.bb | 30 +++++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb index 77724eb822..285ca92e68 100644 --- a/meta/recipes-core/systemd/systemd_254.4.bb +++ b/meta/recipes-core/systemd/systemd_254.4.bb @@ -178,7 +178,7 @@ PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd" PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false,,libnss-myhostname" PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" PACKAGECONFIG[no-dns-fallback] = "-Ddns-servers=" -PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false" +PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false,,libnss-systemd" PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false" PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false" @@ -826,15 +826,31 @@ ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" ALTERNATIVE_PRIORITY[runlevel] ?= "300" pkg_postinst:${PN}:libc-glibc () { - sed -e '/^hosts:/s/\s*\//' \ - -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 myhostname \3\4\5/' \ - -i $D${sysconfdir}/nsswitch.conf + if ${@bb.utils.contains('PACKAGECONFIG', 'myhostname', 'true', 'false', d)}; then + sed -e '/^hosts:/s/\s*\//' \ + -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 myhostname \3\4\5/' \ + -i $D${sysconfdir}/nsswitch.conf + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'nss', 'true', 'false', d)}; then + sed -e 's#\(^passwd:.*\)#\1 systemd#' \ + -e 's#\(^group:.*\)#\1 systemd#' \ + -e 's#\(^shadow:.*\)#\1 systemd#' \ + -i $D${sysconfdir}/nsswitch.conf + fi } pkg_prerm:${PN}:libc-glibc () { - sed -e '/^hosts:/s/\s*\//' \ - -e '/^hosts:/s/\s*myhostname//' \ - -i $D${sysconfdir}/nsswitch.conf + if ${@bb.utils.contains('PACKAGECONFIG', 'myhostname', 'true', 'false', d)}; then + sed -e '/^hosts:/s/\s*\//' \ + -e '/^hosts:/s/\s*myhostname//' \ + -i $D${sysconfdir}/nsswitch.conf + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'nss', 'true', 'false', d)}; then + sed -e '/^passwd:/s#\s*systemd##' \ + -e '/^group:/s#\s*systemd##' \ + -e '/^shadow:/s#\s*systemd##' \ + -i $D${sysconfdir}/nsswitch.conf + fi } PACKAGE_WRITE_DEPS += "qemu-native" From patchwork Thu Nov 30 20:57: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: 35471 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 C77A6C4167B for ; Thu, 30 Nov 2023 20:58:20 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.5176.1701377899552679538 for ; Thu, 30 Nov 2023 12:58:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wIuc2vhF; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5c5fb06b131so1134693a12.0 for ; Thu, 30 Nov 2023 12:58:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377899; x=1701982699; darn=lists.openembedded.org; 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=OCniEZbv6IcpnuXoAg8tbJR/li0dWjwKOBl9nT+p0L0=; b=wIuc2vhFF+pcfLuigN3k6BMMMiiOoHTglA3Zz6C0vSx66l7iZsxlN8E9V7mj1f2DfG T1A0od7vMqduK1v1wHDC5q3wqmP/TJvpSmTf371PHYlE2uj85D/iNTCu+aPv78CeAk8i eKS6A6S9oHZSEJUM2pwaLdL1MwvABJtv6/23xtMBynNF12WxGrFxKYjbzczEjwN+DlAI 4uMHv8iufcQYmHxnoQSeNVS3RqfqjXWVknVWoM0SJr2vqLWMljJjSgSzYxnk3aXBYdm3 RtgZcCNz4EaHxC8Fxzj39DxDoAzouBkxAN/H0HLKwv1YrvXGo0bGAEJnfhRwu9AsaITz HBrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377899; x=1701982699; 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=OCniEZbv6IcpnuXoAg8tbJR/li0dWjwKOBl9nT+p0L0=; b=aNQ8e3ykHty+6Q90anWHk1ENfCsrBWKGDjMuYe43Ctl3dwFz7WrhkNSWAPgDpYnE30 r73CHph5e7ZszgrO5M1Ntdj2zdjUOz3PEJyKFMO5O8+eElTx/MaydpzYuMAFkbWLNwoh oECybsxEw7s/DVEvUN/9gK3DZW8aSnRbTGl6FxmyjQefk1rxYupTsHMMlVm4kKMTZ+eG s66hIA4XPenazmL3RiXfD4NeuvB4RjPOM8mrwGzHC2aL+U7jh7h7te7tU+RpvhPLNJ8s kv+no4UTWfDv/dkEXxBRMdJNSGORgpM8BL2LpLs62kS9kgzlohTQlI9HOvRKq1FNWFN1 pIHA== X-Gm-Message-State: AOJu0YxsiN5xGRflDmgdSbpicKphIQG2fv6Pmx6W4MM6/KjHi40oJP4U D2g1hf9pKRbvNOQfvltnYEUZRH1CuaS7/wqOHzvz8w== X-Google-Smtp-Source: AGHT+IH/uZUqnxBH300bWS3R6sIhBx7prFBAYaQC8vUSKwJ7AXF2uEYdS2pHeMfAo///54+//gdwiA== X-Received: by 2002:a05:6a20:5490:b0:135:1af6:9a01 with SMTP id i16-20020a056a20549000b001351af69a01mr24567124pzk.8.1701377898751; Thu, 30 Nov 2023 12:58:18 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 23/25] lib/oe/buildcfg.py: Include missing import Date: Thu, 30 Nov 2023 10:57: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, 30 Nov 2023 20:58:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191541 From: Jermain Horsman get_layer_revisions() uses the os.path module but it is not included in the imports. Signed-off-by: Jermain Horsman Signed-off-by: Alexandre Belloni (cherry picked from commit 4339ef5b46c39cce402d1cc3526b39702837b839) Signed-off-by: Steve Sakoman --- meta/lib/oe/buildcfg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py index 90f5e05715..b9d32c7cc1 100644 --- a/meta/lib/oe/buildcfg.py +++ b/meta/lib/oe/buildcfg.py @@ -1,4 +1,5 @@ +import os import subprocess import bb.process From patchwork Thu Nov 30 20:57:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 35477 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 ECB01C10DC1 for ; Thu, 30 Nov 2023 20:58:30 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web10.5289.1701377901255389073 for ; Thu, 30 Nov 2023 12:58:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ovPgTVBm; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5bcfc508d14so1113442a12.3 for ; Thu, 30 Nov 2023 12:58:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377900; x=1701982700; darn=lists.openembedded.org; 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=3Ilvx18+AnOjbtGxIYMpn2T9yKtEujUBJIRBC8tXgPc=; b=ovPgTVBmePC6bg4hDa5R1GfGebMjkyKUYyFjz4fGhDuhUUyjMHodySrUO4k4ZvSrCZ bDAAT+mTbxi9RNhLBkfEzNBlo2/XlaDdNdQThBU9KDfoAeOew4lf8MfguI5F00f5V0Zz FJL2gM3e0WKCbBdRkJEc31GhIWTfCAbfsqHuSjPh1RezNNy5LWYlDcqGFH0pEcFCPB5x PRp955q4bMbm0hAFl+vzVGvDT6HuhvHf1AMrgpjW4lXr0P9EYy3BKFI0fPqZ9zRklNbf 2iCW9QRwu15hR9+ygdhmjxmGoZph2xy8elVHGIqePaHP5w+t9Zj4wwjiOJkS/9jzqGtg br0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377900; x=1701982700; 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=3Ilvx18+AnOjbtGxIYMpn2T9yKtEujUBJIRBC8tXgPc=; b=VgGcEnOTFFOcw/kC0PBM4kU7J07bukwvX/tY85u7Jbp2+SE9xrdfONvdO4elhAQMW/ bX2/AS5iI9mNFOZenKVtR5Q4LzpzC//wZiTrMUziPkpKKSMisp0mFCKpAjREpuklyliH tWWttOSIXxvPUR5zLU4y0KWLiUQU+Wkfd6SmJQrmZIIUITfcJ0QXS8YAbdw+ZeaBmgbq 2NHHJ5Y7aAVPM5Q4Cv5VvmLd4E7/pEdK472ivj7gxMm0AZFOVtNNds76V8kOp3P/tCIM qG5KzuT8/GEPD0yQia2Af5XfMNvgF3p2GPVpmbYjRJ6CXDW2DlyyBvu3NP0I5DK0RSDc x2hA== X-Gm-Message-State: AOJu0YwhoKPp9yw000b0w5cBAeX1OlsM9As4x0u/z9U16xf2SF/w7uyd PaJJ3IpH6kEVAZAfGCaZYxqb98gYB8gebHcLemOmBw== X-Google-Smtp-Source: AGHT+IG3WurXgMfcEM3xee2Ml0GG3T45P6fV/fTR1qBtaE6Fvalifl4q8KdFQ1xsb+laAsLOHNoQAA== X-Received: by 2002:a05:6a20:7d9a:b0:18c:44d3:d314 with SMTP id v26-20020a056a207d9a00b0018c44d3d314mr23349606pzj.10.1701377900450; Thu, 30 Nov 2023 12:58:20 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 24/25] lib/oe/buildcfg.py: Remove unused parameter Date: Thu, 30 Nov 2023 10:57:32 -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, 30 Nov 2023 20:58:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191542 From: Jermain Horsman Several functions included the 'd' parameter but never used it, additionally the value passed is always None. Signed-off-by: Jermain Horsman Signed-off-by: Alexandre Belloni (cherry picked from commit 9e03ce0426576ebef3739dc1dfec4f7cd73ae094) Signed-off-by: Steve Sakoman --- meta/lib/oe/buildcfg.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py index b9d32c7cc1..b3fe510309 100644 --- a/meta/lib/oe/buildcfg.py +++ b/meta/lib/oe/buildcfg.py @@ -5,23 +5,23 @@ import bb.process def detect_revision(d): path = get_scmbasepath(d) - return get_metadata_git_revision(path, d) + return get_metadata_git_revision(path) def detect_branch(d): path = get_scmbasepath(d) - return get_metadata_git_branch(path, d) + return get_metadata_git_branch(path) def get_scmbasepath(d): return os.path.join(d.getVar('COREBASE'), 'meta') -def get_metadata_git_branch(path, d): +def get_metadata_git_branch(path): try: rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path) except bb.process.ExecutionError: rev = '' return rev.strip() -def get_metadata_git_revision(path, d): +def get_metadata_git_revision(path): try: rev, _ = bb.process.run('git rev-parse HEAD', cwd=path) except bb.process.ExecutionError: @@ -46,5 +46,5 @@ def get_layer_revisions(d): layers = (d.getVar("BBLAYERS") or "").split() revisions = [] for i in layers: - revisions.append((i, os.path.basename(i), get_metadata_git_branch(i, None).strip(), get_metadata_git_revision(i, None), is_layer_modified(i))) + revisions.append((i, os.path.basename(i), get_metadata_git_branch(i).strip(), get_metadata_git_revision(i), is_layer_modified(i))) return revisions From patchwork Thu Nov 30 20:57:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 35476 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 E6CF3C4167B for ; Thu, 30 Nov 2023 20:58:30 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.5178.1701377902826582051 for ; Thu, 30 Nov 2023 12:58:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Xrtdi+C3; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6cdd214bce1so1400106b3a.3 for ; Thu, 30 Nov 2023 12:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1701377902; x=1701982702; darn=lists.openembedded.org; 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=9bVOuwccodtqtSfFuZZoqFTmDOPlj4kwpQWNjff27KU=; b=Xrtdi+C3hfhV0skFPFOihkDRcCkpZeskLtTgZJlgosh218rZfwAsHl0/bef+BLQ1mR Lm3VFvPmKDVORz/e7gcrvnvzv6ld4aC8pwCw9gTsrG5kvXUJhv/bHTQzFmC5mLUmt82T yrohQxb8MLWhkQuSBpRBLW3kiNmOxqOgbh0wy9II7zSlhIbmEBmTBeNbRR2YewzRzgRu kCZe1PBg7nu4zcSUnRTs5VT9ccdxBCfPH/YJFtATI4mdRKPdWgGHDHpQz4Y3p7kTpttj tdxOH9CWW8my2Qa8y/8V1s4RkZdYgKU7yWqNvMgNXUSqQ5RXbfQz+BXgcD4rWHXn3K6Z T+zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701377902; x=1701982702; 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=9bVOuwccodtqtSfFuZZoqFTmDOPlj4kwpQWNjff27KU=; b=pE6HNBgm37UviwqIBQF/nUzwjPfsw/zlnaUAX1iziRhsSTyJv8ljpHv2Cov9cR3yJo TZgKRthEwKFAiImEnneuqZVaEcZT26vKeTSPQ70wsvbbq98UjT1ki78Fo95JyFs4A1x6 x0tXgYguQJTSN/FMFYe6P5n13zkWbzS75/jWK6zyk5bquv2EuOYqqDhJrm0g+nTdD2BH dKqdqbJafyHDkV5X6utrpcBPpCeBPCBY5yydGQspO9k3T9eVqYMnRbWsdNEVU9BOJODZ rLB9bJ/AwbI41zc8Fz0+TDcT96xRBakoc7aNg7HTvqmQ5Kz1qH3PAhxCLS9vLG+fQtkX vtAA== X-Gm-Message-State: AOJu0YwljkPbBFxG4u/92bsfJx4jN8bcu3uWmii621AFBA422Q4TdkA5 CQqkBGj+Omi0h/wOQgo/g4+FHCduoOYNJ8jQd5ovHA== X-Google-Smtp-Source: AGHT+IGT2tJg0YZNCEE1uc2q5CIimefy4oAm3cco+yw4Kn+EuLN2ivfIi39KFIiQ+mSokH0v6FXpCw== X-Received: by 2002:a05:6a00:999:b0:6cd:fcef:5d94 with SMTP id u25-20020a056a00099900b006cdfcef5d94mr218714pfg.16.1701377901929; Thu, 30 Nov 2023 12:58:21 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id f18-20020aa79d92000000b006cbbc07a1c0sm1635418pfq.156.2023.11.30.12.58.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 12:58:21 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 25/25] lib/oe/path: Deploy files can start only with a dot Date: Thu, 30 Nov 2023 10:57:33 -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, 30 Nov 2023 20:58:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191543 From: Vyacheslav Yurkov There might be only hidden files deployed. In that case we don't need a generic wildcard present in copy command, otherwise it fails with: Exception: subprocess.CalledProcessError: Command 'cp -afl --preserve=xattr ./.??* ./* /tmp/deploy/images/qemux86-64' returned non-zero exit status 1. Subprocess output: cp: cannot stat './*': No such file or directory Signed-off-by: Vyacheslav Yurkov Signed-off-by: Alexandre Belloni (cherry picked from commit f92c751281609ea6bd6b838307de4bc70bf26ab9) Signed-off-by: Steve Sakoman --- meta/lib/oe/path.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 0dc8f172d5..e2f1913a35 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -125,7 +125,8 @@ def copyhardlinktree(src, dst): if os.path.isdir(src): if len(glob.glob('%s/.??*' % src)) > 0: source = './.??* ' - source += './*' + if len(glob.glob('%s/**' % src)) > 0: + source += './*' s_dir = src else: source = src