From patchwork Mon Oct 30 02:20:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33067 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 B6991C4167B for ; Mon, 30 Oct 2023 02:21:18 +0000 (UTC) Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) by mx.groups.io with SMTP id smtpd.web11.140925.1698632473030552933 for ; Sun, 29 Oct 2023 19:21:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=UJD9DWG5; spf=softfail (domain: sakoman.com, ip: 209.85.161.48, mailfrom: steve@sakoman.com) Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-58706a0309dso207384eaf.1 for ; Sun, 29 Oct 2023 19:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698632472; x=1699237272; 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=mv6L6th7l9/yfHrfniEZ93rLz1uu2SI8cEtfuG3z8B4=; b=UJD9DWG5JNQATnyuLES3S9WHCQeG3H+BnexpX+J2IgSslnuhchRWRm5ykxtbT4CvPu blC+uiGHGTCDh8EzCJZuoOs5VMeeBTjIp636WxYD8jXUD+6SeVzWuAP5Imw53yINk6/O 7az4rthSQEVqAa1ynimbHFzIVETV7SJHgcHuSH2UGRvBB68AYr9Wn8JlAPBD9s7VA3MB FNzGsfbYcTkzbfTFLH4US1bsh+MCc31oUaXebbnFPr/Z+d6bd+abvfyxopgZh+nbrvig e7FXzEOVhiKbjFbeSsYPnu1fbKvR3juszs3yMDtVJ8LUihPDRFK1X+Pq5HN2IXG3Uosr TN0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698632472; x=1699237272; 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=mv6L6th7l9/yfHrfniEZ93rLz1uu2SI8cEtfuG3z8B4=; b=X/aOcSA6YvDXnIy4+StFPa5bF7wKIlvuXb9luI2opWlSTo5o7x6ccpGysaa6HaJPEY DvvLCNQ7eGQ714KA+LAyn4zHseLQeBhLj+ZPUPqHUY4PyPm1r812SV0ydJUyBnrYwVUQ mOFbmpbImX5yaqbYEPs+vUeVIAgxNrnyd3WDclgjh3BkhKeNozG1+8YUbSTwuQOoiBgE DtD2fzP8OsZsrKsg+PvLudFxiDcB0OfXADFvxq6l6c4T3WFaPJ5SHPA2ze3sF5DtVO2O ESCCJhoNSGQCO9sAYbmB7SBQSuqDxZlyMA1waZ0xvMTUQoykYdooRhGd6qYd16kN0sR4 IK7A== X-Gm-Message-State: AOJu0YwgtDAZHjUn6el3sEliKKYjzGrdKsDnqM1LonSNP51e7QATlCaa 8tJcZ7Fz80H+ydBAxCGtl+jZJLYHXIdTbzSQJIgJgA== X-Google-Smtp-Source: AGHT+IHWmZW2pw6W2qBebnb7tnfr+Kipwb88dz/nFHgaoSClQNwNvkbuw8/Y4+3kz22/qhDJ0M20ew== X-Received: by 2002:a05:6358:590a:b0:168:e8ef:2415 with SMTP id g10-20020a056358590a00b00168e8ef2415mr11778133rwf.8.1698632471711; Sun, 29 Oct 2023 19:21:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id k2-20020a637b42000000b0057412d84d25sm3900046pgn.4.2023.10.29.19.21.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:21:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 1/7] cve-exclusion_5.10.inc: update for 5.10.197 Date: Sun, 29 Oct 2023 16:20:52 -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 ; Mon, 30 Oct 2023 02:21:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189781 Signed-off-by: Steve Sakoman --- .../linux/cve-exclusion_5.10.inc | 123 ++++++++++++++---- 1 file changed, 100 insertions(+), 23 deletions(-) diff --git a/meta/recipes-kernel/linux/cve-exclusion_5.10.inc b/meta/recipes-kernel/linux/cve-exclusion_5.10.inc index 2f58117d6f..7b4f68c428 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_5.10.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_5.10.inc @@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-09-23 10:42:09.595192 for version 5.10.188 +# Generated at 2023-10-24 06:17:08.900468 for version 5.10.197 python check_kernel_cve_status_version() { - this_version = "5.10.188" + this_version = "5.10.197" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) @@ -4834,7 +4834,8 @@ CVE_CHECK_IGNORE += "CVE-2020-27194" # fixed-version: Fixed after version 5.6rc4 CVE_CHECK_IGNORE += "CVE-2020-2732" -# CVE-2020-27418 has no known resolution +# fixed-version: Fixed after version 5.6rc5 +CVE_CHECK_IGNORE += "CVE-2020-27418" # fixed-version: Fixed after version 5.10rc1 CVE_CHECK_IGNORE += "CVE-2020-27673" @@ -4976,6 +4977,9 @@ CVE_CHECK_IGNORE += "CVE-2020-36691" # fixed-version: Fixed after version 5.10 CVE_CHECK_IGNORE += "CVE-2020-36694" +# fixed-version: Fixed after version 5.9rc1 +CVE_CHECK_IGNORE += "CVE-2020-36766" + # cpe-stable-backport: Backported in 5.10.61 CVE_CHECK_IGNORE += "CVE-2020-3702" @@ -6424,7 +6428,8 @@ CVE_CHECK_IGNORE += "CVE-2022-40768" # cpe-stable-backport: Backported in 5.10.142 CVE_CHECK_IGNORE += "CVE-2022-4095" -# CVE-2022-40982 needs backporting (fixed from 5.10.189) +# cpe-stable-backport: Backported in 5.10.189 +CVE_CHECK_IGNORE += "CVE-2022-40982" # cpe-stable-backport: Backported in 5.10.163 CVE_CHECK_IGNORE += "CVE-2022-41218" @@ -6683,12 +6688,14 @@ CVE_CHECK_IGNORE += "CVE-2023-1192" # CVE-2023-1193 has no known resolution -# CVE-2023-1194 has no known resolution +# fixed-version: only affects 5.15rc1 onwards +CVE_CHECK_IGNORE += "CVE-2023-1194" # fixed-version: only affects 5.16rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-1195" -# CVE-2023-1206 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-1206" # cpe-stable-backport: Backported in 5.10.110 CVE_CHECK_IGNORE += "CVE-2023-1249" @@ -6768,9 +6775,11 @@ CVE_CHECK_IGNORE += "CVE-2023-2008" # fixed-version: only affects 5.12rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-2019" -# CVE-2023-20569 needs backporting (fixed from 5.10.189) +# cpe-stable-backport: Backported in 5.10.189 +CVE_CHECK_IGNORE += "CVE-2023-20569" -# CVE-2023-20588 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-20588" # cpe-stable-backport: Backported in 5.10.187 CVE_CHECK_IGNORE += "CVE-2023-20593" @@ -6973,7 +6982,7 @@ CVE_CHECK_IGNORE += "CVE-2023-3106" # CVE-2023-31084 needs backporting (fixed from 6.4rc3) -# CVE-2023-31085 has no known resolution +# CVE-2023-31085 needs backporting (fixed from 5.10.198) # cpe-stable-backport: Backported in 5.10.184 CVE_CHECK_IGNORE += "CVE-2023-3111" @@ -7089,6 +7098,8 @@ CVE_CHECK_IGNORE += "CVE-2023-34256" # fixed-version: only affects 6.1 onwards CVE_CHECK_IGNORE += "CVE-2023-34319" +# CVE-2023-34324 needs backporting (fixed from 5.10.198) + # fixed-version: only affects 5.15rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-3439" @@ -7136,7 +7147,8 @@ CVE_CHECK_IGNORE += "CVE-2023-37453" # CVE-2023-37454 has no known resolution -# CVE-2023-3772 needs backporting (fixed from 5.10.192) +# cpe-stable-backport: Backported in 5.10.192 +CVE_CHECK_IGNORE += "CVE-2023-3772" # fixed-version: only affects 5.17rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-3773" @@ -7186,16 +7198,35 @@ CVE_CHECK_IGNORE += "CVE-2023-3866" # fixed-version: only affects 5.15rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-3867" +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-39189" + +# CVE-2023-39191 needs backporting (fixed from 6.3rc1) + +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-39192" + +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-39193" + +# cpe-stable-backport: Backported in 5.10.192 +CVE_CHECK_IGNORE += "CVE-2023-39194" + # cpe-stable-backport: Backported in 5.10.188 CVE_CHECK_IGNORE += "CVE-2023-4004" # CVE-2023-4010 has no known resolution -# CVE-2023-4015 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-4015" -# CVE-2023-40283 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-40283" -# CVE-2023-4128 needs backporting (fixed from 5.10.190) +# CVE-2023-40791 needs backporting (fixed from 6.5rc6) + +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-4128" # cpe-stable-backport: Backported in 5.10.188 CVE_CHECK_IGNORE += "CVE-2023-4132" @@ -7204,7 +7235,8 @@ CVE_CHECK_IGNORE += "CVE-2023-4132" # CVE-2023-4134 needs backporting (fixed from 6.5rc1) -# CVE-2023-4147 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-4147" # fixed-version: only affects 5.11rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-4155" @@ -7212,15 +7244,33 @@ CVE_CHECK_IGNORE += "CVE-2023-4155" # fixed-version: only affects 6.3rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-4194" -# CVE-2023-4206 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-4206" + +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-4207" + +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-4208" + +# CVE-2023-4244 needs backporting (fixed from 5.10.198) + +# cpe-stable-backport: Backported in 5.10.190 +CVE_CHECK_IGNORE += "CVE-2023-4273" -# CVE-2023-4207 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-42752" -# CVE-2023-4208 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-42753" -# CVE-2023-4244 needs backporting (fixed from 6.5rc7) +# CVE-2023-42754 needs backporting (fixed from 5.10.198) -# CVE-2023-4273 needs backporting (fixed from 5.10.190) +# cpe-stable-backport: Backported in 5.10.197 +CVE_CHECK_IGNORE += "CVE-2023-42755" + +# fixed-version: only affects 6.4rc6 onwards +CVE_CHECK_IGNORE += "CVE-2023-42756" # cpe-stable-backport: Backported in 5.10.121 CVE_CHECK_IGNORE += "CVE-2023-4385" @@ -7234,22 +7284,49 @@ CVE_CHECK_IGNORE += "CVE-2023-4389" # fixed-version: only affects 5.16rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-4394" +# fixed-version: only affects 5.11rc1 onwards +CVE_CHECK_IGNORE += "CVE-2023-44466" + # cpe-stable-backport: Backported in 5.10.118 CVE_CHECK_IGNORE += "CVE-2023-4459" -# CVE-2023-4563 needs backporting (fixed from 6.5rc6) +# CVE-2023-4563 needs backporting (fixed from 5.10.198) # fixed-version: only affects 5.13rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-4569" +# cpe-stable-backport: Backported in 5.10.173 +CVE_CHECK_IGNORE += "CVE-2023-45862" + +# CVE-2023-45863 needs backporting (fixed from 6.3rc1) + +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-45871" + +# CVE-2023-45898 needs backporting (fixed from 6.6rc1) + +# CVE-2023-4610 has no known resolution + # fixed-version: only affects 6.4rc1 onwards CVE_CHECK_IGNORE += "CVE-2023-4611" # CVE-2023-4622 needs backporting (fixed from 6.5rc1) -# CVE-2023-4623 needs backporting (fixed from 6.6rc1) +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-4623" + +# cpe-stable-backport: Backported in 5.10.53 +CVE_CHECK_IGNORE += "CVE-2023-4732" + +# CVE-2023-4881 needs backporting (fixed from 5.10.198) -# CVE-2023-4881 needs backporting (fixed from 6.6rc1) +# cpe-stable-backport: Backported in 5.10.195 +CVE_CHECK_IGNORE += "CVE-2023-4921" -# CVE-2023-4921 needs backporting (fixed from 6.6rc1) +# CVE-2023-5158 has no known resolution + +# CVE-2023-5197 needs backporting (fixed from 5.10.198) + +# fixed-version: only affects 6.1rc1 onwards +CVE_CHECK_IGNORE += "CVE-2023-5345" From patchwork Mon Oct 30 02:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33064 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 C6F54C4167D for ; Mon, 30 Oct 2023 02:21:18 +0000 (UTC) Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by mx.groups.io with SMTP id smtpd.web11.140926.1698632474958144298 for ; Sun, 29 Oct 2023 19:21:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=XzrSRE0e; spf=softfail (domain: sakoman.com, ip: 209.85.161.42, mailfrom: steve@sakoman.com) Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-586ad15f9aaso2027039eaf.2 for ; Sun, 29 Oct 2023 19:21:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698632474; x=1699237274; 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=2UPhbTkxwEAoiXp5z2+L55ZX+aVu1a/kxnF5S8/Eiqo=; b=XzrSRE0eb3B5jtqEVpxXyzvBYJMhjxQI9cqjmcbvABYoPiGF71NjVw9DRrWqL0u9tX l44Tb7yKmuK14E0ye4AUdyz07KFpWTRVrGM72w7AEEntUBkM7pcNYfpLa249BhbNwzsv Yy0zsJ7sP1wr2uYudgZLKgbZEokhfcFQnxnkIAm+ER8eVxP8rCZV+g/M/mcpWnqLI9df 7TbW2hevkY8StqgERZo/qdGJDxmX3ojpktcJFzlBO1iEVOJc+B88Hst/iK2obKYy1TSU HTkMgP0JjlYfhWkr2aw7htmfjhBTfydGHIQU+/05w2igEKB6iscBR6VFVKCVuvfYniE4 y9SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698632474; x=1699237274; 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=2UPhbTkxwEAoiXp5z2+L55ZX+aVu1a/kxnF5S8/Eiqo=; b=Vi5pmyns1zx3yGBP6oOfdkqmgNaDHw2DVBL55sPdT6A1mdsHsHlNaKGQ9fVuFVxY/H s4yRKzwJ+XqNu5E215l58My96SNa7ToZaVEvwQWEW5+4YSG0TIfDys7E9YlHeuNjEG9I rbME2E/BgtmBnqEL6E01kNpUGUFDQ5PTck3w9yP3QYM98LUqJMuvbu2K6AFaEcETgaZb pKZMtEJRBdsI5qGVx+28koZ9TR3gvR3nDmiGrIpOFu3DlercbRHTxAqYupbCyLyUp+Cv 3LriNbFKfdMhQ+BMkSF3DghhczMNNIS53KpX+tpy/d4Xac0E6OihRONpSPLBhqC5CLWy l39g== X-Gm-Message-State: AOJu0Yyr2FcDKgAQ7dLBrNQ/k4CyECTYDKGC7edlgLQaxcgVxWbEJd0c 690c4RWWvnR+nsBM4o8Z6eq1H7zfMGqgN08nAubEjQ== X-Google-Smtp-Source: AGHT+IHt++3zhKEgJS3YcwS8A4XvA6jNVzM0RQHbcZNsn2Tk4iNilSCY5x55iLFb2IeZgr03ei8m5A== X-Received: by 2002:a05:6359:6c87:b0:168:ea50:fcc6 with SMTP id td7-20020a0563596c8700b00168ea50fcc6mr6509568rwb.16.1698632473663; Sun, 29 Oct 2023 19:21:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id k2-20020a637b42000000b0057412d84d25sm3900046pgn.4.2023.10.29.19.21.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:21:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 2/7] curl: fix CVE-2023-38545 Date: Sun, 29 Oct 2023 16:20:53 -1000 Message-Id: <44971c945a615d07c91100f514377f7247796334.1698632320.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 ; Mon, 30 Oct 2023 02:21:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189782 From: Archana Polampalli This flaw makes curl overflow a heap based buffer in the SOCKS5 proxy handshake. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2023-38545.patch | 133 ++++++++++++++++++ meta/recipes-support/curl/curl_7.82.0.bb | 1 + 2 files changed, 134 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2023-38545.patch diff --git a/meta/recipes-support/curl/curl/CVE-2023-38545.patch b/meta/recipes-support/curl/curl/CVE-2023-38545.patch new file mode 100644 index 0000000000..c198d29c04 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-38545.patch @@ -0,0 +1,133 @@ +From fb4415d8aee6c1045be932a34fe6107c2f5ed147 Mon Sep 17 00:00:00 2001 +From: Jay Satiro +Date: Wed, 11 Oct 2023 07:34:19 +0200 +Subject: [PATCH] socks: return error if hostname too long for remote resolve + +Prior to this change the state machine attempted to change the remote +resolve to a local resolve if the hostname was longer than 255 +characters. Unfortunately that did not work as intended and caused a +security issue. + +Upstream-Status: Backport [https://github.com/curl/curl/commit/fb4415d8aee6c1045be932a34fe6107c2f5ed147] + +CVE: CVE-2023-38545 + +Signed-off-by: Archana Polampalli +--- + lib/socks.c | 8 +++--- + tests/data/Makefile.inc | 2 +- + tests/data/test722 | 64 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 69 insertions(+), 5 deletions(-) + create mode 100644 tests/data/test722 + +diff --git a/lib/socks.c b/lib/socks.c +index a014aa6..2215c02 100644 +--- a/lib/socks.c ++++ b/lib/socks.c +@@ -536,9 +536,9 @@ CURLproxycode Curl_SOCKS5(const char *proxy_user, + + /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ + if(!socks5_resolve_local && hostname_len > 255) { +- infof(data, "SOCKS5: server resolving disabled for hostnames of " +- "length > 255 [actual len=%zu]", hostname_len); +- socks5_resolve_local = TRUE; ++ failf(data, "SOCKS5: the destination hostname is too long to be " ++ "resolved remotely by the proxy."); ++ return CURLPX_LONG_HOSTNAME; + } + + if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) +@@ -879,7 +879,7 @@ CURLproxycode Curl_SOCKS5(const char *proxy_user, + } + else { + socksreq[len++] = 3; +- socksreq[len++] = (char) hostname_len; /* one byte address length */ ++ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ + memcpy(&socksreq[len], hostname, hostname_len); /* address w/o NULL */ + len += hostname_len; + } +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 3064b39..47117b6 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -99,7 +99,7 @@ test670 test671 test672 test673 test674 test675 test676 test677 test678 \ + \ + test700 test701 test702 test703 test704 test705 test706 test707 test708 \ + test709 test710 test711 test712 test713 test714 test715 test716 test717 \ +-test718 test719 test720 test721 \ ++test718 test719 test720 test721 test722 \ + \ + test800 test801 test802 test803 test804 test805 test806 test807 test808 \ + test809 test810 test811 test812 test813 test814 test815 test816 test817 \ +diff --git a/tests/data/test722 b/tests/data/test722 +new file mode 100644 +index 0000000..05bcf28 +--- /dev/null ++++ b/tests/data/test722 +@@ -0,0 +1,64 @@ ++ ++ ++ ++HTTP ++HTTP GET ++SOCKS5 ++SOCKS5h ++followlocation ++ ++ ++ ++# ++# Server-side ++ ++# The hostname in this redirect is 256 characters and too long (> 255) for ++# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case. ++ ++HTTP/1.1 301 Moved Permanently ++Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ ++Content-Length: 0 ++Connection: close ++ ++ ++ ++ ++# ++# Client-side ++ ++ ++proxy ++ ++ ++http ++socks5 ++ ++ ++SOCKS5h with HTTP redirect to hostname too long ++ ++ ++--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER ++ ++ ++ ++# ++# Verify data after the test has been "shot" ++ ++ ++GET /%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++97 ++ ++# the error message is verified because error code CURLE_PROXY (97) may be ++# returned for any number of reasons and we need to make sure it is ++# specifically for the reason below so that we know the check is working. ++ ++curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy. ++ ++ ++ +-- +2.40.0 diff --git a/meta/recipes-support/curl/curl_7.82.0.bb b/meta/recipes-support/curl/curl_7.82.0.bb index af52ecad13..86a3a84332 100644 --- a/meta/recipes-support/curl/curl_7.82.0.bb +++ b/meta/recipes-support/curl/curl_7.82.0.bb @@ -52,6 +52,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2023-28322-1.patch \ file://CVE-2023-28322-2.patch \ file://CVE-2023-32001.patch \ + file://CVE-2023-38545.patch \ " SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c" From patchwork Mon Oct 30 02:20:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33066 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 C7BACC41535 for ; Mon, 30 Oct 2023 02:21:18 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web10.140907.1698632476654365631 for ; Sun, 29 Oct 2023 19:21:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=2scP4yvE; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-577fff1cae6so2650572a12.1 for ; Sun, 29 Oct 2023 19:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698632476; x=1699237276; 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=rrGaftOOqY8N0zNOXDwm8ETc11HgZ3LY6PN7GmQPOlg=; b=2scP4yvEa+VezYeJAV11iDKLmN8FxI8Ei2/zgDoHnGjgAz6RmscREYueiUUD8fBu+s ZnF1Vtev+yH2nglUaHJQdCfBgG8ltlB9QDzSjXLpZPFqHpVa0b0JofBAELDMz3ZTo6ph jD6uhU22Sz68Km08YTYpKMR/iM5/Oyb59aWhliyqbod4iafbpNLzon0E+SM+urbLHyQ/ lrqrL0ul66lLrY/05GOUsxAnsXFmgDEa0/hQHhi+ejSXxPEFIYgFcQvaiHNfOwJCkAAI lhh2x4vnneDwjSpxZHCEoTyZrikEnuumu30a/Ib/cfQQA6uPKOoTVkgSOfWmTrBJxTsF rkNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698632476; x=1699237276; 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=rrGaftOOqY8N0zNOXDwm8ETc11HgZ3LY6PN7GmQPOlg=; b=XmPeQu2GEh/sQQK00NdxUPOyZC/DyceIzpOVZu0mtFFnP14KUbAPD4oyTT3jH37CrD 0kKHT6NYAaSOAjPWZbp3UVHSUb+Afe7TroqwNkPyZcoB7fLJxCaFcTPcTky2WLKovWV3 HH5gvbCEDyjoexRD4jvRig2BO69lnNjWulVCdR9FaNQVXj5Ma0YSMKJSB9/PAXiWx2i+ LsC/crPyQn+eSH8dGMI14fQ66ykgXiT5bHRPbZ7Q7/tHkZXPPXnA/znY80zqyrECRI8G nylJcVqaoqGuwj/6i4k9YdWD+0cgjeTSNGCn/L+Fe0nBSWWv420/jZ4Gkbx1U0cwrsD4 9B5A== X-Gm-Message-State: AOJu0YzHAjv4ewZ6zzYhwgHElKk8e+Fm2bGGJ5o8+0iI43rA0NGfFtOp qgUJoVpdjyBrL9tfXefUOB8Mnr+gEm4KWaZAlfrQpg== X-Google-Smtp-Source: AGHT+IECWmX/74y4B6A4YImByGVabdQDR33P6TbFdxV4/fzOkudTs5tjPc/m2mexgTFIs5FMonv9ig== X-Received: by 2002:a05:6a20:938e:b0:15d:4cf1:212e with SMTP id x14-20020a056a20938e00b0015d4cf1212emr13451231pzh.4.1698632475375; Sun, 29 Oct 2023 19:21:15 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id k2-20020a637b42000000b0057412d84d25sm3900046pgn.4.2023.10.29.19.21.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:21:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 3/7] curl: fix CVE-2023-38546 Date: Sun, 29 Oct 2023 16:20:54 -1000 Message-Id: <9c0c09b81594979aafd74511366316419d23046e.1698632320.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 ; Mon, 30 Oct 2023 02:21:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189783 From: Archana Polampalli A flaw was found in the Curl package. This flaw allows an attacker to insert cookies into a running program using libcurl if the specific series of conditions are met. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2023-38546.patch | 137 ++++++++++++++++++ meta/recipes-support/curl/curl_7.82.0.bb | 1 + 2 files changed, 138 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2023-38546.patch diff --git a/meta/recipes-support/curl/curl/CVE-2023-38546.patch b/meta/recipes-support/curl/curl/CVE-2023-38546.patch new file mode 100644 index 0000000000..1b2f1e7a7d --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-38546.patch @@ -0,0 +1,137 @@ +From 61275672b46d9abb3285740467b882e22ed75da8 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 14 Sep 2023 23:28:32 +0200 +Subject: [PATCH] cookie: remove unnecessary struct fields + +Plus: reduce the hash table size from 256 to 63. It seems unlikely to +make much of a speed difference for most use cases but saves 1.5KB of +data per instance. + +Closes #11862 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/61275672b46d9abb32857404] + +CVE: CVE-2023-38546 + +Signed-off-by: Archana Polampalli +--- + lib/cookie.c | 13 +------------ + lib/cookie.h | 13 ++++--------- + lib/easy.c | 4 +--- + 3 files changed, 6 insertions(+), 24 deletions(-) + +diff --git a/lib/cookie.c b/lib/cookie.c +index e0470a1..38d8d6c 100644 +--- a/lib/cookie.c ++++ b/lib/cookie.c +@@ -115,7 +115,6 @@ static void freecookie(struct Cookie *co) + free(co->name); + free(co->value); + free(co->maxage); +- free(co->version); + free(co); + } + +@@ -707,11 +706,7 @@ Curl_cookie_add(struct Curl_easy *data, + } + } + else if(strcasecompare("version", name)) { +- strstore(&co->version, whatptr); +- if(!co->version) { +- badcookie = TRUE; +- break; +- } ++ /* just ignore */ + } + else if(strcasecompare("max-age", name)) { + /* +@@ -1132,7 +1127,6 @@ Curl_cookie_add(struct Curl_easy *data, + free(clist->path); + free(clist->spath); + free(clist->expirestr); +- free(clist->version); + free(clist->maxage); + + *clist = *co; /* then store all the new data */ +@@ -1210,9 +1204,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, + c = calloc(1, sizeof(struct CookieInfo)); + if(!c) + return NULL; /* failed to get memory */ +- c->filename = strdup(file?file:"none"); /* copy the name just in case */ +- if(!c->filename) +- goto fail; /* failed to get memory */ + /* + * Initialize the next_expiration time to signal that we don't have enough + * information yet. +@@ -1363,7 +1354,6 @@ static struct Cookie *dup_cookie(struct Cookie *src) + CLONE(name); + CLONE(value); + CLONE(maxage); +- CLONE(version); + d->expires = src->expires; + d->tailmatch = src->tailmatch; + d->secure = src->secure; +@@ -1579,7 +1569,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c) + { + if(c) { + unsigned int i; +- free(c->filename); + for(i = 0; i < COOKIE_HASH_SIZE; i++) + Curl_cookie_freelist(c->cookies[i]); + free(c); /* free the base struct as well */ +diff --git a/lib/cookie.h b/lib/cookie.h +index 7411980..645600a 100644 +--- a/lib/cookie.h ++++ b/lib/cookie.h +@@ -34,11 +34,7 @@ struct Cookie { + char *domain; /* domain = */ + curl_off_t expires; /* expires = */ + char *expirestr; /* the plain text version */ +- +- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */ +- char *version; /* Version = */ + char *maxage; /* Max-Age = */ +- + bool tailmatch; /* whether we do tail-matching of the domain name */ + bool secure; /* whether the 'secure' keyword was used */ + bool livecookie; /* updated from a server, not a stored file */ +@@ -54,18 +50,17 @@ struct Cookie { + #define COOKIE_PREFIX__SECURE (1<<0) + #define COOKIE_PREFIX__HOST (1<<1) + +-#define COOKIE_HASH_SIZE 256 ++#define COOKIE_HASH_SIZE 63 + + struct CookieInfo { + /* linked list of cookies we know of */ + struct Cookie *cookies[COOKIE_HASH_SIZE]; + +- char *filename; /* file we read from/write to */ +- long numcookies; /* number of cookies in the "jar" */ ++ curl_off_t next_expiration; /* the next time at which expiration happens */ ++ int numcookies; /* number of cookies in the "jar" */ ++ int lastct; /* last creation-time used in the jar */ + bool running; /* state info, for cookie adding information */ + bool newsession; /* new session, discard session cookies on load */ +- int lastct; /* last creation-time used in the jar */ +- curl_off_t next_expiration; /* the next time at which expiration happens */ + }; + + /* This is the maximum line length we accept for a cookie line. RFC 2109 +diff --git a/lib/easy.c b/lib/easy.c +index 0e23561..31abf9e 100644 +--- a/lib/easy.c ++++ b/lib/easy.c +@@ -841,9 +841,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) + if(data->cookies) { + /* If cookies are enabled in the parent handle, we enable them + in the clone as well! */ +- outcurl->cookies = Curl_cookie_init(data, +- data->cookies->filename, +- outcurl->cookies, ++ outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies, + data->set.cookiesession); + if(!outcurl->cookies) + goto fail; +-- +2.40.0 diff --git a/meta/recipes-support/curl/curl_7.82.0.bb b/meta/recipes-support/curl/curl_7.82.0.bb index 86a3a84332..471bc47f34 100644 --- a/meta/recipes-support/curl/curl_7.82.0.bb +++ b/meta/recipes-support/curl/curl_7.82.0.bb @@ -53,6 +53,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2023-28322-2.patch \ file://CVE-2023-32001.patch \ file://CVE-2023-38545.patch \ + file://CVE-2023-38546.patch \ " SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c" From patchwork Mon Oct 30 02:20:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33065 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 D5EEAC00142 for ; Mon, 30 Oct 2023 02:21:18 +0000 (UTC) Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by mx.groups.io with SMTP id smtpd.web11.140928.1698632478553246685 for ; Sun, 29 Oct 2023 19:21:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=WkAhWrWr; spf=softfail (domain: sakoman.com, ip: 209.85.128.170, mailfrom: steve@sakoman.com) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-5a7eef0b931so34634927b3.0 for ; Sun, 29 Oct 2023 19:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698632477; x=1699237277; 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=y6u/zHt05jDeWbzYFJCd5z6Z/7a0cjGeG44NaWAJLso=; b=WkAhWrWrGHTL8Z29DYnAiRbrv00bJslTnbKru0wZxm5th7RzRVh/fPi48HZutI97L4 yjGACfDRb9fg6PkdbJMFA9Q5We2W8FE1zwUORCpjcwbmsr8fbV3Ooq2Bifny0Rg8+dq+ eZK0nGhhcm+BRcHvRkfoSfuZHCA/VTz1R4cbB3IB5vRJmv8rQbObYKUQ5ZtWdcr60cFr rb7pfjqwwWf/hMbkBsObK1+pTAO6JyjZfYCcWe6OTxj3HNhCuYrtOzQRmX/ydZJGOrdG nyShjSpt+/i/1pcV3FQrXHM6BNl7H9cX77fPhCx2px41YxwJcKW8UIH6PDvZ0V8BFq+q 68Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698632477; x=1699237277; 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=y6u/zHt05jDeWbzYFJCd5z6Z/7a0cjGeG44NaWAJLso=; b=G0woiCyg9yGwqcgsS5vQ1IWo0PIO4t6Xktm8H+gVG1jXtqsiUqrzOpmeSBGBommFxw hnCQxcq91QbPOBH0MTAugnNxtv5Qfsh5tAPsx+9+cWP4Zl0Vn/7EFfOJyKOYlu0kVghT PMQUFIGv1KJshC+NJzvFWxcgxj6+OaWRo+H8A9ZvzevaUhDw1h56yIL1//KVAVbkNmk/ hmFRCD/pp6ENHAXaX2A0LU+vM9Wj7yMNmveBEU7Q+yRwIX7y58yO5mTEF2BO6wDKRw9X ZZrv9bznMJsR1xMHUFV+Pshfec8yHvVL80Q/0tcibvj1cgX62Csa90iG92DeVH8FqAOB Q4FA== X-Gm-Message-State: AOJu0YxjCmaz4rNifFOkEKWk0Sbz8QtymzCvUJu5WtZafGZkXWHI0aYL EmY0h1p+Be/qJoToqqs/tzH74ksjACGfsXfSPKEkuA== X-Google-Smtp-Source: AGHT+IF7MvIOEwXqIGOGofZKEHocKfQt43OCIZGDKbtyvbMO3Wk20QaPqlxsYov3lArSP2m/Y5mgLA== X-Received: by 2002:a25:d342:0:b0:d9a:c28f:274 with SMTP id e63-20020a25d342000000b00d9ac28f0274mr7647210ybf.31.1698632477353; Sun, 29 Oct 2023 19:21:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id k2-20020a637b42000000b0057412d84d25sm3900046pgn.4.2023.10.29.19.21.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:21:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 4/7] openssl: Upgrade 3.0.11 -> 3.0.12 Date: Sun, 29 Oct 2023 16:20:55 -1000 Message-Id: <5cf9f9426de71a35b06c7b4b9b092f22243676fb.1698632320.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 ; Mon, 30 Oct 2023 02:21:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189784 From: Peter Marko https://github.com/openssl/openssl/blob/openssl-3.0/NEWS.md#major-changes-between-openssl-3011-and-openssl-3012-24-oct-2023 Major changes between OpenSSL 3.0.11 and OpenSSL 3.0.12 [24 Oct 2023] * Mitigate incorrect resize handling for symmetric cipher keys and IVs. (CVE-2023-5363) Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../openssl/{openssl_3.0.11.bb => openssl_3.0.12.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/openssl/{openssl_3.0.11.bb => openssl_3.0.12.bb} (99%) diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.11.bb b/meta/recipes-connectivity/openssl/openssl_3.0.12.bb similarity index 99% rename from meta/recipes-connectivity/openssl/openssl_3.0.11.bb rename to meta/recipes-connectivity/openssl/openssl_3.0.12.bb index 22eaa3af33..d8c9b073a2 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.11.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.12.bb @@ -18,7 +18,7 @@ SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55" +SRC_URI[sha256sum] = "f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61" inherit lib_package multilib_header multilib_script ptest perlnative MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" From patchwork Mon Oct 30 02:20:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33068 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 D5BF8C4332F for ; Mon, 30 Oct 2023 02:21:28 +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.140908.1698632480179455510 for ; Sun, 29 Oct 2023 19:21:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wTw9qO+3; 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-6b44befac59so3540035b3a.0 for ; Sun, 29 Oct 2023 19:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698632479; x=1699237279; 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=jgN7aMvjuK1Z+T0XrmrNA5T3m5yp1O+b9vwsN6shfuk=; b=wTw9qO+3AopbxHxJ9SPYsGsE7IlVAI/1BEZU++8d1Rrh5Qmu2Mit7Gk+Q99aK+bihW GeqgGlQ7Jwji4z/XQ/RPWqIljblFCwEJn4wPxqVFryjyiASK/dbS0v1J1leIJhtyWAfS AcGS6zBOACnOHtnbo2JQRh5Wvdn4DEjtazuNcYXdbXj4Aj2kPvZFLmxJviWnkrBvYQy6 JY+ilqO/WGKlqXRKE8pleELoqTpB/YFIGAZr9uLIw0Xbd0faTKT4hKeQFjJHiZynpp4B 06tARcgZP3Z0YnglTpEZJi2fbnFiM3kcrIyOmNnswxJOr0wIQQB3fyelDzwQHwBr71eg wgEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698632479; x=1699237279; 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=jgN7aMvjuK1Z+T0XrmrNA5T3m5yp1O+b9vwsN6shfuk=; b=iSsnMc5/wk+6C58cWN0hqqT0ax5PuVW7SWvlDhgL/e3NCgXuINfxdMovap9lOsQGmR P+yGN58aIJSoPlG8RfLWmrcDUv1/H/MS5PnBmti46HwuVXKlmIEACGnhAOb6VK6gB329 tddUS2f6DHAYere3MEF2sBdfSXjCYfczegzfcRRPhXgTzTHnGrlQmXYpLJkXARCe+20N B7ldgZxs1PwY1MjtV/7fV3D5WFnGpeIZF8Yoa4MxeBTxtJ9SuG3lE1XA5ScrA0/30rRf 2zPkY6bj7ab2jeEAHtPRS5p7c5Bq+qCvKQotz66lyw+5b6vohkD5/vGrHzsWf4vzHo/a cTqQ== X-Gm-Message-State: AOJu0Yy8SiXBANvtac3EvwKRc7zcz20Prb9OyL7Vt7ygxS6gBLja0oAF 33Qgaxbjfsfp0PzF8LJfzeOLOCKIkzIuHfK0LG30cQ== X-Google-Smtp-Source: AGHT+IGyfAk5pB8+0DYfMn9FF1ckm+cFGAphGjZd/HtDzNFFd2Xif1ljr9+c/HIs2ACzJhepNZNcGQ== X-Received: by 2002:a05:6a20:e11d:b0:158:143d:e215 with SMTP id kr29-20020a056a20e11d00b00158143de215mr15671876pzb.1.1698632479284; Sun, 29 Oct 2023 19:21:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id k2-20020a637b42000000b0057412d84d25sm3900046pgn.4.2023.10.29.19.21.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:21:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 5/7] package_rpm: Allow compression mode override Date: Sun, 29 Oct 2023 16:20:56 -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 ; Mon, 30 Oct 2023 02:21:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189785 From: Niko Mauno Commit 4a4d5f78a6962dda5f63e9891825c80a8a87bf66 ("package_rpm: use zstd instead of xz") changed the rpm package compressor from 'xz' to 'zstd' which results in decompression failure with BusyBox-provided 'rpm2cpio' applet and 'rpm' applet when given the '-i' (Install package) option: rpm2cpio: no gzip/bzip2/xz magic Introduce a variable which makes it possible to use a different compression mode, making it possible to override the default value for example like RPMBUILD_COMPMODE = "${@'w6T%d.xzdio' % int(d.getVar('XZ_THREADS'))}" to enable rpm decompression without including the full rpm package in the resulting root filesystem. (From OE-Core rev: a40d9258148e28cbee2168c93179cd4c1232fb62) Signed-off-by: Niko Mauno Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/classes/package_rpm.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index bbbef3793f..f403af5343 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -4,6 +4,7 @@ IMAGE_PKGTYPE ?= "rpm" RPM="rpm" RPMBUILD="rpmbuild" +RPMBUILD_COMPMODE ?= "${@'w19T%d.zstdio' % int(d.getVar('ZSTD_THREADS'))}" PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms" @@ -652,6 +653,7 @@ python do_package_rpm () { # Setup the rpmbuild arguments... rpmbuild = d.getVar('RPMBUILD') + rpmbuild_compmode = d.getVar('RPMBUILD_COMPMODE') targetsys = d.getVar('TARGET_SYS') targetvendor = d.getVar('HOST_VENDOR') @@ -678,8 +680,8 @@ python do_package_rpm () { cmd = cmd + " --define '_use_internal_dependency_generator 0'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" cmd = cmd + " --define '_build_id_links none'" - cmd = cmd + " --define '_binary_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) - cmd = cmd + " --define '_source_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) + cmd = cmd + " --define '_source_payload %s'" % rpmbuild_compmode + cmd = cmd + " --define '_binary_payload %s'" % rpmbuild_compmode cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'" From patchwork Mon Oct 30 02:20:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33070 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 D91F3C4167D for ; Mon, 30 Oct 2023 02:21:28 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web11.140931.1698632482841161142 for ; Sun, 29 Oct 2023 19:21:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=sblsvaM/; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6bd73395bceso2761118b3a.0 for ; Sun, 29 Oct 2023 19:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698632482; x=1699237282; 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=08SEeGZfUzbhRA1HHm2Fxax6UvhIDfunszIJZa7foe0=; b=sblsvaM/WHeFoKwM8e3BB3OgCZe8pmeOgUqrHx7s3f12p5KIrAYg+Iz8qztWDkz4Mc Oluff0xIt4DlAB3frPBfZvoVJTyJEfnBCAN6BnBBFcpOZlDvBe+ooaHQuvlyMiOJeb+W RX1R6nX2eSvBW5avZyESCxmorRiBNsIr3IW1HZghuJ3yNidQt6YcgQ+bjWHe1B9aAW77 NwL7RraQX9vEP2i4NO0yJUbonIURS1g7a5zUrohA0oWF9KLS7cwvCRN1PuZTX/imOlOr 4wIXuLh4ctGrgFRPJesMdrb4VRJ6iLMWfhwcoqei+ZIKIyyRn00AlPySucX/Y0R2dCHZ aJ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698632482; x=1699237282; 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=08SEeGZfUzbhRA1HHm2Fxax6UvhIDfunszIJZa7foe0=; b=gIsexSoStBXvfy0usPEX1jKJvl5R95mHsID7BzeycJsqr5Vr1DAfHPyNGgIj9EOpow JAUlz2K4bQ3oAXJkaS7XZjE6ryId3LtLPx1PCR9Rm6krlm4J8tI8/w6eS3+4oS+W8BcQ l7fHtdCHban1PKNcjeKKfMF5N34DD/J18JbDHDj7ZlMd+67EUQvW4y5dH+PXgQa5a7LF dq3UcWiSxyFSvly2RBSXcCnLjLCIgideBRlKyDYFfuQlWTqaCwrlW1u4rPp2hBavnJvb 0uPNNRJTyqiNl2HpByOGUswcbQ2vNY274JFeWZSbg6cmOJXFvNN2wMcJehD3itBbs3/O x/2Q== X-Gm-Message-State: AOJu0YxokJJS4azYodWldH/q2JV0s30EjHpG/7Yb8JNNQMf9Gld5ylzB LDg1n5A+3KtI9MU9t0BiGifPW5rMPluWiNJ9gTQTbg== X-Google-Smtp-Source: AGHT+IFE0xsSB1IL+YDKuMwF2qMRQz01r+z2yLGEHSt4UY8QcQOkklqfzoASmCHENabD3CD/b1WwBg== X-Received: by 2002:a05:6a00:230d:b0:68c:44ed:fb6 with SMTP id h13-20020a056a00230d00b0068c44ed0fb6mr12193175pfh.16.1698632481865; Sun, 29 Oct 2023 19:21:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id k2-20020a637b42000000b0057412d84d25sm3900046pgn.4.2023.10.29.19.21.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:21:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 6/7] linux-firmware: create separate package for cirrus and cnm firmwares Date: Sun, 29 Oct 2023 16:20:57 -1000 Message-Id: <9b556e63ba3e89e83ba6e2647656a1fa6def87a4.1698632320.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 ; Mon, 30 Oct 2023 02:21:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189786 From: Fahad Arslan This is cherry-pick of commit 3ddddfc14f805fe7572bba129605869fb848fed4 from poky master. Some licenses only allow usage of corresponding firmwares when a specific hardware is present. This requires split of such firmwares from linux-firmware package to firmware specific sub package. As this split is based off of licensing, it makes sense to group firmware blobs having the same license in the same package. This commit is a first step in this direction, and creates separate packages for cirrus and cnm firmware. (From OE-Core rev: 53d9d8789efc701609a5a1e985287344c2209d62) Signed-off-by: Fahad Arslan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20230804.bb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb index 4defab434d..d87f30b8d9 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230804.bb @@ -18,6 +18,8 @@ LICENSE = "\ & Firmware-ca0132 \ & Firmware-cavium \ & Firmware-chelsio_firmware \ + & Firmware-cirrus \ + & Firmware-cnm \ & Firmware-cw1200 \ & Firmware-cypress \ & Firmware-dib0700 \ @@ -81,6 +83,8 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0 \ file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \ file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \ + file://LICENSE.cirrus;md5=bb18d943382abf8e8232a9407bfdafe0 \ + file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0 \ file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ @@ -151,6 +155,8 @@ NO_GENERIC_LICENSE[Firmware-ca0132] = "LICENCE.ca0132" NO_GENERIC_LICENSE[Firmware-cadence] = "LICENCE.cadence" NO_GENERIC_LICENSE[Firmware-cavium] = "LICENCE.cavium" NO_GENERIC_LICENSE[Firmware-chelsio_firmware] = "LICENCE.chelsio_firmware" +NO_GENERIC_LICENSE[Firmware-cirrus] = "LICENSE.cirrus" +NO_GENERIC_LICENSE[Firmware-cnm] = "LICENCE.cnm" NO_GENERIC_LICENSE[Firmware-cw1200] = "LICENCE.cw1200" NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" NO_GENERIC_LICENSE[Firmware-dib0700] = "LICENSE.dib0700" @@ -277,6 +283,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-bcm4373 \ ${PN}-bcm43xx \ ${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}-gplv2-license ${PN}-carl9170 \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ @@ -826,6 +834,24 @@ FILES:${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" RDEPENDS:${PN}-bnx2-mips += "${PN}-whence-license" +# For cirrus +LICENSE:${PN}-cirrus = "Firmware-cirrus" +LICENSE:${PN}-cirrus-license = "Firmware-cirrus" + +FILES:${PN}-cirrus = "${nonarch_base_libdir}/firmware/cirrus/*" +FILES:${PN}-cirrus-license = "${nonarch_base_libdir}/firmware/LICENSE.cirrus" + +RDEPENDS:${PN}-cirrus += "${PN}-cirrus-license" + +# For cnm +LICENSE:${PN}-cnm = "Firmware-cnm" +LICENSE:${PN}-cnm-license = "Firmware-cnm" + +FILES:${PN}-cnm = "${nonarch_base_libdir}/firmware/cnm/wave521c_k3_codec_fw.bin" +FILES:${PN}-cnm-license = "${nonarch_base_libdir}/firmware/LICENCE.cnm" + +RDEPENDS:${PN}-cnm += "${PN}-cnm-license" + # For imx-sdma LICENSE:${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware" LICENSE:${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware" @@ -1111,6 +1137,8 @@ LICENSE:${PN} = "\ & Firmware-ca0132 \ & Firmware-cavium \ & Firmware-chelsio_firmware \ + & Firmware-cirrus \ + & Firmware-cnm \ & Firmware-cw1200 \ & Firmware-dib0700 \ & Firmware-e100 \ From patchwork Mon Oct 30 02:20:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33069 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 D5FCFC4167B for ; Mon, 30 Oct 2023 02:21:28 +0000 (UTC) Received: from mail-oo1-f47.google.com (mail-oo1-f47.google.com [209.85.161.47]) by mx.groups.io with SMTP id smtpd.web11.140934.1698632486013308632 for ; Sun, 29 Oct 2023 19:21:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=fnXuzDhr; spf=softfail (domain: sakoman.com, ip: 209.85.161.47, mailfrom: steve@sakoman.com) Received: by mail-oo1-f47.google.com with SMTP id 006d021491bc7-586a5d76413so2309772eaf.3 for ; Sun, 29 Oct 2023 19:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698632484; x=1699237284; 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=mtGD2b0ym5LfDUmd/BZfhe7DaB1g+J4JKWevFr1uwQE=; b=fnXuzDhrFZYgCn8TFQMqSeUBkjSMzmty0EClvpGjMzSk+jiRqS2Dx60YnZQytfGxxx R1uuWP4FlA3G85nOm1u9m4D27qnxnBTCNOeJLB4bdazwc2ZzzQBPkRyxQdIlKAV29pQ8 HuL6tRkcGtLJ+1pdPWjemHLWCiIDWiDH3qpj7AvSxUaJkFFMaEqHe6jV0Di1yh/WzC2r kibeRSjMRzSKByllYD3GBsx3QQOtBneAOAAMviyMOig7Mvx5BmGo6jdth+arLhpxf0AL YK5mtueoda5oEQvy/wCQmL3kFvsMzUNVavoz31fKd+iEVM11RV+8L6dFFK4mV8A3lxRN OMeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698632484; x=1699237284; 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=mtGD2b0ym5LfDUmd/BZfhe7DaB1g+J4JKWevFr1uwQE=; b=ddL0etGh2k76kTwzACU62HRswvkEE2LAVoNljIlOyDMUFqC8kWRauwkFkHTgpdk7v1 edb6DWJ29MPvdDh9+/aS/MtpJsIHDcFQIQ3M6n6eb7VxZq/5oXCoK39c5ppzro6MdJhs wRErX5j3jIjsKKEa45qh2hdkVM8HWUMboHvJILGHd5mhpiXNoz1Paao5yLthOIgcCUeb kxJFACQq18HdxZJab+yiDAvV17MToWJ5UDzEXNu0Vg6B6eT+euJ0nMR8fhKGMxW3Gu0j f0rtaCltxRopPoeX0IWmtbmnX1/DcnLUQnLrLUf8/72nWRpUFwaMacJQN7EnNXMemHI9 sFYA== X-Gm-Message-State: AOJu0Yxnspt6QWlHOqZOGHLMdUYM2MbVMMBnXdldoNkBolZfv9CaEBT2 k0tgbrGPZIq2+FwKn5DyJQ9r6JpAw0yk1ZZpDgbAPQ== X-Google-Smtp-Source: AGHT+IFF7gO1SnSoX5YQX+CXQRiH9kdvIEwUdOCIjvcZC8QxkGWZV7FCATKIq9OfD79S8ync5It+2w== X-Received: by 2002:a05:6358:5910:b0:168:d1bd:a3c5 with SMTP id g16-20020a056358591000b00168d1bda3c5mr11660373rwf.3.1698632484210; Sun, 29 Oct 2023 19:21:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id k2-20020a637b42000000b0057412d84d25sm3900046pgn.4.2023.10.29.19.21.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:21:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 7/7] linux-firmware: create separate packages Date: Sun, 29 Oct 2023 16:20:58 -1000 Message-Id: <56503e3e80603de3b69acef2f6d32836bc9e5e5d.1698632320.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 ; Mon, 30 Oct 2023 02:21:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189787 From: Fahad Arslan This is backport of commit dfb7d2c426b46502784bc9e199a468e6c1 from poky master. 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 (From OE-Core rev: c110e5708465a6becc611acf97f166302a17ebdf) Signed-off-by: Fahad Arslan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie 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 d87f30b8d9..506182c9c1 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,16 +33,20 @@ LICENSE = "\ & Firmware-i915 \ & Firmware-ibt_firmware \ & Firmware-ice \ + & Firmware-ice_enhanced \ & Firmware-it913x \ & Firmware-iwlwifi_firmware \ & Firmware-IntcSST2 \ & Firmware-kaweth \ & Firmware-Lontium \ & Firmware-Marvell \ + & Firmware-mediatek \ + & Firmware-microchip \ & Firmware-moxa \ & Firmware-myri10ge_firmware \ & Firmware-netronome \ & Firmware-nvidia \ + & Firmware-nxp_mc_firmware \ & Firmware-OLPC \ & Firmware-ath9k-htc \ & Firmware-phanfw \ @@ -76,6 +81,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 \ @@ -97,6 +103,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 \ @@ -104,11 +111,13 @@ 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_mc_firmware;md5=9dc97e4b279b3858cae8879ae2fe5dd7 \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ @@ -148,6 +157,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" @@ -169,6 +179,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" @@ -176,10 +187,12 @@ NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" 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_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" @@ -234,14 +247,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 \ @@ -285,7 +306,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 \ \ @@ -311,13 +332,17 @@ 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 \ ${PN}-nvidia-license \ ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \ ${PN}-nvidia-gpu \ + ${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 \ @@ -333,13 +358,38 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qcom-sc8280xp-lenovo-x13s-sensors \ ${PN}-qcom-sdm845-adreno ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${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" @@ -347,6 +397,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 \ " @@ -365,6 +418,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" @@ -428,11 +482,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" @@ -551,6 +667,16 @@ FILES:${PN}-netronome = " \ RDEPENDS:${PN}-netronome += "${PN}-netronome-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" @@ -573,6 +699,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" @@ -638,6 +795,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" @@ -667,6 +836,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" @@ -678,6 +857,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 @@ -1000,10 +1208,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"