From patchwork Sun Feb 26 17:01: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: 20154 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 96E8EC64ED6 for ; Sun, 26 Feb 2023 17:02:36 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.69574.1677430952976534025 for ; Sun, 26 Feb 2023 09:02:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fdkInvvs; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id y15-20020a17090aa40f00b00237ad8ee3a0so3968605pjp.2 for ; Sun, 26 Feb 2023 09:02:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=MbxNph0IvfjM1WJj7qsLFjIGk6zc/w9uODRqNjVkd/k=; b=fdkInvvsn6eU0hqMT1v00cuAAcqI/erPmPZslYlxEjS6/OkeL4bFI6nR34vqnVhTEo eJE3saRTxbjOz5ei0/nVW2kcdQtl/NG/8eBxGc7QD+WM11FOIF4MZbUzciwv15XEtqfl MOsZ4/sNJ7kgDjBQGjl9SD5QH0XU+NxDeHTLXUlZhOOz4xdPKaGMZTV2RndynBC4w7r3 92hL8DQCtmciq9Y46ZGJ1+4liDga00Fh8CM00U0EflZfgYRohDXD+dqS3gAERCdErR08 DNeZPcQ5ZMIU2+2Q+kCMKuSV/MPfpUXQ3fPDzmnrpgNCDV8SuH+iWCWSJqwjZ+Sjal9d Pefg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=MbxNph0IvfjM1WJj7qsLFjIGk6zc/w9uODRqNjVkd/k=; b=tHai8AdA1b4cM42ilWr4c8FbFUXgz+LM0E9tJ9PHpUt4RUX4syXNQgrxbETL+HM46g opAtxnzNdgHqYbxt1ksX05nDIXwqcIVVQ3OFJ28vseVb2p2TK8FPEF1SiZQ44ldWKect qrDY3KmPFlj0c1piBKHFZMHsPYjP56Qe05Ze/Qq+veNr1H45SrK95UQY2eYBwuCeGGja Zw4H3PFkAIgyHbUlvUZXgXEoY5d0u8T4hiNuNy0qqWt3rI3nwWpLJelFayeMarr4db7V BpkxgHpbpGcPwA8pAnXnMo2Y7Ozq2dg7FAC6Mwu7vleVRYv+ORSZhptwFDwOPYvL3tia 00Yw== X-Gm-Message-State: AO0yUKUsbGE6+KvShlmGPJqZ0Xcbl7nTk5wyPXd1QRXNjOH4kLwyyVjq 8te0wv8ZQx+WW9X7GhePQIqHdFTufAbszibievE= X-Google-Smtp-Source: AK7set8q6zBQTht2HQQYvrmIjIVGY/nfzyrxiOqQY2DV2JjgTTsdANcWL6Z/wFclt/dA4S2E+dFRUg== X-Received: by 2002:a17:90b:1d82:b0:234:dc4:2006 with SMTP id pf2-20020a17090b1d8200b002340dc42006mr26961571pjb.4.1677430952021; Sun, 26 Feb 2023 09:02:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/28] less: backport the fix for CVE-2022-46663 Date: Sun, 26 Feb 2023 07:01:57 -1000 Message-Id: <78c44993a190a706a775e70fa59fd4664b20c9cb.1677430770.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 ; Sun, 26 Feb 2023 17:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177739 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 56d31067a34bc1942c7eb4940a41ecfc81110e58) Signed-off-by: Steve Sakoman --- .../less/files/CVE-2022-46663.patch | 28 +++++++++++++++++++ meta/recipes-extended/less/less_608.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-extended/less/files/CVE-2022-46663.patch diff --git a/meta/recipes-extended/less/files/CVE-2022-46663.patch b/meta/recipes-extended/less/files/CVE-2022-46663.patch new file mode 100644 index 0000000000..20f9d89ed8 --- /dev/null +++ b/meta/recipes-extended/less/files/CVE-2022-46663.patch @@ -0,0 +1,28 @@ +CVE: CVE-2022-46663 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/meta/recipes-extended/less/less_608.bb b/meta/recipes-extended/less/less_608.bb index f411a8fb53..f907a8159c 100644 --- a/meta/recipes-extended/less/less_608.bb +++ b/meta/recipes-extended/less/less_608.bb @@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ DEPENDS = "ncurses" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ + file://CVE-2022-46663.patch \ " SRC_URI[sha256sum] = "a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209" From patchwork Sun Feb 26 17:01: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: 20155 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 9ACF9C6FA8E for ; Sun, 26 Feb 2023 17:02:36 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web10.69575.1677430954815609352 for ; Sun, 26 Feb 2023 09:02:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MlpXnNyF; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id ky4so4430764plb.3 for ; Sun, 26 Feb 2023 09:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=MWMi79EH1gDn7Eydgj/2DR3muAh142q0eE5bl72OeBI=; b=MlpXnNyF6GYXcQeBd3bxrFD6sFf7en9r8EcHiPcyI5qz9fBRXjcYslXZEeyeJ2u4nV oCVY4MAAZMBuvjN6S4M6sIDdSJM/uFLPwnilqOosrIMHUOCJu3Ie8GGOHiOC9j+mBt1m Aq9DEO9edIUKljUSrKDbYiU8+G5eejJZm+RCWDOzymlXJZJd3czVpfS6Lgz8fa8Aj11t qgkjMg4uraAeE6H45v3BYvCLK9VcQT/AXptJr1Yuq5DOnmIFz+ti80mZvvhmNy7GaS63 D/HBhgm8CjqesmMgVOqOvwwo3BJaBC8oFq91Nmg/nbQtnJJ+XhbHw64uwjJOm+5Wtzbj hCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=MWMi79EH1gDn7Eydgj/2DR3muAh142q0eE5bl72OeBI=; b=R5uOqYBYSC5z4iClWurBRfeWPxmFrMLFV74Z/WQBbyWmRRvBKpHUMyHHyXVL0MsDvK k15rNbmT/RR9KJ2a51eVK3pQ94oZR92kIssrC7GJq7cJJIdJ0etUel0CWa+2ryPccwuY I+D8R60Bgf0KOakwjqsz73ujDOpP/SN/V/lyLdkmyQGq6TVQTaHFFUZgnRHiPM4h8M/h +uIfJJxOPP193U0m1KYFX4LDg2pb2mPJYJwejn5/I9OSUEOaX4rcuCU+/AYMEXnSuBJc rajV013VYKxyF1f9RRJ3Vffu6EUE8M0lbvNOhf9zH8n9XmSPdNazRSNxZA97KJ7DB90J OBrw== X-Gm-Message-State: AO0yUKXKktVuKNlJW8bKeQnQ5WAWuwppJnRfcy6gVa84K/eEoMxPj/y8 c/VJSUBcAn7ZeCpntkzjS5gNceCZhsQg7fBOps0= X-Google-Smtp-Source: AK7set8dJOtE/o6V1LxWenphreMEYHUcJj/ZEI9VTxXrR+hGTt8RTaCGWPnNwU+37lyzrMt68hw8YQ== X-Received: by 2002:a17:90b:3ec9:b0:237:d59d:5f89 with SMTP id rm9-20020a17090b3ec900b00237d59d5f89mr4300421pjb.4.1677430953863; Sun, 26 Feb 2023 09:02:33 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/28] xserver-xorg: 21.1.6 -> 21.1.7 Date: Sun, 26 Feb 2023 07:01:58 -1000 Message-Id: <0cb63762057bae8bf3b1ce088ba4d31f6ebd770f.1677430770.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 ; Sun, 26 Feb 2023 17:02:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177740 From: Kai Kang According to the ANNOUNCE of xorg-server 21.1.7[1]: This release contains the fix for CVE-2023-0494 in today's security advisory: https://lists.x.org/archives/xorg-announce/2023-February/003320.html It also fixes a second possible OOB access during EnqueueEvent and a crasher caused by ResourceClientBits not correctly honouring the MaxClients value in the configuration file. Finally, a bunch of Xquartz updates including the ability to correctly detect ssh-tunneled clients as remote. [1]: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Signed-off-by: Kai Kang Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 60737bee6466e206d8f3c751910dfce00b60d703) Signed-off-by: Steve Sakoman --- .../{xserver-xorg_21.1.6.bb => xserver-xorg_21.1.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.6.bb => xserver-xorg_21.1.7.bb} (92%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb similarity index 92% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb index 256903ce5f..212c7d39c2 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb @@ -3,7 +3,7 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ " -SRC_URI[sha256sum] = "1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484" +SRC_URI[sha256sum] = "d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. From patchwork Sun Feb 26 17:01:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20158 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 8E521C7EE2F for ; Sun, 26 Feb 2023 17:02:46 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.69587.1677430956817460407 for ; Sun, 26 Feb 2023 09:02:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=l8MhcfUT; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id nw10-20020a17090b254a00b00233d7314c1cso7732463pjb.5 for ; Sun, 26 Feb 2023 09:02:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=TWzSKx6nI+vmiL8fx93n5TH7au1OwUyLw0JdENbtbN4=; b=l8MhcfUTKnzcUaRgI82Z+rTpbxL+CyfNogamsEz+R3foH/iT4Bb8evWNaJ3wNf6ARb MNC55mdllhypD2T9nnbo+raGriYNh8es7SHgcgSDuxcX47uNfUxuYlAAHCqfCpN7gUR/ vkJm0o/1dIuqn1NQpRfwSLAKgUiwVeuSdrIwiHV6TCz9PV1rf6iYqGbMO7MrOpGaEIc4 d/bJrw7lCjrxdlq4HfSik+ymwxMQymnTHKNncPvtqHR08WAXyZXoe96Ie2zuqQLgk3jH DiRtim28W5lrsS4/m5TEcIf11NRitA7ACPbl3FwN3TmCiEQNukXmJmb7Gd3iS/HFUhOj BNug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=TWzSKx6nI+vmiL8fx93n5TH7au1OwUyLw0JdENbtbN4=; b=BmEUdPOsMB72DWu90bPWSDK3B7Y+HvhQe+NU4P68v1FdlAwmjJFkt5rFsf3qVg9l+6 3HxDKxYH4wu1UMovV0eAV8u3G0a64+5kzkEKNObmnUs6Bj42euGWWeLbvNE+iwo3HLgQ 8+GvlL6zNSE3jHd4YvQ0ckdzp2Mrd3O3/g9NDgrrSe9UXbkKZld7fJu144o9chBrzKFa P4VZ4uHK/RLOHX3lDT/Ew4TkHw9gZv1m/+JtTCObn/fgSQT3nPttYQ7QOs6X6Xt7UIFw 85Tb8Ihrhq9sce+ibraLgYl3PbuLIjSIMWMv9NMrrhjAPJQTJUg2mYXEZ5+wBDMlCg0p D1Yg== X-Gm-Message-State: AO0yUKWURdJ7aOU/OGvOuBFtzzwywwWwLKlo1KgFkfhTHtGCQF5QvQp4 x0DA4WIw83O+6lzpzMkVDgvAIQsEf6bDmFiFMSI= X-Google-Smtp-Source: AK7set8dcs6oqk47WeNDKUJpG8ExpyzTrHdB8+xkd5jIyb1dCZicBvJTbTT75czgjSbV+6OLRXmPYg== X-Received: by 2002:a17:90b:4a4d:b0:233:cea2:dac6 with SMTP id lb13-20020a17090b4a4d00b00233cea2dac6mr22385989pjb.47.1677430955801; Sun, 26 Feb 2023 09:02:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/28] vim: update 9.0.1211 -> 9.0.1293 to resolve open CVEs Date: Sun, 26 Feb 2023 07:01:59 -1000 Message-Id: <855f629bcd2caed708f2ebd19a81059fed546428.1677430770.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 ; Sun, 26 Feb 2023 17:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177741 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6d77dbe499ee362b6e28902f1efcf52b961037a5) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 9bc6881fce..fcb5cf6334 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1211" -SRCREV = "f7d1c6e1884c76680980571f1cf15e0928d247b5" +PV .= ".1293" +SRCREV = "0caaf1e46511f7a92e036f05e6aa9d5992540117" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Sun Feb 26 17:02:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20159 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 8D3BBC7EE2E for ; Sun, 26 Feb 2023 17:02:46 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web11.69588.1677430958605866462 for ; Sun, 26 Feb 2023 09:02:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=bFTy3xCY; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id u10so3783044pjc.5 for ; Sun, 26 Feb 2023 09:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=x6CpYrgRpdgo5ezRESaNZPoLxcrp7nizqzXKvPJbtAU=; b=bFTy3xCY/tJ9XfbiiDyVc0LCFmVZCYH+rXLzqJ15jEJyIg26Q4CtsI13WajqtPay/S kbgf2NTaF8lwxaZ92dkT+RoebgPN1hEI7Ro+lfwogYZRD652Loo9fW8+1i42Ra4JBzrs 3+iPA6KkSDGy7hofpJZ/t82fT0VG9YknYie9GqY7W/rUP94t9+Z92NphwSGDq33JRJZD PJUb4jCfZHOIdsbQfN1p5356dgvDeAhJFNdSMas08FTkelg+rRRcuaqoP2OENsUsRdeY SyqRZo4WccUv/Yp9XaqmWXc+K9ykbTpSemwnh9bUKJ725GXqIpZf2XfwG/g/C9abwnyM 7NzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=x6CpYrgRpdgo5ezRESaNZPoLxcrp7nizqzXKvPJbtAU=; b=q9oRgz0FOO5PbRf1nOdKL69kdvwyTcoBQBPXigjtVimQ0YPvMuPhjFjZ+q9RDyYoDa S/D8usWt0tpgma5kwDI7HjqvHsbkSX16Zoi7C6IjlJHQ5P3Tm0PrSCIoUoqzb6s8j9It jcFdRTICCVfnOrrRB6woOpHjoZ1303Y16YOQRFy6jk7kUhQpI40vLYrUdChTexVKsfWi JBQdmMLkX6FAIk6SGVl0jTKmmYHOpDRGxtZ2Wur3U5exNZ7cCgaO97rZeD5PPeGVQz5p spWdyyqBqfGjk0EviNY4LqC/rs0cBmhclRjX9OGvvHkZ0h1b6Fuhk2brJ9lnkYxEEV3E gOZQ== X-Gm-Message-State: AO0yUKWoJiiH4sj7V3+TqnUDOs5b2Jh0wnkr3NX2xmlL8I8h85s3us+9 RFLYErS0BswsmxJtmSY3MoHqg/P1lsmykUUUM28= X-Google-Smtp-Source: AK7set/13EViJ4SkYndSYQY2zKuEdZJ+zM4Xx1TuTsRckMsr3pmZRf3GaF9ikuz5qJy0Euw931GRQg== X-Received: by 2002:a05:6a20:1453:b0:bc:32ff:9afb with SMTP id a19-20020a056a20145300b000bc32ff9afbmr19028445pzi.44.1677430957650; Sun, 26 Feb 2023 09:02:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/28] libjpeg-turbo: upgrade 2.1.5 -> 2.1.5.1 Date: Sun, 26 Feb 2023 07:02:00 -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 ; Sun, 26 Feb 2023 17:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177742 From: Wang Mingyu Changelog: ========== 1. The SIMD dispatchers in libjpeg-turbo 2.1.4 and prior stored the list of supported SIMD instruction sets in a global variable, which caused an innocuous race condition whereby the variable could have been initialized multiple times if 'jpeg_start_*compress()' was called simultaneously in multiple threads. libjpeg-turbo 2.1.5 included an undocumented attempt to fix this race condition by making the SIMD support variable thread-local. However, that caused another issue whereby, if 'jpeg_start_*compress()' was called in one thread and 'jpeg_read_*()' or 'jpeg_write_*()' was called in a second thread, the SIMD support variable was never initialized in the second thread. On x86 systems, this led the second thread to incorrectly assume that AVX2 instructions were always available, and when it attempted to use those instructions on older x86 CPUs that do not support them, an illegal instruction error occurred. The SIMD dispatchers now ensure that the SIMD support variable is initialized before dispatching based on its value. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 009a1b0390d791d614b8d4a1407e7479c261f60d) Signed-off-by: Steve Sakoman --- .../jpeg/{libjpeg-turbo_2.1.5.bb => libjpeg-turbo_2.1.5.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.5.bb => libjpeg-turbo_2.1.5.1.bb} (97%) diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb similarity index 97% rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb index 4d21ca1e1d..e086830c02 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ " -SRC_URI[sha256sum] = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf" +SRC_URI[sha256sum] = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/" From patchwork Sun Feb 26 17:02:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20161 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 A10C1C6FA8E for ; Sun, 26 Feb 2023 17:02:46 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.69590.1677430960513286978 for ; Sun, 26 Feb 2023 09:02:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZT/iQkrN; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id v11so884063plz.8 for ; Sun, 26 Feb 2023 09:02:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=WFgo/1h1lKSD0/sVHS8EJGX2Nvw4vdCZLN6L3/pvhlk=; b=ZT/iQkrNjyhxXqvouLkmNJQsOETHSih9UZna73R4rP8bCID+TUS1SiPVRVzz3+od2D DS8dQqQrRH36uQ5siclsFyDxkQC9oBr7RFYwCHYUmYykzasYG9vLTFrQxqRZMccPNSLe p6Pa8/XcwtHDU8GXvHa2Ya7NpZlsGrdjhZDjDbb//kjaNOzcHdPTUdaw5TBqIlDlpE0r 2EaeDpkaxPZNfxclKzFCVCqolDoNkR9mFBEkY90zaYfKVxSRZqlOpwnP0Wf87MMhvM1p BoMjcz08xaXXEo5gAQCqGrRinS8blNqVKX1gtkFdDRo9TEW7Z8Rv/ELLpQ8AMkd5rn4n PeXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=WFgo/1h1lKSD0/sVHS8EJGX2Nvw4vdCZLN6L3/pvhlk=; b=i7n/5uKEOkKdt4PNAwPZjhuDKMrqLKNOUjK/E19ZCpYCB88KdWieyZSJ5MXjgMctxh ltSZQrBu4KgWYC6+8C7fgqOvUGbnBtZ4XrTpnaZSAPCWJ7pzEL4g4dY+IMZne1MVBtYY dKBtzJvZYPdha03BiHJGNEhWzEpJSfzsBRMCw553Xv845GPKD7vKXcQTEWddsC68yjSg SchX6T7qIcEY9RSUZOMHCf56RzAzFdpD+LosJUxvL1LbIcJaG5ANAq6yLfr1e6nRcHAt UYKKoK8/thkwZaT8/29l6gCA4cGBm8eN56L2EiKimg0z1cckECsFa810oypJ3CD1QPWd UYkQ== X-Gm-Message-State: AO0yUKVei1Xh/vGDYB7kWfcDvkuSGN8Fc+uR4fG/PFEj0vWejky9h2IP eUN1mpV2XZdfYb14+L0m/vczHWQ0Sp49wyBlvGI= X-Google-Smtp-Source: AK7set/2uvyO5rkNoztgvnAMIHTCj7WIpjLR2k2RkKnfSlpTDp+Zk+zA8LFYq+uHfxUGV5pm8Pj+dA== X-Received: by 2002:a17:90b:1bc3:b0:237:8338:ef4c with SMTP id oa3-20020a17090b1bc300b002378338ef4cmr10906947pjb.9.1677430959432; Sun, 26 Feb 2023 09:02:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/28] xwayland: upgrade 22.1.7 -> 22.1.8 Date: Sun, 26 Feb 2023 07:02:01 -1000 Message-Id: <964ca02debe1e85cb91789dee1d08344f4fcf33a.1677430770.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 ; Sun, 26 Feb 2023 17:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177743 From: Wang Mingyu xwayland 22.1.8 - Security fix for CVE-2023-0494 Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e0ca374267cce807d12d706564989900fe61bd97) Signed-off-by: Steve Sakoman --- .../xwayland/{xwayland_22.1.7.bb => xwayland_22.1.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_22.1.7.bb => xwayland_22.1.8.bb} (95%) diff --git a/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb b/meta/recipes-graphics/xwayland/xwayland_22.1.8.bb similarity index 95% rename from meta/recipes-graphics/xwayland/xwayland_22.1.7.bb rename to meta/recipes-graphics/xwayland/xwayland_22.1.8.bb index dd32bd0111..6919ba421b 100644 --- a/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb +++ b/meta/recipes-graphics/xwayland/xwayland_22.1.8.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] = "d53afac6c71953f5cf66d03d289dacd8961da5bd309c1dff125d5955d9db5f76" +SRC_URI[sha256sum] = "d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" From patchwork Sun Feb 26 17:02:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20160 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 A1115C7EE32 for ; Sun, 26 Feb 2023 17:02:46 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.69577.1677430962201381815 for ; Sun, 26 Feb 2023 09:02:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=FfMxBXpn; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id i10so4394147plr.9 for ; Sun, 26 Feb 2023 09:02:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=pLbNJjNwop/Eg47kzikBlOHdHh8CdLro6ok+lxWbUzk=; b=FfMxBXpnTBopLpxGQvold7RkS9nJOP8lbV4luj+GApwNoeBQcPFJ/EqBBY16OOgRh7 Z2H4OYuWODVhd2KEiZx2i4tdxfG4utoF7XB+mjyaqQ/rBrODikQA318vLwBGE2ufHD67 rTCxthpeWXBzOriiNb+x7IBbhqsfPcRXXH2X85Ojhqqx4ZrQrQvdj7cBy2jl5UQqTfOz NsPLA8c4f7ochaAReu7cDLthnI2tNsijyv2iTlnRMklKJjFw0sdWEWAoAmb+YnZatZGG cdMlOkStg86RRu8ZZJN49RECLwPdKIy2RMPs3UBFxQqopffj+GlN1jpms7hjdx4eqUyX n4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=pLbNJjNwop/Eg47kzikBlOHdHh8CdLro6ok+lxWbUzk=; b=dXHM4cZXk45EcNUtEHC5Nx5Ibpc5OGdWmPgPXL3LAVw1qfsZin2dR44x7yet2ETU40 0MJ70skR36PMdxTH6xIMktK0gruDPhP1vyEQap9Wfj22VMTH3JNvfypxvjWxCHgeAQ8l scS83DF/oZe1+wPYgarpGDLOrYGxaQEM3/Uj86LhwVdFxzXuhdKU7+ZTFcy5/j5kj1QK mghWrngK8kjNyePFVV+HP9IxZg1TuoJQTmszH2eWfU0ZOGf/kZXPwB1TR8HOQUWtB9yq 0H7rVU7XPPVmvEySCmP4OPQFHOtPibfCazSqU7cfq4u+FaFI5W4wIJ7vCnRPkJ1n+/cf EX9A== X-Gm-Message-State: AO0yUKWNApC3e0zwk/Ng1spO67a0Ad8I09w9VIserkTG8VCky0W7KRfK s5MU0T2QwY249bs/296xX4Jjv0iI3NzrSRZ3nR4= X-Google-Smtp-Source: AK7set93ANLYz5p+CvhJK/ZVxTkTAXSFt2+sugNeHl5eU6nYj7t8K0Zn+QfFSBFInw5AwpMag/6ODg== X-Received: by 2002:a05:6a20:430a:b0:b8:8a19:d6ad with SMTP id h10-20020a056a20430a00b000b88a19d6admr18208368pzk.24.1677430961246; Sun, 26 Feb 2023 09:02:41 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/28] dbus: upgrade 1.14.4 -> 1.14.6 Date: Sun, 26 Feb 2023 07:02:02 -1000 Message-Id: <83e9bd1507fd5f79c680dde30b0f66df84cde6b0.1677430770.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 ; Sun, 26 Feb 2023 17:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177744 From: Alexander Kanavin Denial of service fixes: • Fix an incorrect assertion that could be used to crash dbus-daemon or other users of DBusServer prior to authentication, if libdbus was compiled with assertions enabled. We recommend that production builds of dbus, for example in OS distributions, should be compiled with checks but without assertions. (dbus#421, Ralf Habacker; thanks to Evgeny Vereshchagin) Other fixes: • When connected to a dbus-broker, stop dbus-monitor from incorrectly replying to Peer method calls that were sent to the dbus-broker with a NULL destination (dbus#301, Kai A. Hiller) • Fix out-of-bounds varargs read in the dbus-daemon's config-parser. This is not attacker-triggerable and appears to be harmless in practice, but is technically undefined behaviour and is detected as such by AddressSanitizer. (dbus!357, Evgeny Vereshchagin) • Avoid a data race in multi-threaded use of DBusCounter (dbus#426, Ralf Habacker) • Fix a crash with some glibc versions when non-auditable SELinux events are logged (dbus!386, Jeremi Piotrowski) • If dbus_message_demarshal() runs out of memory while validating a message, report it as NoMemory rather than InvalidArgs (dbus#420, Simon McVittie) • Use C11 _Alignof if available, for better standards-compliance (dbus!389, Khem Raj) • Stop including an outdated copy of pkg.m4 in the git tree (dbus!365, Simon McVittie) • Documentation: · Consistently use Gitlab bug reporting URL (dbus!372, Marco Trevisan) • Tests fixes: · Fix the test-apparmor-activation test after dbus#416 (dbus!380, Dave Jones) Internal changes: • Fix CI builds with recent git versions (dbus#447, Simon McVittie) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 31245df3061c1a913bffe5e11ad6ac7fa9c83915) Signed-off-by: Steve Sakoman --- meta/recipes-core/dbus/{dbus_1.14.4.bb => dbus_1.14.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/dbus/{dbus_1.14.4.bb => dbus_1.14.6.bb} (98%) diff --git a/meta/recipes-core/dbus/dbus_1.14.4.bb b/meta/recipes-core/dbus/dbus_1.14.6.bb similarity index 98% rename from meta/recipes-core/dbus/dbus_1.14.4.bb rename to meta/recipes-core/dbus/dbus_1.14.6.bb index 5f91ec2dc1..a6e18a92cb 100644 --- a/meta/recipes-core/dbus/dbus_1.14.4.bb +++ b/meta/recipes-core/dbus/dbus_1.14.6.bb @@ -14,9 +14,9 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://run-ptest \ file://tmpdir.patch \ file://dbus-1.init \ -" + " -SRC_URI[sha256sum] = "7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e" +SRC_URI[sha256sum] = "fd2bdf1bb89dc365a46531bff631536f22b0d1c6d5ce2c5c5e59b55265b3d66b" EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ From patchwork Sun Feb 26 17:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20157 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 9BBC0C7EE30 for ; Sun, 26 Feb 2023 17:02:46 +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.69592.1677430964105577477 for ; Sun, 26 Feb 2023 09:02:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=aKSbk9bj; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id n2so2147498pfo.12 for ; Sun, 26 Feb 2023 09:02:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=dM0SfIPf0AVnryuhCkgPz4/ZRny/X0sb44Lyqea6Ly0=; b=aKSbk9bjF7KWSNp5luMhCHnHwz7Meu1dJpfpEN1J9ks1634w614cD1y7yGLm7YN8Tq 0t7qlsbp0Ar9wxBz7VW7spaVZ92ebkMQq0XH+seF3v86m6iotPMYJ5GlLAYx+/lEwFs8 mQ8l/N8NDucZFDEzWaRhZ8Uja6Jdp+UXsuryEoAupZI8iaJfd+0UYg7JmkT1wlxhjvF7 eEn+hHXGROh2ksEUpTXTEJ8xKit8gSWtOy7llhjgyr0auo/Iqwdr89oePsZrVKFjLE1o UzdHDVt7fXKS7FstTx+0HW17v6e6zKXxVqGueZdrhv/TJJ2wDD9gJjkjMnxROSExDYGp 7ekA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=dM0SfIPf0AVnryuhCkgPz4/ZRny/X0sb44Lyqea6Ly0=; b=T7Dl/LQ44tKTSAwtRFovlytN6sdvQXqOTaU6Yvp0X1JHJqSriDUcI2KciCJcELbjJ8 +nelbtMgRfRqb+PprQmH6aYuR16rx7Ek8fAZ2PhIiRJfGfuKaGJX9wa+tMrdj5ECwuW/ DdF80Hn4qPwknn08Rj5Ri3smvIf8ltVHy0tiDvFsCxRdlAU13j5m+ZQ/8VNs2PyRvlai KFGVw/mrHvsTPLhKLRN7X/YF48GYeM4/k+I/+tEZ2kaXQlQ4muizQtHZQYXsY1D+Hm8i SFW4l6wLCu3qgik1OaGrnApl6gg10ASCWd8c52AaHc/SbJnd/ka45qwkMkywzJdEq5ke iPrA== X-Gm-Message-State: AO0yUKXM11GRKgLqQRPBH/PWEmDth7xRPZjFLDlYb9mOG+68zWxlBqHr Cnmh1y5z9kD2LOaTYNIErgx6QwptY+Pw3YHFqFQ= X-Google-Smtp-Source: AK7set9nAAMvEBWPO6Yt2epusCyz7ehJ2WH6M765XZvJDtJWa0H1BL4DS7DaMeglv59978v98adAUg== X-Received: by 2002:aa7:985a:0:b0:5de:3c49:b06 with SMTP id n26-20020aa7985a000000b005de3c490b06mr10734367pfq.3.1677430963077; Sun, 26 Feb 2023 09:02:43 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/28] openssl: Upgrade 3.0.7 -> 3.0.8 Date: Sun, 26 Feb 2023 07:02:03 -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 ; Sun, 26 Feb 2023 17:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177745 From: Siddharth Doshi OpenSSL 3.0.8 fixes 1 HIGH level security vulnerability and 7 MODERATE level security vulnerability [1]. Upgrade the recipe to point to 3.0.8. CVE-2022-3996 is reported fixed in 3.0.8, so drop the patch for that as well. [1] https://www.openssl.org/news/vulnerabilities.html CVEs Fixed: https://www.openssl.org/news/secadv/20230207.txt Signed-off-by: Siddharth Doshi Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 8461466f63200a0b1c9c247b70fdf5819651544c) Signed-off-by: Steve Sakoman --- .../openssl/openssl/CVE-2022-3996.patch | 43 ------------------- .../{openssl_3.0.7.bb => openssl_3.0.8.bb} | 3 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch rename meta/recipes-connectivity/openssl/{openssl_3.0.7.bb => openssl_3.0.8.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch deleted file mode 100644 index 6d70b323d1..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 -From: Pauli -Date: Fri, 11 Nov 2022 09:40:19 +1100 -Subject: [PATCH] x509: fix double locking problem - -This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the -redundant flag setting. - -Fixes #19643 - -Fixes LOW CVE-2022-3996 - -Reviewed-by: Dmitry Belyavskiy -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/19652) - -(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) - -Upstream-Status: Backport [https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7] -CVE: CVE-2022-3996 -Signed-off-by: Vivek Kumbhar ---- - crypto/x509/pcy_map.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c -index 05406c6493..60dfd1e320 100644 ---- a/crypto/x509/pcy_map.c -+++ b/crypto/x509/pcy_map.c -@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) - - ret = 1; - bad_mapping: -- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { -- x->ex_flags |= EXFLAG_INVALID_POLICY; -- CRYPTO_THREAD_unlock(x->lock); -- } - sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); - return ret; - --- -2.30.2 - diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_3.0.7.bb rename to meta/recipes-connectivity/openssl/openssl_3.0.8.bb index 1842148592..8771884dda 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb @@ -12,14 +12,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ - file://CVE-2022-3996.patch \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e" +SRC_URI[sha256sum] = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e" inherit lib_package multilib_header multilib_script ptest perlnative MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" From patchwork Sun Feb 26 17:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20156 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 8D387C64ED6 for ; Sun, 26 Feb 2023 17:02:46 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.69581.1677430965901450455 for ; Sun, 26 Feb 2023 09:02:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1jmPhx/Q; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id bn17so2219976pgb.10 for ; Sun, 26 Feb 2023 09:02:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=BBxssKUUCtNR98jAIHYefdIW3aaDb2b3Byhsu4003NY=; b=1jmPhx/QTVGpEmrpDyNDzKqowCnaW8LV1+rxyrEgvs6FiILePy+HiFVFK/j7kpVB9o omkHYOCRe5ilxN8kz1Ut/eoONUc3Q08lj15o5QDHfRICCMRJP+CBOpWI7qf+Im4hfr1R pQujOLPKdHjZ1OphB6qQdBRPuKN3buAg2H6ITXUrvBS1Mxipf42tq6fQ5ZR4hb2noIsl DQBKTKUOTRrzIX+4ZLtkhkvELkwJ3g2X7NbVCp3ELwBNfbt9wHgPr8QIFxgg6bJX+cLy 0wDqlivpq2BHqmrfTLVPKJ84UogtB+pb8eJtdlueNY3LjEZLKicehncRV3ziM7r/ush1 qyZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=BBxssKUUCtNR98jAIHYefdIW3aaDb2b3Byhsu4003NY=; b=op43xg4Mewub57hDxnljtemN1U4l9rcxbWQgGO5xrFbsnc+GBrtCT7Vz2hBhwAtbZs usULOMCXbbigRN8cPiYLEemSlFA1UTjXB7ySTsoZxnTFGNMw5a+Z+kCBtN/jwqqvEn+N FQKy5dHqsLlPMNp8fZsQ1YIOjgAgC7gstP6MJOIAj10IZYEsD+Vc6dbMGRUtEY5CfKAz VVEAmr+nvHymlB8hJX3lVhDyNmcHx1TZLngTq5RSBVf114qCOPhUWgz+EoIalKczddf9 bN4bMuSTu832mfZGfaz0/yHPGOrQc0CF4M6LOk1B7MWpMkiH9wMV6QIO+YPT27579u/B du/Q== X-Gm-Message-State: AO0yUKVybArlkYKLuDAPfse5wKf1+bLLNv5TU1ErDYEkLoIK5U+SZ2co 8sqaNyjZoQHJ4w2Ze9A4CF1bCVZQXsil2jlSU68= X-Google-Smtp-Source: AK7set9iONT2HrIMnGUxwf4xxOq5FNDLAQwAum3sOxPpXXIKWuyMVlrgSOvJd7SNadyxsIuIh9IRFQ== X-Received: by 2002:a62:52c4:0:b0:5dc:6dec:e9d0 with SMTP id g187-20020a6252c4000000b005dc6dece9d0mr10656787pfb.3.1677430964890; Sun, 26 Feb 2023 09:02:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/28] linux-firmware: properly set license for all Qualcomm firmware Date: Sun, 26 Feb 2023 07:02:04 -1000 Message-Id: <2a9659695b28030a6004d81be1e75e7fd89ebbab.1677430770.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 ; Sun, 26 Feb 2023 17:02:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177746 From: Dmitry Baryshkov It is not enough to depend on the ${PN}-qcom-license package. Set LICENSE variable for all the qcom packages to point to the proper license. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 9dc41e18dc138a7cce920f8e4c85eb3130c0d553) Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20230117.bb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb index 1dce06c8f5..9ae0b2be13 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb @@ -983,6 +983,31 @@ RDEPENDS:${PN}-qat = "${PN}-qat-license" # For QCOM VPU/GPU and SDM845 LICENSE:${PN}-qcom-license = "Firmware-qcom" +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-vpu-1.0 = "Firmware-qcom" +LICENSE:${PN}-qcom-vpu-2.0 = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a2xx = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a3xx = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a4xx = "Firmware-qcom" +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-apq8096-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-apq8096-modem = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-sensors = "Firmware-qcom" +LICENSE:${PN}-qcom-sdm845-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-sdm845-compute = "Firmware-qcom" +LICENSE:${PN}-qcom-sdm845-modem = "Firmware-qcom" +LICENSE:${PN}-qcom-sm8250-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-sm8250-compute = "Firmware-qcom" + FILES:${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" 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/*" From patchwork Sun Feb 26 17:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20163 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 94B76C7EE2E for ; Sun, 26 Feb 2023 17:02:56 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.69583.1677430967662226219 for ; Sun, 26 Feb 2023 09:02:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XkgYVGxw; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id u5so1009877plq.7 for ; Sun, 26 Feb 2023 09:02:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=bQkJbmgZGUiVVRYsg4ceaD2pbFN4yU5Gqyfu4DroiYo=; b=XkgYVGxwKl5Vx4QBf3J4sbJXeWxA6SDDyI+xiipjy6Pbapr2jI+YpnZGwkahObz/t9 lAyaGmRrmcceAFofa/3I7eplB0oyoYuExzO6RNm/BwM6cnt61bZZAh0XB9F3iulV2Jzk aQXtB6hlSwCY6SSy607AuZ4MYpR3jvBAn19BNbI/OGjEG1aKX/EbCSutCX0kgdwKwbzK AMHwTEnwn69Kv2j6c8f4ShrIXsF/Su0Iu8QI6TrHk3dVnydbrOuJPpvBsrGASEABWOtN c8SCJIS0D7/XBjDnP0mCERv6xq+a4Uo6Lx+8lHg0y/9uctu6rOCqBT9MGhLVpQZ8OwDo Mc7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bQkJbmgZGUiVVRYsg4ceaD2pbFN4yU5Gqyfu4DroiYo=; b=ebds27mmdc+aqsMt9OwKXTL2RBFnp2uTUAf7cxjEbbspphj+E+A9loNW3QlZOWc0bn 6ilOnRYmEWhaEkjk9CDZ4Sdkdl6e8tbg6O+9awvlW30vqJc6a1zNcgAm3XZYOJJbmiDR en67IcWhy0g/kChF/YeqUuDnVQ6FG+SwPO6p1lno5wXS3oaIYau4QQ3aj1witMkd4hbh USA8/530jz1D5dh0UEXGbf31prOOdwkgklN7MaRA6F8mlrWleh6vKWAp1fZuwZ1nVSo0 nAibSYDpqy0vTBz+Wyh/Uh9u+zvDEY47sTpqXdwRTpAIAp2c16W+Yc8lE/8/aEE06fEG fZqQ== X-Gm-Message-State: AO0yUKWRRAWntXNxq0wtJUK8/Xdvke7ZIEUSp1LnPQ57kWK5pYv4t01b zaNh+oLUi1/OocHAYAvARSP9ssjKdKpNvyUovbE= X-Google-Smtp-Source: AK7set8Q2+hIyi/tqDwxbZBxPUIFOR2iCOLkJe8OXO8IGcY3VvsRVREDaSwcs0xBMtmv+IpD10ml8w== X-Received: by 2002:a05:6a20:431b:b0:cc:9f59:4562 with SMTP id h27-20020a056a20431b00b000cc9f594562mr8308928pzk.53.1677430966663; Sun, 26 Feb 2023 09:02:46 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 09/28] linux-firmware: add yamato fw files to qcom-adreno-a2xx package Date: Sun, 26 Feb 2023 07:02:05 -1000 Message-Id: <873971539fa5248e4eabb964e642afec59040749.1677430770.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 ; Sun, 26 Feb 2023 17:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177747 From: Dmitry Baryshkov Newest linux-firmware release got firmware for Adreno A200. Add these two files to the ${PN}-qcom-adreno-a2xx package. As these files are licensed under a separate BSD-3-Clause license, add separate license package too. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 56e1b2b06ef7f22d4ac5899046f650ae8ec0d547) Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20230117.bb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb index 9ae0b2be13..fa9e6f604b 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb @@ -45,6 +45,7 @@ LICENSE = "\ & Firmware-phanfw \ & Firmware-qat \ & Firmware-qcom \ + & Firmware-qcom-yamato \ & Firmware-qla1280 \ & Firmware-qla2xxx \ & Firmware-qualcommAthos_ar3k \ @@ -109,6 +110,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \ + file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \ file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ @@ -177,6 +179,7 @@ NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw" NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware" NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom" +NO_GENERIC_LICENSE[Firmware-qcom-yamato] = "LICENSE.qcom_yamato" NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280" NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx" NO_GENERIC_LICENSE[Firmware-qualcommAthos_ar3k] = "LICENSE.QualcommAtheros_ar3k" @@ -307,7 +310,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-nvidia-gpu \ ${PN}-netronome-license ${PN}-netronome \ ${PN}-qat ${PN}-qat-license \ - ${PN}-qcom-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-vpu-1.0 ${PN}-qcom-vpu-2.0 \ ${PN}-qcom-adreno-a2xx ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a4xx ${PN}-qcom-adreno-a530 \ @@ -983,13 +986,14 @@ RDEPENDS:${PN}-qat = "${PN}-qat-license" # For QCOM VPU/GPU and SDM845 LICENSE:${PN}-qcom-license = "Firmware-qcom" +LICENSE:${PN}-qcom-yamato-license = "Firmware-qcom-yamato" 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-vpu-1.0 = "Firmware-qcom" LICENSE:${PN}-qcom-vpu-2.0 = "Firmware-qcom" -LICENSE:${PN}-qcom-adreno-a2xx = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a2xx = "Firmware-qcom Firmware-qcom-yamato" LICENSE:${PN}-qcom-adreno-a3xx = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a4xx = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a530 = "Firmware-qcom" @@ -1009,13 +1013,14 @@ LICENSE:${PN}-qcom-sm8250-audio = "Firmware-qcom" LICENSE:${PN}-qcom-sm8250-compute = "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" 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-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" +FILES:${PN}-qcom-adreno-a2xx = "${nonarch_base_libdir}/firmware/qcom/leia_*.fw ${nonarch_base_libdir}/firmware/qcom/yamato_*.fw" FILES:${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a3*_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES:${PN}-qcom-adreno-a4xx = "${nonarch_base_libdir}/firmware/qcom/a4*_*.fw" FILES:${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.* ${nonarch_base_libdir}/firmware/qcom/apq8096/a530*.*" @@ -1034,13 +1039,14 @@ FILES:${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/c 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-sm8250-audio = "${nonarch_base_libdir}/firmware/qcom/sm8250/adsp*.*" FILES:${PN}-qcom-sm8250-compute = "${nonarch_base_libdir}/firmware/qcom/sm8250/cdsp*.*" + 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-vpu-1.0 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-vpu-2.0 = "${PN}-qcom-license" -RDEPENDS:${PN}-qcom-adreno-a2xx = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-adreno-a2xx = "${PN}-qcom-license ${PN}-qcom-yamato-license" RDEPENDS:${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a4xx = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a530 = "${PN}-qcom-license" From patchwork Sun Feb 26 17:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20162 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 8DAFEC64ED6 for ; Sun, 26 Feb 2023 17:02:56 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web10.69586.1677430969348120283 for ; Sun, 26 Feb 2023 09:02:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6jdAH0aY; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id p6so2269707pga.0 for ; Sun, 26 Feb 2023 09:02:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=TWCIsNeZxac7FpPAaaFhCClSmEHalorBM8SXNfJScM0=; b=6jdAH0aYgaSHSBDULuCWUxX4E5gn+24z/W/qzRbTvbRj3K8BiSxQzezH0qP8cbPVjn M6uvHeACVCIqku9Pg3TmMJTYKKVIsvxBhUzqHzgglodiiBRQrKniVfFhQOdiYhdQnjZ6 bk/k1xw6+2X9BDyuiucb5PNnWstl1Axqx0MDT+4Uvmlmm0epAjsZIovcIN+XTeYieWaj bN9UkzBnFBMp70dtpqOzXIo3/dZNzyMZF8SRiOvASvtmg6g0M9/iRR8fAxv8KhTz+7wo SKOJDxLpw3bm9jkJMPQFfqJdypWcGOqdk9qnYaxkMrTgOvxOdqm1l2MmGoCVPm3mBMCW AjHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=TWCIsNeZxac7FpPAaaFhCClSmEHalorBM8SXNfJScM0=; b=Yoh6JfpQ4a2k16e7CBASVj/cffV142ZoxJkaeHJLIX+RFV/90750AMhHhvchbOsplY 3zBjoHIUk1upmaIv10JmuvdrL8jwJfxXn72GDSlxzuwkVOgyTo+YnyiS3zfooYQE2B+4 Xrtw3twZ6oLDeT+AXkLPLJirm1Jwmix2+eCVa9+qZqVP7HHswbbtKb433uG5F5MUwXBd YRk7rKh0fqt1K9BRQnylob2oe1qnsKHTmIWpDd47BzNkR4Mpa3uo1VgaM2gAxXgLrCq8 WbekBGOIU5P/j/coy+dQf3dmqiuYOzM9BAWoRgvVUnffnQlggukiOlh4JM7mru4a50hn j4vg== X-Gm-Message-State: AO0yUKXNqDDJwpgfSBawXslynw/Ip9TwDF1MlKceTq/hFf980wKglOFX QCqv1li7+5VH70xOyq+USRN0kZgJC2gwuXI2UIA= X-Google-Smtp-Source: AK7set+TXANEp4vqrHTAPq+Agr6xRFApqLgnuA8gCDI3CrfHJOvmvshI7OvT/txf3Chcj6wJYzN5dA== X-Received: by 2002:a62:18d0:0:b0:575:b783:b6b3 with SMTP id 199-20020a6218d0000000b00575b783b6b3mr19995586pfy.28.1677430968378; Sun, 26 Feb 2023 09:02:48 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:48 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 10/28] linux-firmware: upgrade 20230117 -> 20230210 Date: Sun, 26 Feb 2023 07:02:06 -1000 Message-Id: <0c69a2117cc7773a042bea5f79478c726b143f4c.1677430770.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 ; Sun, 26 Feb 2023 17:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177748 From: Alexander Kanavin License-Update: additional firmwares Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 8e6134d39b840d96e1c37d3df21a522afea8bc76) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20230117.bb => linux-firmware_20230210.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20230117.bb => linux-firmware_20230210.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb index fa9e6f604b..bf5d4f54e6 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb @@ -134,7 +134,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 = "05f1d941972cedadbf667c05f6010378" +WHENCE_CHKSUM = "aadb3cccbde1e53fc244a409e9bd5a22" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -212,7 +212,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] = "df11e25ba2fb4d5343473757e17a3b4cef599250a26b1f7e0f038850f0cb3d64" +SRC_URI[sha256sum] = "6e3d9e8d52cffc4ec0dbe8533a8445328e0524a20f159a5b61c2706f983ce38a" inherit allarch From patchwork Sun Feb 26 17:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20167 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 A5C44C7EE30 for ; Sun, 26 Feb 2023 17:02:56 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.69601.1677430971096314501 for ; Sun, 26 Feb 2023 09:02:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jhqI2bpI; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id y11so264295plg.1 for ; Sun, 26 Feb 2023 09:02:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=PfTMj45keV43866JrwdJFHzFpagnu9oQm63+2JVeIX0=; b=jhqI2bpI3ChWH8riHXY5IV11PN98yLeSN5Qdo3lYWDc5oEgwbNhGKSYjzmYUibmuJs pN+7E9WQhlTPKE5nExQQEwS5NsrsUb9WDgT2bZXWweNM56mqazsViaoUN8BNIhk3H/09 te0ns5QeX3TI3Yk3g9RQAni6tfQIFO1kj237z5qVXliu42qg2tOEgdB9aU+v+kYjGhYj OyZ/VZ2bz7Lkl5nE9ufH1JGe2o8F1at8yDlylgrRuxpFMfZoWtYCsUJR8XsK5/cU1Owh EnCnkxTME2aH2PEml9OpNvOxwNiAj8FbG5114VNIjD76hUnOpTgzwe96Oawq1efGbcdy jn3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=PfTMj45keV43866JrwdJFHzFpagnu9oQm63+2JVeIX0=; b=4+26/4hXG2PLEkniMUKH62wkvmi0M9pbwdniTr/Ff6q0OI1bfEGoXPy7gZ/O4+61Z/ 0k4m4Dhtk8/9iCQM0GDTmxQU32tgJv6P56bf2+BKl4tk8Xij97qi19s32dL2yWKwuE5/ HdmdyTPp1Jefzyd19zUoTsI0K8ZBvNH06lxah9ZQtACI+oPNAlyQ+qYyBGZnyVHjsSNg uCnx1Eqg6PovwNRPdwVka4vBpKT9az7Xhe1N4O/U+QFWUDF48cmELggo13Vi8GC4hMbP tvg9Mmb1jgijIeVUoTUwf4nlQKjAvHDIGoGgsYc0PlgGEDa6FXBdVRajXNEHOSW0gYQb uyvg== X-Gm-Message-State: AO0yUKWnqfrxX+yKTucXZx5Hr15M3bYkRVoBjF8wbYXecw7THypjENBA XpVRrS0C40Velr7sey5xnWrMHqq6T/qHVJ1yJ+c= X-Google-Smtp-Source: AK7set9TKZl0+3Un8gKj126cbxivGHpiGt1+563xUAr510uJ7NGyfWbSG/5lUMsvdKELh1gXaYt6aw== X-Received: by 2002:a17:90a:19d6:b0:234:67ef:304b with SMTP id 22-20020a17090a19d600b0023467ef304bmr23435953pjj.37.1677430970121; Sun, 26 Feb 2023 09:02:50 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 11/28] wireless-regdb: upgrade 2022.08.12 -> 2023.02.13 Date: Sun, 26 Feb 2023 07:02:07 -1000 Message-Id: <187b3a810cd52c7031df7985ef2285cc1dfa89ea.1677430770.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 ; Sun, 26 Feb 2023 17:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177749 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit a8e8ea1b4b100b6f0ba5ca9441a8f3f1ac31fbfd) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2022.08.12.bb => wireless-regdb_2023.02.13.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.08.12.bb => wireless-regdb_2023.02.13.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb index 357e79d7e1..ce60154f1e 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "59c8f7d17966db71b27f90e735ee8f5b42ca3527694a8c5e6e9b56bd379c3b84" +SRC_URI[sha256sum] = "fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73" inherit bin_package allarch From patchwork Sun Feb 26 17:02:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20166 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 9C346C7EE2F for ; Sun, 26 Feb 2023 17:02:56 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.69588.1677430972994155422 for ; Sun, 26 Feb 2023 09:02:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6tNCJAGL; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id h8so1107659plf.10 for ; Sun, 26 Feb 2023 09:02:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=9XcbdLVW8L4hVCF1AkEep37qY8VajpXWETAjv74rO9o=; b=6tNCJAGLKRcYt1oHjZDJYMY/Y0v2tGvgG8lJjRFBxNQHrGBneYkfL4rE02mBJMcj0X 4k32uZHSvcV1CFjWc8Eepu8oja9uHHkkNq/0yzX8MgEukvOH9/MxJ0YA89ca8KxxRdT1 pw1V0MgLE8+RGpH/n5F1qWPrBvxLJaU+YXYs0ICRLo6XQyGes7CNBBuIxkSNW9oCDgE8 njh7g3OrVCw3UsZE+Qzk6bddBRD2x4T82Ercgv5s43nyZFZcmhkBQeXfDoBx7VJbQj0P HF87jV9pMl4P9JESZ/mBbLHzIMub+3Ec6l3uNVRjolxVOZk51oEgNAlMOHhLtcShvOrS HMiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=9XcbdLVW8L4hVCF1AkEep37qY8VajpXWETAjv74rO9o=; b=PckrepK+Kr1gJL4rDu1yQ3SeGB/1RskWfewLLX+tvKoUAo246zzZzqTxcMkTy5crxg kAKrq+4hVYhUuRhvBHmVdd5o3cE3HuovdaoPqyK7z8xUDkNrQq8z+AKQmzY48yvq82fE HlwMyp5wfli+EN0fvjfHuUhU1wgA6SSMazoRJ4AwbcaUKEPiFruT4PTD/xBh88O3Rk7A GEBzeVS7s+EHhg/qfIFK1IRyKJpJfOQvjBBoDaSXZOq+cfWSAZcCGfIkG7tU7gT0X7im P1j6/3wzo+f/vmEWEw60whNFd+P9iIxkOSpj3RPjo1qEG5hRwayGsqB6+rWYGqVTrbIm gvSw== X-Gm-Message-State: AO0yUKUAzAhFR2eFqTuOc2i/SmfGhRQ6QTzQA8pSIE4L9XdE/4iBTRGa c8Pe2jJTXw9XXhJgqyuSj19+bnyeytFgH31LeHY= X-Google-Smtp-Source: AK7set8CB/VxPNvu1mmoTSlBg9GQD8baAGVPQvyCz2iYrFg5wg62p38CNtmT+iHHwV6F9jW8TpfoLw== X-Received: by 2002:a17:90a:57:b0:237:161d:f5ac with SMTP id 23-20020a17090a005700b00237161df5acmr21667077pjb.36.1677430971875; Sun, 26 Feb 2023 09:02:51 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 12/28] classes/populate_sdk_base: Append cleandirs Date: Sun, 26 Feb 2023 07:02:08 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 26 Feb 2023 17:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177750 From: Joshua Watt Append to cleandirs in do_populate_sdk so that other classes (specifically, create-spdx-2.2) can add additional directories Signed-off-by: Joshua Watt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 5e6f74b1910a6ddd359b037b975ba29406e1651b) Signed-off-by: Steve Sakoman --- meta/classes-recipe/populate_sdk_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 64a4a58bef..70b3f1974e 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass @@ -205,7 +205,7 @@ fakeroot python do_populate_sdk() { } SSTATETASKS += "do_populate_sdk" SSTATE_SKIP_CREATION:task-populate-sdk = '1' -do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}" +do_populate_sdk[cleandirs] += "${SDKDEPLOYDIR}" do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}" do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}" do_populate_sdk[stamp-extra-info] = "${MACHINE_ARCH}${SDKMACHINE}" From patchwork Sun Feb 26 17:02:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20165 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 9C374C7EE31 for ; Sun, 26 Feb 2023 17:02:56 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web11.69603.1677430974558418261 for ; Sun, 26 Feb 2023 09:02:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QrvgX+zg; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id 6-20020a17090a190600b00237c5b6ecd7so3259269pjg.4 for ; Sun, 26 Feb 2023 09:02:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=mz68EQ68oaxziinxgENWcbOJGHNBLHCGOd3d46qRCSo=; b=QrvgX+zgZ6Ge+rJFjnynvwjehDQiyZagJjjq4LVoCfXK7FzUetB9bJg7xbdCqTmvC1 X1yLtHUNOVxl1QB+ujl6JLUUwZHc3Tqd1E0dlBg+dExtuNrvPm1in4vEFt0sqn/0cb/i UspFlNi4X2kA8qXHm5Or3yWPLPX7XbWavTsuvOThHbkoBLJxS6HsP8sUhh3JyqHq3ZSv 3bIA1V78yR85trNFiuD30ZDPs2Du6cijBG7/uQlIagiBbuPXw3qaBOJbmXXyyMBKlnio D7qz1hNx50qqB9bQZXs2lnS75YX9dLxJiVHmx6t0ENuC9/UyVmD7XHDmxSFDelbjrJeN vf/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=mz68EQ68oaxziinxgENWcbOJGHNBLHCGOd3d46qRCSo=; b=HpDrD6+D3CcyaAmbcSdzlpTykC7OMyW99u/WVxSM+PkU9tVco2JYR2rzL9yWPG+qnn UvBwN55YeKg4F6FGfdCDmSlT1DuR8fmWv2ZxKj3+R3ncGPCM6BGBzBxkgghGmTAfjgjl 8giC6kYqi6abS67x89c0I+XZKqsqc29guNTMcH3AtZWkQWHgp/fBcfrGhv10iGwlMXey m2/963pRtHRGyB5h/O2s5s4Oc7HntPuWn7qDADlO71RaP2OvatgD5uFW+pk3IXzxHD3N 9FDPkZRd4oLNqpXve0z1aGunwa1S577EbjDctom3GKa9txOMYFLc3hDd4Z6TfPOag54m 9jdg== X-Gm-Message-State: AO0yUKWLUxvnZOPK8+S30auQOLnUp1wXOLb9t8BB93eQMyv0Yij7+eFl xnVCrD56OQW1rB69aH+fquqiozpQ9X/OvErN0mg= X-Google-Smtp-Source: AK7set8OvBH4RhJLsdQPlAJCakBldYI6TWG1SwMcp8uU93dSCYOjwlrodjsVV1a9AjJymUjL1FOX+g== X-Received: by 2002:a17:902:f283:b0:19c:94ad:cbe8 with SMTP id k3-20020a170902f28300b0019c94adcbe8mr15826908plc.36.1677430973620; Sun, 26 Feb 2023 09:02:53 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:53 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 13/28] curl: fix dependencies when building with ldap/ldaps Date: Sun, 26 Feb 2023 07:02:09 -1000 Message-Id: <6a4f55bb305e3cb2fb3f60471ff0adaef5adbc9f.1677430770.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 ; Sun, 26 Feb 2023 17:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177751 From: Federico Pellegrin openldap is added as a dependency so the build will not fail, as otherwise ldap headers are not found during configure phase Note: due to upstream bug (now fixed) building LDAP/LDAPS support with minimal configurations can sometimes not work, see details at: https://github.com/curl/curl/pull/10445 Signed-off-by: Federico Pellegrin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit a999f62f5692687a5557f7a50c7c768c50f3d7d3) Signed-off-by: Steve Sakoman --- meta/recipes-support/curl/curl_7.85.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.85.0.bb b/meta/recipes-support/curl/curl_7.85.0.bb index 846cdacb41..4e05434a12 100644 --- a/meta/recipes-support/curl/curl_7.85.0.bb +++ b/meta/recipes-support/curl/curl_7.85.0.bb @@ -46,8 +46,8 @@ PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," -PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap" +PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,openldap" PACKAGECONFIG[libgsasl] = "--with-libgsasl,--without-libgsasl,libgsasl" PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" From patchwork Sun Feb 26 17:02:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20164 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 8DB30C6FA8E for ; Sun, 26 Feb 2023 17:02:56 +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.web11.69604.1677430976362581830 for ; Sun, 26 Feb 2023 09:02:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Wn+CiTS7; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id d10so2212375pgt.12 for ; Sun, 26 Feb 2023 09:02:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=DHGbrVRapqjU68mq+IQwn+OIT1Mwoxa7tuvXDg3+h4I=; b=Wn+CiTS7M4EwMrM5CSMYbPzY5p2PJoFC8oDQmigsMFppB6GMNPSvCNz1Bg9/sU6uIG XiVfFgt5ilmTyyba42zfrH/c6g9aiKTxHRShQu1eWzDtDKVZHMe/3zkSnNeD+1bzzJZz K+FSlps3FHkUR6drJAOSsy6+6Cds+mj4fMzjxT5BD2gUBAAYMrNWCb6E9vFX2eURVJAc cANDSqi+pYBEVoKNOmQynjqrlvnhmaz0ArJUTxvgcj1IHsRqnx9M/VyY0ewoltXG9JLV LOb/1NHMXZr8awfHW3BmKVXykheU9hFb2WCFEOpgLapxzUSd7ZWOHwSCcuu79tyKXMbS MSxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=DHGbrVRapqjU68mq+IQwn+OIT1Mwoxa7tuvXDg3+h4I=; b=odlkmA9ixvQ8ODH7vFeSQaxkwRQnRpGJrTNVXV8DfdhIPseLU8GEsmG9ezlnDYjNDI c9QK7I6nNr+oTr0jJ9Lq4UqOWIubwRUdrf3hbt9TWtHl5b3pXb4sbpYlVk/xQW/OPfHa r0g/FJMsUILpZTlMcmT7WAO2+unmUs5ao52dcJFpLoJxjYIJ/KmYr2LtiBHXFgZZu75F ZgxycfpInXPBnZO5/0N1/EBHSytAvrwoPoRtw3yjkB66BGTElsBXXjDARDmomJTb0AL6 drZGMSbvvgs7Z8lOBxq1KISLiCJKigjemRmy6/QUBaKjPpWrowDlvW473gWJ4yI2zE1b vHLg== X-Gm-Message-State: AO0yUKViBqGCy28Nd/RClpUFu+sSoQXICn1m71OyXrdq5TziiuhRB9Le 1WEdo6sxywTGTT9tb9S6u65zhTFxvz8LeUpTeOk= X-Google-Smtp-Source: AK7set8lnV2LB79l61938c3SjvBwXu+HzL2e4YljPV3ffTZyYQdw8r9cmG9hGdzp8wkebvYbpWBuoQ== X-Received: by 2002:a62:1946:0:b0:5a8:bd6e:90fb with SMTP id 67-20020a621946000000b005a8bd6e90fbmr16799758pfz.19.1677430975380; Sun, 26 Feb 2023 09:02:55 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:55 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 14/28] wic: Fix usage of fstype=none in wic Date: Sun, 26 Feb 2023 07:02:10 -1000 Message-Id: <5f7239eebe61aabbd3dbf4e6e1cf703c71273a35.1677430770.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 ; Sun, 26 Feb 2023 17:02:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177752 From: Pavel Zhukov This allows to specify partition with fstype=none in the wks file to have partition created but without following mkfs. The none fstype is in the list already but the usage is not documented. Example; part /data --ondisk mmcblk0 --fstype=none --align 4096 --fixed-size 512 will create a partition, filesystem may be created manualy on the host or target and data will be preserved if the device is reflashed using same wks. Works with bmaptool and probably does not work with dd. Use case is persistent filesystem/data between reflashing of the image. Signed-off-by: Pavel Zhukov Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 351cb64da37aa43113e5192605d04436652aa3b8) Signed-off-by: Steve Sakoman --- scripts/lib/wic/partition.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 2a916e077c..382afa44bc 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -133,6 +133,8 @@ class Partition(): self.update_fstab_in_rootfs = True if not self.source: + if self.fstype == "none": + return if not self.size and not self.fixed_size: raise WicError("The %s partition has a size of zero. Please " "specify a non-zero --size/--fixed-size for that " @@ -405,6 +407,9 @@ class Partition(): (extraopts, self.fsuuid, rootfs, rootfs_dir) exec_native_cmd(erofs_cmd, native_sysroot, pseudo=pseudo) + def prepare_empty_partition_none(self, rootfs, oe_builddir, native_sysroot): + pass + def prepare_empty_partition_ext(self, rootfs, oe_builddir, native_sysroot): """ From patchwork Sun Feb 26 17:02: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: 20172 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 8D0CDC64ED6 for ; Sun, 26 Feb 2023 17:03:06 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.69591.1677430978056977106 for ; Sun, 26 Feb 2023 09:02:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=S9KnnzjN; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id z2so4380209plf.12 for ; Sun, 26 Feb 2023 09:02:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=sItN1N4b6rKxcr1pQyxBU+B1d1czVJUj/34VAlEnBQQ=; b=S9KnnzjNOyyOF6SplZrLrdUg/zSZ1o3uhTqAVqrvzAUZ+3IBuhCaui9QcbzO7E/tXL qS/vnh4QzGnhxcqx3GuXC5FILEGm284Ti9ASdBAPkufdNBWhtKSfpObYtgafb+owL5YQ ty7h3RHolmnRXh5oPJT/PmOoRTlQ0OxDsrUGdYB003C7K+KglXPrBCT+y5IpB2j6uCvA RSehqdJ7LKGNql1CUkAReObVSMjENIAzQOqTFEfXZE+ZUprPW9/bjNefunRY/L1naXL4 SG8P3i5ea8cjmyAKW+hzmSfXOHzs2ugx6wvTe9rah1zBEUm/nzslOZ+/ksfuI9yVDnmr 6Vlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=sItN1N4b6rKxcr1pQyxBU+B1d1czVJUj/34VAlEnBQQ=; b=g1VQ3leaz8BShiiOTzlx6xrf1Cs/xjUaq9aRzaB7mN210ptnHHO4uPLJ9SXau2U6kw QyNEcWMWV2+cnfmKuMMSwUCCA3uptIBBrtfa0CGv3PMnR3WIzUHOKL4uHxY7mMY/iRoU vWgEnNvg/aRJGGmhzzQFiYI3iukGvHgvudTrr3QwY6E1ap5dBcRRAfQiKAuHzGWFsqeL qJUqJQ1Q5HCWjfKYWDQib/JhbhFNqc772RSqkTmhFS6u9bdV7EqgkKREouzLdDSHhutf zxcqAm7oQK7mMK1NI47JIqFXD4Mv6jNa/lLN/gJ7s09gGDf41tNDAynhYRjvY9KaI5Qv IujQ== X-Gm-Message-State: AO0yUKW3cPmS+tizDUpNscBIPVyZlBgeKv/370IHpyfoQxoQO1CV4ZwO eb4OoT+RLJDxAicAdjbBE+v3+2HLVBzxFszksCE= X-Google-Smtp-Source: AK7set9VbsJLpiE0dImRuwE2SiPolocfRVo/I1r21utvL7g7g/FhLjFRA9DMcJ0DerSdT71Nso/PFg== X-Received: by 2002:a05:6a20:430e:b0:cc:c3f7:9193 with SMTP id h14-20020a056a20430e00b000ccc3f79193mr6460438pzk.3.1677430977112; Sun, 26 Feb 2023 09:02:57 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 15/28] bblayers/setupwriters/oe-setup-layers: create dir if not exists Date: Sun, 26 Feb 2023 07:02:11 -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 ; Sun, 26 Feb 2023 17:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177753 From: Adrian Freihofer Without this patch: $ bitbake-layers create-layers-setup /home/adrian/temp/poky-clone NOTE: Starting bitbake server... Traceback (most recent call last): File "/home/adrian/projects/poky/bitbake/lib/bb/process.py", line 169, in run pipe = Popen(cmd, **options) File "/home/adrian/projects/poky/bitbake/lib/bb/process.py", line 73, in __init__ subprocess.Popen.__init__(self, *args, **options) File "/usr/lib64/python3.10/subprocess.py", line 971, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/usr/lib64/python3.10/subprocess.py", line 1847, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: '/home/adrian/temp/poky-clone' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/adrian/projects/poky/bitbake/bin/bitbake-layers", line 95, in ret = main() File "/home/adrian/projects/poky/bitbake/bin/bitbake-layers", line 88, in main return args.func(args) File "/home/adrian/projects/poky/meta/lib/bblayers/makesetup.py", line 90, in do_make_setup p.do_write(self, args) File "/home/adrian/projects/poky/meta/lib/bblayers/setupwriters/oe-setup-layers.py", line 36, in do_write repos = parent.make_repo_config(args.destdir, args.include_layer_repo) File "/home/adrian/projects/poky/meta/lib/bblayers/makesetup.py", line 55, in make_repo_config destdir_repo = self._get_repo_path(destdir) File "/home/adrian/projects/poky/meta/lib/bblayers/makesetup.py", line 30, in _get_repo_path repo_path, _ = bb.process.run('git rev-parse --show-toplevel', cwd=layer_path) File "/home/adrian/projects/poky/bitbake/lib/bb/process.py", line 172, in run raise NotFoundError(cmd) bb.process.NotFoundError: Execution of 'git rev-parse --show-toplevel' failed: command not found with this patch: $ bitbake-layers create-layers-setup /home/adrian/temp/poky-clone NOTE: Starting bitbake server... NOTE: Created /home/adrian/temp/poky-clone/setup-layers.json NOTE: Created /home/adrian/temp/poky-clone/setup-layers Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 2da12ccada46443d58dd8fab463156fa763b84cc) Signed-off-by: Steve Sakoman --- meta/lib/bblayers/setupwriters/oe-setup-layers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/bblayers/setupwriters/oe-setup-layers.py b/meta/lib/bblayers/setupwriters/oe-setup-layers.py index f6a484b766..d5bc19a8cb 100644 --- a/meta/lib/bblayers/setupwriters/oe-setup-layers.py +++ b/meta/lib/bblayers/setupwriters/oe-setup-layers.py @@ -33,6 +33,8 @@ class OeSetupLayersWriter(): def do_write(self, parent, args): """ Writes out a python script and a json config that replicate the directory structure and revisions of the layers in a current build. """ + if not os.path.exists(args.destdir): + os.makedirs(args.destdir) repos = parent.make_repo_config(args.destdir) json = {"version":"1.0","sources":repos} if not repos: From patchwork Sun Feb 26 17:02: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: 20169 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 8D45FC7EE2E for ; Sun, 26 Feb 2023 17:03:06 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.69587.1677430956817460407 for ; Sun, 26 Feb 2023 09:02:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=b2hpYXrU; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id nw10-20020a17090b254a00b00233d7314c1cso7733026pjb.5 for ; Sun, 26 Feb 2023 09:02:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=xqoFDSxUGAONDhWhoNCaLgBzp4bq5x/fll7Un3RD4QM=; b=b2hpYXrUpqFPPEgD7XvxeOl0Og9hGvUdOkCh4MUjCEhz2S5+S94di72nwjPXjAbZhF uPsyZ5j7rNlhZnzPEc1jTVWYnpAEv78NIDRrAG9AtjaPnk9L2p8y7R4yZ5ntzFuIQ9Av LfK9QYFHGI2AbwbFDWl01I0NMl3BdTEw5iy93R28zpiiUjgXb8CmDNS8q13RjUKDHFWq F+yw9Uu134TEYiQYplNsAHluDlkIFOcOygLdMz0ZEPnrGBBibKyjUeCHXikSTgsVJa06 LmWDSIdP5n3U5BcIatzNiFvW+Or966cLZGcCd9ZUYRE+gKt8pTN6mTSLI23h4W3Jlqee N6aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=xqoFDSxUGAONDhWhoNCaLgBzp4bq5x/fll7Un3RD4QM=; b=xvZkzR428O6gP+S34UlsfrTX+QNNBvO2LnjXGnp/4q/elW+381BJWOJHRAaJEc56TJ cSVfmt4k/5Cc71PEwOYBTvop2YWG+n9o2n/e6qdF/zceMp3yiccJTxqBjmZLBHxVPhRu d+H5obFGe1AfwSVS8ry+aIT7Lkeh2SnB7SbhZ0szKccrRGr9wQCxC0AS8dieXycWZhhA 7HM8KO5N26bXFGoG1CerYFMitTz57xaPfbJeqax4+um7MV+b3mG9S9Kox61q21LRRJu1 O/lDGBZv66t9Fac+Lc2T83edCRvKrGiVucf1wldMmxan1BP4HbyuL622Lt2c2MgaRAOE KFRg== X-Gm-Message-State: AO0yUKXIOwfydfZDuSQ2ixncIGQAk9CFD9vEESglHCS0C9J9rgzRUjiW zkzxYoov2ZTeKYTcLYjvxgw2CYT1DhBbUkEh4uY= X-Google-Smtp-Source: AK7set+JHrbCzRvN0VMsQaGyGup/8eFpyaRrgoKQj5fFwqWqAXZ6dnmoWiDMInhmyb8TT1m/EGV54g== X-Received: by 2002:a05:6a20:9151:b0:cc:5917:c4ee with SMTP id x17-20020a056a20915100b000cc5917c4eemr12672463pzc.35.1677430978886; Sun, 26 Feb 2023 09:02:58 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:02:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 16/28] bblayers/makesetup: skip git repos that are submodules Date: Sun, 26 Feb 2023 07:02:12 -1000 Message-Id: <0bbcc17f68943655a95913b0d4c214c0227d24c0.1677430770.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 ; Sun, 26 Feb 2023 17:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177754 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit d8bc9cd4ca8ae268a61024f8ac5083a2bbdc432f) Signed-off-by: Steve Sakoman --- meta/lib/bblayers/makesetup.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py index 834e9338bc..5fb6f1469e 100644 --- a/meta/lib/bblayers/makesetup.py +++ b/meta/lib/bblayers/makesetup.py @@ -45,6 +45,13 @@ class MakeSetupPlugin(LayerPlugin): return "" return describe.strip() + def _is_submodule(self, repo_path): + # This is slightly brittle: git does not offer a way to tell whether + # a given repo dir is a submodule checkout, so we need to rely on .git + # being a file (rather than a dir like it is in standalone checkouts). + # The file typically contains a gitdir pointer to elsewhere. + return os.path.isfile(os.path.join(repo_path,".git")) + def make_repo_config(self, destdir): """ This is a helper function for the writer plugins that discovers currently configured layers. The writers do not have to use it, but it can save a bit of work and avoid duplicated code, hence it is @@ -63,6 +70,9 @@ class MakeSetupPlugin(LayerPlugin): logger.error("Layer {name} in {path} has uncommitted modifications or is not in a git repository.".format(name=l_name,path=l_path)) return repo_path = self._get_repo_path(l_path) + + if self._is_submodule(repo_path): + continue if repo_path not in repos.keys(): repos[repo_path] = {'path':os.path.basename(repo_path),'git-remote':{'rev':l_rev, 'branch':l_branch, 'remotes':self._get_remotes(repo_path), 'describe':self._get_describe(repo_path)}} if repo_path == destdir_repo: From patchwork Sun Feb 26 17:02: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: 20171 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 9A461C7EE31 for ; Sun, 26 Feb 2023 17:03:06 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.69593.1677430981711859921 for ; Sun, 26 Feb 2023 09:03:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uPFdllkB; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id l1so3814472pjt.2 for ; Sun, 26 Feb 2023 09:03:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Zr2RDf6eBegaQnve+uHA/0F54eR6z7WAVuSvjIKSA8w=; b=uPFdllkB911kr3QJhX8uKQw8gfObqPSk8QfGPkgwealS8J7Io0BtoZzBWwSdAWKAwj R9CiY+kGKheJK5MZ/EWLYZZ1TNSJ/Wk2GkE/lBuWS1wKbMYFWbbe8FV6ev2QCcH3xyr6 9WrhlVvQm+ylb0Aw7bK/G5zZ9vMt9bOxxV0ZAa7ZXMM6xDi+srd2V5YvGanqlLlbLXt3 Jx0j0X2dQCjm7PbiNbKRmeOpB4f5/JJq9NC1tjinis+bJSfBiIavgiM2XvcyYTpPWnNa PUPtVRyJh9jKDwIsKrmO2AM3qZ46NdgI2jRpJYKDtvFGlMEGwZMXh01clY6qArMDM6X8 IzxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Zr2RDf6eBegaQnve+uHA/0F54eR6z7WAVuSvjIKSA8w=; b=pgTvYK4j9Ar/nu7CitcdAmfjPqZ7uZpPWOMY85Un47H4d3vnYvfW0nPQuOTnTKmMcC pmZ7ukPqmszJDn4DsoQf6th/Hro0tpyrSXkACSs16NqazgAv5psBoCJVWMNqA/a69gvJ WohJqZkFC08RMxIPUiM6yT5iFZHCSCp6Zpk1vWFdQ640q6YsnZjf3wIcOof0nwUc1BYg 46G+3OT/CjKp1773t1q6WtAr044QovHl0YsZ1qHWYglE0rOGqzHY84x64NZ7YbAPP25v VTvMsVQ2m34n25gtnP0Pr+KkchMsH+JYidHPdy3sUUkSNo49U1/htMYga6jmlJPHi6S5 kChg== X-Gm-Message-State: AO0yUKXDNfvICoSP4njaEFe09RFxp55yqrirN0xw4xzoTdvQO3GCxMGu s3RiN/DVkM/8tyBeEAp15+DjDfcLmwIiPU5l6mg= X-Google-Smtp-Source: AK7set/y6C4FhnCzPdZTcf550AUj3Vl0G9OSv6+qHWU0l8ktwQYFh5ENzJQPRLAECrFS8ljYyg3Pkg== X-Received: by 2002:a05:6a21:998a:b0:cc:c2a0:995a with SMTP id ve10-20020a056a21998a00b000ccc2a0995amr5828717pzb.2.1677430980635; Sun, 26 Feb 2023 09:03:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.02.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 17/28] busybox: Fix depmod patch Date: Sun, 26 Feb 2023 07:02: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 ; Sun, 26 Feb 2023 17:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177755 From: Saul Wold The original patch was actually allowing .debug modules though which was in-correct. This change blocks the parsing of .debug modules (which is correct). As noted in [YOCTO #15022] this should address the empty modules.dep when using the BusyBox depmod. Signed-off-by: Saul Wold Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 339c3c3abe8d405cfe7b3f34db9b3547bcaaf878) Signed-off-by: Steve Sakoman --- .../busybox/busybox/0001-depmod-Ignore-.debug-directories.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch index 354f83a4a5..d76118f85b 100644 --- a/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch +++ b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch @@ -21,7 +21,7 @@ index bb42bbe..aa5a2de 100644 /* Arbitrary. Was sb->st_size, but that breaks .gz etc */ size_t len = (64*1024*1024 - 4096); -+ if (strstr(fname, ".debug") == NULL) ++ if (strstr(fname, ".debug") != NULL) + return TRUE; + if (strrstr(fname, ".ko") == NULL) From patchwork Sun Feb 26 17:02: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: 20170 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 8E7BCC6FA8E for ; Sun, 26 Feb 2023 17:03:06 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.69595.1677430983419634588 for ; Sun, 26 Feb 2023 09:03:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=zOUOvWAv; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id h11-20020a17090a2ecb00b00237c740335cso2905147pjs.3 for ; Sun, 26 Feb 2023 09:03:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=N/bAyshodnGAIvzSHijP9hZW3pv2nolKxDdNR7PsyEE=; b=zOUOvWAvQ5g3U+whHIt46woiyrC/Oehj3aOXe3AUT1onFyirsPiXkyaFloLhcIs5rw BYLtPuvPo+fVmJcV2da4MJp/EOio9OlZWOKUI++8fgOWq5LxICSZVJ3/BCJXxLpeBTgT 2YRiwPjNW+wtUE4an5xbWQtiZJw9ujBHtHAxMYWNNXy+yuDWlTpUKIgqp+u70gHog8eo xbkytL4LQHHzc9uS8YCcaSssuB7FGaUBs1l06WBnMeJatjKsDHf3SltLXTjKuLEYm7/c Rz2MLW3Ih580GewWNn3W+ZiRRDsTZDNSwYhz0eZ4JZjmkY65H/pWtQpu5V1Mqx9RTmpx g9Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=N/bAyshodnGAIvzSHijP9hZW3pv2nolKxDdNR7PsyEE=; b=eI3JBZHt8Mom+Nw72a9yrG2+IEeYxM1Bz0zxnYp/WSBB8G6rFx1LR4yL0SyJPn9OCl bSfhzvZhc++aM1OsQ8ob7qF5vJkwrmuAHUMEtZ92fEgNqj/FmAotJ9qYRBNUp44thWfq LVaJ8wXL8Lfsrk8vR7sWHGFaebLyueFPjOZDdHbtfH8K5vRFrp7TM0Mgn/re145mxr3L GViR3ZqPAeeS1QDHvr4vb65Him5UYlbW0DFUTtCVHRVbBHgEntn6wRwcFCxAP+23Gqka 4jlTrwtINN5MVYILWMVLZgncaGhqZPnhJ/rb12PUmtcMPlXK60ZHaF7ic3aRDBrHcc37 STbQ== X-Gm-Message-State: AO0yUKULVdAwjSzluS7XWRRAXcG68eERa6Mu2dpR09QOYNo+UxD1d1pb KRVQyY5Hlz/2sK4dC5+xZLZI94e8v7Ych9jkKLs= X-Google-Smtp-Source: AK7set/JMHctqLIpXMe3R7qudAyNOIqJ9FqSRzXTj5ix1s42GvuJI1uYl345LGjDrlfDVbJB4XaOlg== X-Received: by 2002:a05:6a20:2d9a:b0:cb:77f0:9a27 with SMTP id bf26-20020a056a202d9a00b000cb77f09a27mr18232235pzb.24.1677430982452; Sun, 26 Feb 2023 09:03:02 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 18/28] sstatesig: Improve output hash calculation Date: Sun, 26 Feb 2023 07:02:14 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 26 Feb 2023 17:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177756 From: Mateusz Marciniec Symbolic links to the files are included during the output hash calculation but symlinks to the directories are missed. So if the new symlink to a directory was the only change made, then the output hash won't change, and the Hash Equivalence server may change unihash. In the next run bitbake may use an older package from sstate-cache. To fix this followlinks=True flag could be set for os.walk but it can lead to infinite recursion if link points to a parent directory of itself. Also, all files from a directory to which symlink points would be included in depsig file. Therefore another solution was applied, I added code that will loop through directories and process those that are symlinks. Signed-off-by: Mateusz Marciniec Signed-off-by: Tomasz Dziendzielski Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ee729163f31f26b1462a47e1e53f7a0f9de9b464) Signed-off-by: Steve Sakoman --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index bf48aed7e1..fb4abe8241 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -662,6 +662,10 @@ def OEOuthashBasic(path, sigfile, task, d): if f == 'fixmepath': continue process(os.path.join(root, f)) + + for dir in dirs: + if os.path.islink(os.path.join(root, dir)): + process(os.path.join(root, dir)) finally: os.chdir(prev_dir) From patchwork Sun Feb 26 17:02:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20168 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 9A3B9C7EE2F for ; Sun, 26 Feb 2023 17:03:06 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.69591.1677430978056977106 for ; Sun, 26 Feb 2023 09:03:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mK7gJUbw; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id z2so4380379plf.12 for ; Sun, 26 Feb 2023 09:03:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=GgaU1jloGCLapcq54PC8SDiLyxVBf+hCZlPJmyRowkQ=; b=mK7gJUbwlOByd2v/HsdMEuacypXicaz1yqT85cnsnplOIx9JV7+CLFtxzV9ItUTAX8 ztwGoZJRSVyYISUwSjVLc2tAAh/R92a+ijkOcwdy3MSR+knU5Nczc/oMPxvRn7I7CRNZ YZLrY+PEVbh+j/G0JPjWAO3VhtY+xW20IpObM2ozVrlvsQAapPnqPWjYQNXCGHEBeFJ0 G5pX2ZL0+k1i8T6kxuHMRtHbcPytiybcFhwDFdkuUO5wdxLlITsEvbnT1knbQhaScdtg DcouTJimyUhR6s+HESPdcqOwJgSWvPy+phGGIysa5HVTQ7JIXiBryiatoRRM613kVQDo dXsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=GgaU1jloGCLapcq54PC8SDiLyxVBf+hCZlPJmyRowkQ=; b=VsI5shv+k2cSdUUxbQ/HQltRh2uDxQ/C1u+mu7rmN8Znd02DAwYREMX0SxjoWv0kIk d76VsxDFyqV99koUKY7L9LhedKBnn/J6mEoHuPYTSGGD+ZKe5wSmeu4D+2RTKQ9TRAqj xwqBGIJK5VzNngTkfpnxHgWP9cZt81+LqE1bGN/cK4Gy9e9E98AdeJlJz/g2sTwZd+mb 5XPe4g/cvrAtVmrdk8U+Kr8n1V12To699d9RvDtzHkLEn1IRl138I0c4Y/IvplMxfzUu Ip05uH8vB4eU8j8SOeDoq6tYKkuae271Ij2LJtc1HTI4Nf1H4NrV9WAm2bp0XuidLpXT hh0A== X-Gm-Message-State: AO0yUKUFjfUJanUb7PFJu7NEgw9bTLGbaTznYUPYS5FMBqEkH6Y6j4xG pnhyJfKpcRNUxkDFC+lLBfMEWm0a9Ll3qODq5Xw= X-Google-Smtp-Source: AK7set9ikx1Eci7vNRJ5NgULKHpfYKmddehq0LXpmibwxdS2A5WuRUQmXmWi8m17iP37niR5Mr/piw== X-Received: by 2002:a05:6a20:6998:b0:cb:a64b:6e1b with SMTP id t24-20020a056a20699800b000cba64b6e1bmr23149645pzk.58.1677430984292; Sun, 26 Feb 2023 09:03:04 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 19/28] dhcpcd: fix dhcpcd start failure on qemuppc64 Date: Sun, 26 Feb 2023 07:02:15 -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 ; Sun, 26 Feb 2023 17:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177757 From: Xiangyu Chen Backport patch to fix dhcpcd start failed on qemuppc64. Signed-off-by: Xiangyu Chen Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit a31d658198566de12cdd1aad18776b8da8065787) Signed-off-by: Steve Sakoman --- .../dhcpcd/dhcpcd_9.4.1.bb | 1 + ...x-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 5cf77fa0f6..39e689d2f6 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -16,6 +16,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \ file://0002-privsep-Allow-newfstatat-syscall-as-well.patch \ + file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ " diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch new file mode 100644 index 0000000000..1c514f9b8c --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch @@ -0,0 +1,34 @@ +From 7a2d9767585ed2c407d4985bd2d81552034fb90a Mon Sep 17 00:00:00 2001 +From: CHEN Xiangyu +Date: Thu, 9 Feb 2023 18:41:52 +0800 +Subject: [PATCH] privsep-linux: fix SECCOMP_AUDIT_ARCH missing ppc64le (#181) + +when dhcpcd running on ppc64le platform, it would be killed by SIGSYS. + +Upstream-Status: Backport [7a2d9767585ed2c407d4985bd2d81552034fb90a] + +Signed-off-by: Xiangyu Chen +--- + src/privsep-linux.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 7372d26b..6a301950 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -232,7 +232,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + #elif defined(__or1k__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC + #elif defined(__powerpc64__) +-# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 ++# endif + #elif defined(__powerpc__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC + #elif defined(__riscv) +-- +2.34.1 + From patchwork Sun Feb 26 17:02: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: 20176 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 8D35EC7EE2E for ; Sun, 26 Feb 2023 17:03:16 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.69588.1677430972994155422 for ; Sun, 26 Feb 2023 09:03:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tUQsMPag; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id h8so1108003plf.10 for ; Sun, 26 Feb 2023 09:03:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=EBdb7h866JIkWIWUPARzfGhexWB+VeEHHIyiw3IuXVU=; b=tUQsMPagxyfY3GmPpxWK9hLGQOWfbPqf/drhb23Y93jLLqWK0Ki7x3kDoqH2ZFUhok vvcczqbDC/Gxvcw0Qa7bFUnx6F1wcNomNaqb+PP9SKaX3OdiFZaiDfMImmRasmfZkd6Y jPbIEf2ioLdlkv1Z4lPZQEJHTAl4kYXDGVG3qy4lxNF7Ty4NrTZ2br+wi3mxDOJuwwb/ dryKZ4geP8N7pqkzc5Sfgzsi/6rLymQEzt6VweDDxkim5tsp/B3FvQSbd5gyrNJxSHSf Nhkl/aOKqrLnvQhCNlsb829KoZc4KMS8/BlRoPUg3ABl7+BRA/oCxJrnTcpn6lBULjss EWww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=EBdb7h866JIkWIWUPARzfGhexWB+VeEHHIyiw3IuXVU=; b=SX/qCpkhSNivR0B/Fj53rr8Z80vXXybbTf5CaDOq8//7mrYRc14SHBa/mFwchRDdSf YpP4L1wFO0aGEllfVaMEc0TKFo7rghJ5JAl6+FnxCdYLDRwt8hAWzTa8FYpeQiSgNdds JH0V6n4pu0kfEvhAJNB3t6L1smKGbV5Sln30jOsZE2+4EN5XKYMPjQ3l+7/CuPRWvsPF 8LNHLvn+owyO6n8adHUb0pWedVU+gaGiFXCkZCWpy6RdJZqfmGC6EGDmeUYuFP+V4Sdn SEzOgTD5852wNsIZVwwxEebPMrQ59CoAMiBw6nsD0h0o5zdBCDyYIreTYVPqCH28v4w6 mwjA== X-Gm-Message-State: AO0yUKV89/w/R+LYxnLttEGu0Gvigo2T6O0xN/jfQyyY2lCPbuyFVF92 11b/CsROSpCelGwwmB9CRhHMfyAusC2maL1p4J8= X-Google-Smtp-Source: AK7set/qgGmsEJCOJOuWd7DTjQM0hD7hi/iAUice4HBcsVv3LRbEfE4ns3IkFstFyMWmqTDWiP8OdA== X-Received: by 2002:a17:90b:3802:b0:234:6c1a:8d9b with SMTP id mq2-20020a17090b380200b002346c1a8d9bmr22996643pjb.0.1677430986269; Sun, 26 Feb 2023 09:03:06 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 20/28] lttng-modules: fix for kernel 6.2+ Date: Sun, 26 Feb 2023 07:02:16 -1000 Message-Id: <5d36b42406d7cbc152008c9de364eb4187c64b3b.1677430770.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 ; Sun, 26 Feb 2023 17:03:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177758 From: Bruce Ashfield Backporting a patching from the 2.13.x stable branch of lttng to fix the build against kernel 6.2+. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 3aed7dfe5ff6f52497dcffa58bc2f06cf709ea18) Signed-off-by: Steve Sakoman --- ...ccessor-helpers-into-accessors.h-v6..patch | 45 +++++++++++++++++++ .../lttng/lttng-modules_2.13.8.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch new file mode 100644 index 0000000000..26ae605b31 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch @@ -0,0 +1,45 @@ +From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 16 Jan 2023 15:01:51 -0500 +Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2) + +See upstream commit : + + commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703 + Author: Josef Bacik + Date: Wed Oct 19 10:51:00 2022 -0400 + + btrfs: move accessor helpers into accessors.h + + This is a large patch, but because they're all macros it's impossible to + split up. Simply copy all of the item accessors in ctree.h and paste + them in accessors.h, and then update any files to include the header so + everything compiles. + +Upstream-Status: Backport + +Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52 +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +--- + include/instrumentation/events/btrfs.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h +index 785f16ac..01157107 100644 +--- a/include/instrumentation/events/btrfs.h ++++ b/include/instrumentation/events/btrfs.h +@@ -9,6 +9,10 @@ + #include + #include + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0)) ++#include <../fs/btrfs/accessors.h> ++#endif ++ + #ifndef _TRACE_BTRFS_DEF_ + #define _TRACE_BTRFS_DEF_ + struct btrfs_root; +-- +2.34.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb index 3cfc1bc58e..c04796be16 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb @@ -13,6 +13,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \ file://fix-jbd2-upper-bound-for-v5.10.163.patch \ + file://0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch \ " # Use :append here so that the patch is applied also when using devupstream From patchwork Sun Feb 26 17:02: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: 20177 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 95BC2C6FA8E for ; Sun, 26 Feb 2023 17:03:16 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.69588.1677430972994155422 for ; Sun, 26 Feb 2023 09:03:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vjHRl0Z2; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id h8so1108059plf.10 for ; Sun, 26 Feb 2023 09:03:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=BzZDvQhb20sSm0dLc6YC8XOiEpUO2kkao8AplX4LZLo=; b=vjHRl0Z2NmMvKNOQG2fi09c5xRogd4s15VzBUV5h0HfIwfK8DBmSvDOgCPi2Vo6J4Q 4nrs86m31x+z9VKPNwzqrmEqZgRXKrD4+rLgOqCqGnB+nUtt1/mBzrWlbb6bcHkZ2cLN +WrZPDH4MNFcx9Lbe+4cqyA4CsdkzrJ9sWoplhCQKKsIlhaxYyjaHpGupalm+rf68/+l e3AEF/Pi/cfI0kyQ26GSk0q/H0wEDoBMFfvyieO8pIi0AaMFxeX+1BSRozrjzG5uQkTR 2i4stEWBvWFWbD+KVILYDza6fSDRLyuQHd5ZWWCkVbIEbDmkRhT7vQbV6e9TGpmTvv70 Od2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=BzZDvQhb20sSm0dLc6YC8XOiEpUO2kkao8AplX4LZLo=; b=md/J4gexaVikZqtsCvuga9WdhCKcZNsocogZUJJqXZvL5FtmakQAmKZUq0qGAhDWA6 6/PHrKGUgQCbxZ5j7IkPXh3J9BShkebOvOU/tYZ0jitj25ttMNluNyXG2GoAuvWOEgD+ AKpFzjDMbndcCQhovDS5JX48/19IwBdfOgtrntTocwUvJaPuVO6lL5Ha9CesG46mmRRP 6Ueayql+EyZLeqZWeeqxuSqeFNB92fKL1w2TLgvnwlqqknfPFQktEfPvLUtQ84DD7pC2 3LpDIvC4KlBsOUVUWEeuDBl6FBrX+2AD/N7I1hYCVj1aMQVOPnuI4om4ffMVz/kqQLIP KdNw== X-Gm-Message-State: AO0yUKV9aiClPArZMN5+U3qQ3henOiSzJNnp2MMYlntgaM5SRTFSJEmd UtfUjrAttX80SjLsnZ8EC9ursqUuLu+1un02Faw= X-Google-Smtp-Source: AK7set8En+AKmvZmlpPISL+maMhpQRFsnQi7/G6sYRIoAvkbiiMkZdwYYDrpz3i88Eh8Y0qBoKYW4w== X-Received: by 2002:a05:6a20:549d:b0:cc:34e7:bbad with SMTP id i29-20020a056a20549d00b000cc34e7bbadmr13915048pzk.25.1677430988315; Sun, 26 Feb 2023 09:03:08 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 21/28] libssh2: Clean up ptest patch/coverage Date: Sun, 26 Feb 2023 07:02: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 ; Sun, 26 Feb 2023 17:03:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177759 From: Richard Purdie Martin Jansa spotted patchreview.py reports Malformed Upstream-Status in a patch in this recipe. The patch is not being applied since there is no ptest override. The test in question was also disabled due to an issue with new versions of openssh. Add a workaround for the broken test, enable it, drop the broken patch. Signed-off-by: Richard Purdie (cherry picked from commit e9f2cc084638ce9cb5339df611e473c30f0e40b1) Signed-off-by: Steve Sakoman --- ...nviroment-to-decide-if-a-test-is-bui.patch | 44 ------------------- .../libssh2/libssh2/fix-ssh2-test.patch | 23 ++++++++++ .../libssh2/{files => libssh2}/run-ptest | 3 +- .../recipes-support/libssh2/libssh2_1.10.0.bb | 3 +- 4 files changed, 25 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch create mode 100644 meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch rename meta/recipes-support/libssh2/{files => libssh2}/run-ptest (67%) diff --git a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch deleted file mode 100644 index b1204e49eb..0000000000 --- a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f6abce5ba41a412a247250dcd80e387e53474466 Mon Sep 17 00:00:00 2001 -From: Your Name -Date: Mon, 28 Dec 2020 02:08:03 +0000 -Subject: [PATCH] Don't let host enviroment to decide if a test is build - -test ssh2.sh need sshd, for cross compile, we need it on target, so -don't use SSHD on host to decide weither to build a test - -Upstream-Status: Inappropriate[oe specific] - -Signed-off-by: Changqing Li - ---- - tests/Makefile.am | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index dc0922f..6cbc35d 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,16 +1,12 @@ - AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src - LDADD = ../src/libssh2.la - --if SSHD - noinst_PROGRAMS = ssh2 - ssh2_SOURCES = ssh2.c --endif - - ctests = simple$(EXEEXT) - TESTS = $(ctests) mansyntax.sh --if SSHD - TESTS += ssh2.sh --endif - check_PROGRAMS = $(ctests) - - TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) -@@ -38,4 +34,4 @@ if OPENSSL - # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c - # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c - EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c --endif -\ No newline at end of file -+endif diff --git a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch new file mode 100644 index 0000000000..ee916c42d4 --- /dev/null +++ b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch @@ -0,0 +1,23 @@ +In 8.8 OpenSSH disabled sha1 rsa-sha keys out of the box, +so we need to re-enable them as a workaround for the test +suite until upstream updates the tests. + +See: https://github.com/libssh2/libssh2/issues/630 + +Upstream-Status: Backport [alternative fixes merged upstream] + +Patch taken from https://github.com/mirror-rpm/libssh2/commit/47f7114f7d0780f3075bad51a71881f45cc933c5 + +--- a/tests/ssh2.sh ++++ b/tests/ssh2.sh +@@ -25,7 +25,8 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host + -o 'Port 4711' \ + -o 'Protocol 2' \ + -o "AuthorizedKeysFile $srcdir/etc/user.pub" \ +- -o 'UsePrivilegeSeparation no' \ ++ -o 'HostKeyAlgorithms +ssh-rsa' \ ++ -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \ + -o 'StrictModes no' \ + -D \ + $libssh2_sshd_params & + diff --git a/meta/recipes-support/libssh2/files/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest similarity index 67% rename from meta/recipes-support/libssh2/files/run-ptest rename to meta/recipes-support/libssh2/libssh2/run-ptest index 9e2fce2d24..5e7426f79d 100644 --- a/meta/recipes-support/libssh2/files/run-ptest +++ b/meta/recipes-support/libssh2/libssh2/run-ptest @@ -2,8 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -# omit ssh2.sh until https://github.com/libssh2/libssh2/issues/630 is fixed -for test in simple mansyntax.sh +for test in simple mansyntax.sh ssh2.sh do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.10.0.bb index 072d6819c0..d5513373b0 100644 --- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.10.0.bb @@ -8,11 +8,10 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ + file://fix-ssh2-test.patch \ file://run-ptest \ " -SRC_URI:append:ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" - SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" inherit autotools pkgconfig ptest From patchwork Sun Feb 26 17:02:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20173 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 9B42DC7EE2F for ; Sun, 26 Feb 2023 17:03:16 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.69590.1677430960513286978 for ; Sun, 26 Feb 2023 09:03:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vuq74Ue9; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id v11so884842plz.8 for ; Sun, 26 Feb 2023 09:03:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=E77WoTqPPrCGhRHDtEGMKIKXL+9/gdOS1msEQL4moyw=; b=vuq74Ue9B2girE4BPC5BRjvFcVOFEC+qfk4P4G7pgjLA6UprSxELaAB8ValECXB/Vp Ut3WVklRoZJ2TU4LoqeAcRb5bhDkmOXeogMzNrs3nRdvzcA/ITv/T89314y26SIA/rpL OpN2GqKXTEQmRgeqKX8rCBVaCX7YTtTG2FUp23LtuUrU3it6dz8GHKVOm/+r1vlTRWHU 7M+5A69XRYcwz2D8XsLonnjlfyG1U/kadY8m/UqBi7myhpSq7GA6v+iERTIrNs/NTknZ 053Xxy+Cgm4EilsZT8OQJgDkDkSCHaUJzCyWUyMh2XN/NXUgg39AkVOKXHRujF5vH2cV 36JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=E77WoTqPPrCGhRHDtEGMKIKXL+9/gdOS1msEQL4moyw=; b=ssWerwztDOzc6NXH6c1op8ouC2oplCpOe5GuuXnTCbPAWQCjl2nnWNw4OmZoYQKCtd MxdoTakdcjVmKa5LI39mtMbp+jK6yXIRSQMAkUwtQKBb4Go2M9DI/U7Jyou1HX+U4AK0 8CW+MyRNkAYajGaaeLg2oz2lVT2b1PsOnXhOeoIwfvs37ir3hq+eEmfrZikWoSyPLlpt gPIHVSV0SM15IaSOUL1lIF3lh929liDd7bDg0coxtczhZCpGaUtRtFNhnUSaQivU0sO1 TxPI7BAgyQLDOmUNS28A2RIPVSyoD56/mlYiXSg0DIxO19FDJO1XU4lC9EfmRmq10oDW REKw== X-Gm-Message-State: AO0yUKULJvWuIlT6eKUvjCSLdLJyvhGhequufC00M3nbwyV2S/JnzBH3 Nb+IwwLlwtVf2C8eLJe9y42wuO108JHpBg7rapE= X-Google-Smtp-Source: AK7set+HooLW1E5qLxgtS9e0xPf0o/3VQ3Dshj06Kq2NLPWurMZ0rVNFlAnOT6Vg4EqqT26YvVYwlA== X-Received: by 2002:a05:6a20:9147:b0:cc:d386:ec1b with SMTP id x7-20020a056a20914700b000ccd386ec1bmr4527116pzc.12.1677430990156; Sun, 26 Feb 2023 09:03:10 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 22/28] oeqa/selftest/resulttooltests: fix minor typo Date: Sun, 26 Feb 2023 07:02:18 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 26 Feb 2023 17:03:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177760 From: Alexis Lothoré Signed-off-by: Alexis Lothoré Signed-off-by: Richard Purdie (cherry picked from commit 80cfa56d133bd3abbb1f37272607d8e15ce70861) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/resulttooltests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/resulttooltests.py b/meta/lib/oeqa/selftest/cases/resulttooltests.py index c2e76f1a44..efdfd98af3 100644 --- a/meta/lib/oeqa/selftest/cases/resulttooltests.py +++ b/meta/lib/oeqa/selftest/cases/resulttooltests.py @@ -71,7 +71,7 @@ class ResultToolTests(OESelftestTestCase): self.assertTrue('target_result1' in results['runtime/mydistro/qemux86/image'], msg="Pair not correct:%s" % results) self.assertTrue('target_result3' in results['runtime/mydistro/qemux86-64/image'], msg="Pair not correct:%s" % results) - def test_regrresion_can_get_regression_result(self): + def test_regression_can_get_regression_result(self): base_result_data = {'result': {'test1': {'status': 'PASSED'}, 'test2': {'status': 'PASSED'}, 'test3': {'status': 'FAILED'}, From patchwork Sun Feb 26 17:02: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: 20175 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 8D325C64ED6 for ; Sun, 26 Feb 2023 17:03:16 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.69611.1677430992870919457 for ; Sun, 26 Feb 2023 09:03:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VhGboYGv; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id ky4so4431742plb.3 for ; Sun, 26 Feb 2023 09:03:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=u19ySk5mzWwdtnN97PsRUuXvNnggpXfKO+LxfPiPQk8=; b=VhGboYGvIYRV9NCBGxlVU0M3HXDyRjIoyZjp3M2hcLq/32j56FVnfESyt6wzPkmjx1 Dxvbm+X1cT3mSDeGqExBxa4P7R+JlYg+kk0TjdDnArrVuu3I2rpUbS8IZSME7YmJ7XMJ //AJCKvSF2OdRY756Myoa/R68ItpMY4+w/nfEdNkwRsWsd64GzGGteIBlr9IkD+EzEEl 4NvOfL4M108LDbnH96gbFXlmj690Fkl8rlvV/ju0nAlxrzZl4B+7xXAAFXPvUwzzOZV6 wne+v2V8UKQLSCc8T7CkkpFM+Jgwlk3lLyhWm5BE7oQYLnSXPhGSlEELeW0zI7o+2ihB TPXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=u19ySk5mzWwdtnN97PsRUuXvNnggpXfKO+LxfPiPQk8=; b=yYMPovJNYkBUWTfzHPbzjkA3gR0g8cLjI7OH65RKbAcEYd28u3X8Ieikrd6w/zDKZU 7S8SYePXDy9I4X61pz2GtTUrgg4dX6ugEEsoyojri26V3v/AztwR1hm/tYvAh1MlVVZT WojzLX4cpiSeCont59QGChaVuQE2bK+1GM8InLpNNKxmIsRL7FFAhT8fiKXh9VLNGMiM y5qCyQF3/bwLiCEVt3yqPOVFZa5jTpOX4p8FmYAYkXWtpQGj6DENGnV2pzzCdha1hjad kAmW3FrFZyoOfConROz/MUtfe/BIZ5E+7URahE+z5DSb3ont2sl7e9AiZ4sbhzMT+b+R 9G3w== X-Gm-Message-State: AO0yUKXfoqNBTeHPoh8YQnIdkcl2EGczOn3SpYoOZkZv4GGKEdz1GSO0 tQZMHDke7Q/bEdQZV7puSyJ59JfvnGb0cQhEdlQ= X-Google-Smtp-Source: AK7set+8jDz8NRF+diB1IXXCpvd5QuFro3hUoewgIu3oWo07hN8kcTGGQYcrHdSDFaMQtGP3gU24BA== X-Received: by 2002:a05:6a20:3d17:b0:cc:75b8:7cba with SMTP id y23-20020a056a203d1700b000cc75b87cbamr10717467pzi.43.1677430991890; Sun, 26 Feb 2023 09:03:11 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 23/28] lib/buildstats: handle tasks that never finished Date: Sun, 26 Feb 2023 07:02:19 -1000 Message-Id: <51e5e085400bb818d43ad82ffcf8548665bbd1d0.1677430770.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 ; Sun, 26 Feb 2023 17:03:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177761 From: Ross Burton If a task is aborted the buildstats file isn't complete, so calculate when the build finished and use that as a end time. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 23ebaec476dc46aebe5997f025661137f3e341bd) Signed-off-by: Steve Sakoman --- scripts/lib/buildstats.py | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/scripts/lib/buildstats.py b/scripts/lib/buildstats.py index 3b76286ba5..fa94c65539 100644 --- a/scripts/lib/buildstats.py +++ b/scripts/lib/buildstats.py @@ -79,8 +79,8 @@ class BSTask(dict): return self['rusage']['ru_oublock'] @classmethod - def from_file(cls, buildstat_file): - """Read buildstat text file""" + def from_file(cls, buildstat_file, fallback_end=0): + """Read buildstat text file. fallback_end is an optional end time for tasks that are not recorded as finishing.""" bs_task = cls() log.debug("Reading task buildstats from %s", buildstat_file) end_time = None @@ -108,7 +108,10 @@ class BSTask(dict): bs_task[ru_type][ru_key] = val elif key == 'Status': bs_task['status'] = val - if end_time is not None and start_time is not None: + # If the task didn't finish, fill in the fallback end time if specified + if start_time and not end_time and fallback_end: + end_time = fallback_end + if start_time and end_time: bs_task['elapsed_time'] = end_time - start_time else: raise BSError("{} looks like a invalid buildstats file".format(buildstat_file)) @@ -226,15 +229,33 @@ class BuildStats(dict): epoch = match.group('epoch') return name, epoch, version, revision + @staticmethod + def parse_top_build_stats(path): + """ + Parse the top-level build_stats file for build-wide start and duration. + """ + with open(path) as fobj: + for line in fobj.readlines(): + key, val = line.split(':', 1) + val = val.strip() + if key == 'Build Started': + start = float(val) + elif key == "Elapsed time": + elapsed = float(val.split()[0]) + return start, elapsed + @classmethod def from_dir(cls, path): """Load buildstats from a buildstats directory""" - if not os.path.isfile(os.path.join(path, 'build_stats')): + top_stats = os.path.join(path, 'build_stats') + if not os.path.isfile(top_stats): raise BSError("{} does not look like a buildstats directory".format(path)) log.debug("Reading buildstats directory %s", path) - buildstats = cls() + build_started, build_elapsed = buildstats.parse_top_build_stats(top_stats) + build_end = build_started + build_elapsed + subdirs = os.listdir(path) for dirname in subdirs: recipe_dir = os.path.join(path, dirname) @@ -244,7 +265,7 @@ class BuildStats(dict): bsrecipe = BSRecipe(name, epoch, version, revision) for task in os.listdir(recipe_dir): bsrecipe.tasks[task] = BSTask.from_file( - os.path.join(recipe_dir, task)) + os.path.join(recipe_dir, task), build_end) if name in buildstats: raise BSError("Cannot handle multiple versions of the same " "package ({})".format(name)) From patchwork Sun Feb 26 17:02: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: 20174 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 9B605C7EE31 for ; Sun, 26 Feb 2023 17:03:16 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.69611.1677430992870919457 for ; Sun, 26 Feb 2023 09:03:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1iPTTtXH; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id ky4so4431778plb.3 for ; Sun, 26 Feb 2023 09:03:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=5y3YkZzz4Q89v2UOoh0dXSVc8XDxWFEQH0UKrxRY0dU=; b=1iPTTtXHmYMquE87ce683WW5nm+IFNSifXifkXKNnUoTC8yYyyCR79i/wIhNzjbz8e eA2Zvk17h3r9LWAC4DYsKLFb4XWKmAKKzl6aVR+pJe89o7GI3ch5O6aH+xhG41N2URbF D4B1FzUDqNUD1m1EPdA4PZ1EV6hQmyYIeRhoR0/r//knpAuxQ0bIJcmmtTPephgWlcY3 aFjtm7HqjFue6ZUhXJgoRk//qCniyKxCihtBOIt/9ouGuq/ppYY1vauW2LXzqdP2y+OI g02AOtt0x9q125pp/b4iFYnr+DWodVjKMWAF7BmobkQmLrIstG7urrflOUd5JGnJkXYp EVJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5y3YkZzz4Q89v2UOoh0dXSVc8XDxWFEQH0UKrxRY0dU=; b=WUHIdnrSpXq80YLeo84QKSMBxwwyr/Z8lj9ioCqUEjOZ17ZLFxdrulWPdYXB6Ryevn szrxBk9GQi9CqM9IMgU2IKPALDfDBtCHM1PsPKR/kaM5LWdeu5sQLWSXr/9GcyK1dbLl 74usL9NWXs0rpMfviY3QgSiReFJnmtb69g+WwfZHbK9U//pWhOMikInnYgVnHXgM5+Gp a0lAD8RkM0dHhbeuVBeQ8+toWHfWJBWA3vaPVicAox3U4gNcMQtXI6w++ando7asnC2o J/BpnJxWaNko14LSgGIPU9V2WNbZilDTlIM2f1j01T8wD2BSEzCSxvYpJ0jfZQ3PBoHV /sQg== X-Gm-Message-State: AO0yUKW/lAZhZ3m65jXH6ICZ8z7zFfgYGhrzG6Y4NXsehTmwnDWkwaHb dJl2yeA29MQwIi0PdFcbosYVBjYSO2+R8vp++8s= X-Google-Smtp-Source: AK7set/Kg1STAbWbaPc+da+Gytdky22aqLpvwPzC8mZsaayvcPbCW+itlpV4v/fTuCNQ8tAsJliNHw== X-Received: by 2002:a05:6a20:6918:b0:cb:77f0:9a42 with SMTP id q24-20020a056a20691800b000cb77f09a42mr23951400pzj.33.1677430993667; Sun, 26 Feb 2023 09:03:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 24/28] cml1: remove redundant addtask Date: Sun, 26 Feb 2023 07:02:20 -1000 Message-Id: <70051189bb4ecae5475ce45eabe37113f417257e.1677430770.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 ; Sun, 26 Feb 2023 17:03:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177762 From: Ross Burton The configure task is added by base.bbclass, no need to do it again. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 2d7897bcab2b70d850bfe02ded42b20eb695eda8) Signed-off-by: Steve Sakoman --- meta/classes-recipe/cml1.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index b79091383d..a09a042c3f 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass @@ -21,7 +21,6 @@ cml1_do_configure() { } EXPORT_FUNCTIONS do_configure -addtask configure after do_unpack do_patch before do_compile inherit terminal From patchwork Sun Feb 26 17:02:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20178 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 8FFE6C7EE2F for ; Sun, 26 Feb 2023 17:03:26 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web10.69602.1677430996415882355 for ; Sun, 26 Feb 2023 09:03:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=v5bbtWl6; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id q31-20020a17090a17a200b0023750b69614so3929653pja.5 for ; Sun, 26 Feb 2023 09:03:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=zGVPAFslKce1mmHU22HZnMAebg7iZ6DFK2u+uAccm18=; b=v5bbtWl6aqXsGDbCgPi8v3KNcEAapw8EqkEOptEtunYrKVS2xNjmxHeHjWFsXLbbXr 8VOoyzI+NL63YWcRaG/P6gJgYX1QR16SF+E1bRdpHdubW1zGfcAYGMU84vw47LgPoiAb LN5sdfLuZtll5CaXZqBOq5JrNgIo6g1qdfNFeGp42Ifb1m1ucqF2As8g0wjTZ4YKIez8 mU5g1nMS2NUHryt60wfOBOLgoyx++GZADkb987XevA6R3Ax8wGXU8OKhMpn1QPIjVg1o 5oC4E/91C/xSKt2lJ8ySGbLpWFBJuEpiE61nDVrjm/3HGjaDQSL1nmTCEs0kQhJF4NZW PlIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=zGVPAFslKce1mmHU22HZnMAebg7iZ6DFK2u+uAccm18=; b=a3zLGPB5ofSpoiNvx1CtkKJhT7TgmPPYgDdyI6adZHHnNGf/IN78jfKG1khUwL8sKd lEsthzmKT301ABZcq7tAfUsID+ENHeB6UhbEFd7qIvLRXJ/2ph4+lERVQLfcjBesiPnf Hw4gjOebuVgDPTkJMTDyizrOVjgcFbjnO/jKgDXlcS7A5rlNa+qAqag0YoXsVOvjBFvW fmkxB2uKRqhQC35H1v6ZvwtBVZQz4/h7m3/XCIDXLsjgEC6DVz5+cRAyvUErYB0qV7Aa cLAwyf+msfCba6B0YEww/UFL7gTZIJQUNseHMo2yJq76l/um3oSovoOABGhK9yRweyHn J38A== X-Gm-Message-State: AO0yUKUnYHXeS4k6nbBcZLcT7Na8FcV2C4iBn0mXYBX+RAyxVBvOcjWG cJNGel9f3d0VfvKyvAgfpHBXym3I6fFyDj4ETwc= X-Google-Smtp-Source: AK7set+QWDJJuE/8L7n9TW1Yc6Cc8w1HdSLhtEzMdYUlCMpNt4MCe75yA3/q6QSBNNYvTQ1ZbFKg1Q== X-Received: by 2002:a17:90b:164f:b0:237:ad8e:e3b1 with SMTP id il15-20020a17090b164f00b00237ad8ee3b1mr7704801pjb.8.1677430995504; Sun, 26 Feb 2023 09:03:15 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 25/28] kernel-yocto: fix kernel-meta data detection Date: Sun, 26 Feb 2023 07:02: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 ; Sun, 26 Feb 2023 17:03:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177763 From: Ulrich Ölmann Fixes: 7ef7af5c03ba ("kernel-yocto: restore kernel-meta data detection for SRC_URI elements") Signed-off-by: Ulrich Ölmann Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c77754f23e3fb49a62602a6c6a04d5525d1cf457) Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index 1a6695ba7e..7de99cff56 100644 --- a/meta/classes-recipe/kernel-yocto.bbclass +++ b/meta/classes-recipe/kernel-yocto.bbclass @@ -212,7 +212,7 @@ do_kernel_metadata() { # SRC_URI. If they were supplied, we convert them into include directives # for the update part of the process for f in ${feat_dirs}; do - if [ -d "${WORKDIR}/$f/meta" ]; then + if [ -d "${WORKDIR}/$f/kernel-meta" ]; then includes="$includes -I${WORKDIR}/$f/kernel-meta" elif [ -d "${WORKDIR}/../oe-local-files/$f" ]; then includes="$includes -I${WORKDIR}/../oe-local-files/$f" From patchwork Sun Feb 26 17:02: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: 20181 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 8A109C64ED6 for ; Sun, 26 Feb 2023 17:03:26 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.69587.1677430956817460407 for ; Sun, 26 Feb 2023 09:03:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=DspKfX7s; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id nw10-20020a17090b254a00b00233d7314c1cso7733487pjb.5 for ; Sun, 26 Feb 2023 09:03:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=/OBXEO7V1nmKdV5zTFuJDeUaLqwk57LZzu4mfq8YEqM=; b=DspKfX7so0VC3vNXOjV3tcBmEKQcSNpUPzYLZhpwBTk2xYJ3MusLrIDkrg97KV54J+ IQDq10Q85OG9nI58xT2JB0LB9NNPPYrFzevZxDBISdfj43cse5WFt42xIFTR5Li7x3S9 +ZrEZ3f3Bi6VL6bYkRU8MzJlmhvHPlKd/6ufpmT7g4Wld/hHef+95q8+qmoJiyJqxS/s idDcxqTKgUJGU2nfPlHKT0nZ6NMPJbfWOHrhImUKFBaC7yzyojmjVX2N3Of4YiKf8UCs V2t8gzgoB7dIg+Wd9hkYE5uorv1FeVwkCWaidfuumYscEL9nKeXH5m058eIwkMyQv7nn unJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=/OBXEO7V1nmKdV5zTFuJDeUaLqwk57LZzu4mfq8YEqM=; b=RbidL3ACyrKsD3PPVSCy5FT33bfJsPAzuDbCJv7tSw+W2wRKx9cNA/sM07cRJiDxyM pRKjSX0qDjUHc50tVzlATfNYFKnGxS9PkGONYnhLn6DPmVMKGEaNTizU+MsuKe7ejnOp zjzqqC2BZIG/t2J/ObhZVejUTcebGyFx6jUX+5Se4dMjLehdrjzV+fBSpNjEBbMhvS+7 oAUBocIFwS/2KUYlUbVoq/TgRRRO/0QuwqbBCEbS/QI2CefNcjP3U1kd/kuvcWoKPQOU on9mDc9KS7cMAu59kNd8CvEMKxm7eQCnFXiVZc6xs5tAxKykJlsDWEPVRDOaMQ3c9Kba wuvw== X-Gm-Message-State: AO0yUKVRQdVK1L/NtAkA+xo/Qc2tjsgIO+gGP4Ye+n/FNrZUoHLIX9SR ISxlUt9IoP9XJvxuNrEbQqaI96bMT4rQlHyLJok= X-Google-Smtp-Source: AK7set8r/I4zuYH58vYEuGsZ7Fjfjx1Nqwf99b1ehsU2COGxB8XIg0bKdJ6Fr/HUM6zRo5cWNepbFw== X-Received: by 2002:a17:90b:2243:b0:233:c758:9a1c with SMTP id hk3-20020a17090b224300b00233c7589a1cmr22029911pjb.12.1677430997477; Sun, 26 Feb 2023 09:03:17 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 26/28] libseccomp: fix for the ptest result format Date: Sun, 26 Feb 2023 07:02:22 -1000 Message-Id: <13a567a0bf191e9ad82ed93180d4b21bb2c5875a.1677430770.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 ; Sun, 26 Feb 2023 17:03:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177764 From: Narpat Mali The output of libseccomp ptest should follow a unified format as per this https://wiki.yoctoproject.org/wiki/Ptest Replaced the test results SUCCESS, FAILURE & SKIPPPED with PASS, FAIL & SKIP and printing the ptest result with the below format result: testname Signed-off-by: Narpat Mali Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 30d025a8641cfcce5412b5f021478777620b55f1) Signed-off-by: Steve Sakoman --- meta/recipes-support/libseccomp/files/run-ptest | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/libseccomp/files/run-ptest b/meta/recipes-support/libseccomp/files/run-ptest index 54b4a63cd2..63c79f09c4 100644 --- a/meta/recipes-support/libseccomp/files/run-ptest +++ b/meta/recipes-support/libseccomp/files/run-ptest @@ -1,4 +1,7 @@ #!/bin/sh cd tests +sed -i 's/SUCCESS/PASS/g; s/FAILURE/FAIL/g; s/SKIPPED/SKIP/g' regression +sed -i 's/"Test %s result: %s\\n" "$1" "$2"/"%s: %s\\n" "$2" "$1"/g' regression +sed -i 's/"Test %s result: %s %s\\n" "$1" "$2" "$3"/"%s: %s %s\\n" "$2" "$1" "$3"/g' regression ./regression -a From patchwork Sun Feb 26 17:02: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: 20180 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 9771BC6FA8E for ; Sun, 26 Feb 2023 17:03:26 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.69614.1677431000391315377 for ; Sun, 26 Feb 2023 09:03:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=U2f/EvTv; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id y2so3795476pjg.3 for ; Sun, 26 Feb 2023 09:03:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=x71DFzhhSm4+JuGsgdS0QsmScltUHu+REDnOgwQsvys=; b=U2f/EvTvh98NZVzHAfp8C9iTNs7hD5iu3QjqZTlXq7XhDeSu3giEmDXDcUajw7rHb7 OQruduQJP91tPiIN2sqg0ctVfQBFYeYdqp8S3YJK1R3fV/9xuY36ClT834gH3WHV/K4D iEs2iwAFwxbGY9sW/Kl0v+g2ixkXkl2VDJAjGSdBbk4DERxbt0zDEHpcmmpQl0EeFIrY Gqs0l5U+GIM5xnJHQ52t2PmDVh2BR+N3iOXSLdwh2P7JCI1jIsO6dGK8IjHV38zDWjSf qsjfZRt3fpMIRyYhrujTeSKAPcaI9gnYKrtT2zoMNYsonwh1d95H7Vzajz4rKP7tN/SY FXiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=x71DFzhhSm4+JuGsgdS0QsmScltUHu+REDnOgwQsvys=; b=QfwGwUl5cQGX91vfURIF90ZTn28QcJbTcXu19Q3Lz1f++/2u2UBWkHsHZbOP9uYEO/ rCI4o1xbN6Hsas+8BAySAwl1K0IKJk6rAkXH7gWLRBdPrQMF7vpcHjRznKG3qzq7chi0 I4MAuf5WcHUSlau9RmpggKPYDoNXTDxNkkhUAwZVOI1ZD6iJ6SArDvnL4ggmuKocQVjq G+A+xppRES0nHYPKBaltqTmm/jjuzfM/aL0c68z2b3F+YL3N+/S57PJF76BKZzPRRx4D dZ+7bSzkeMZkl9tzlsql3yECBg+QTnBWarnkHUxdpSAYfBtt7TWlTYezg8pNGf4TbJsa 6mMA== X-Gm-Message-State: AO0yUKUVRylzuv4Xc+9tx+iBuiSuSfYUbNnPMeg6LfvpT92xSD/rtq9i NCcK7z++/VZ38CyYgoSjM3eEr1jOzGxN9ci3VK4= X-Google-Smtp-Source: AK7set80vcacAxba/GhFtoZkhHiNO6/wCY88JV/S8bZV+BltBErCe6A8R5uuIbckLXa3yP6jxfpYaA== X-Received: by 2002:a17:90b:4a06:b0:234:1a60:a6b0 with SMTP id kk6-20020a17090b4a0600b002341a60a6b0mr23206453pjb.34.1677430999354; Sun, 26 Feb 2023 09:03:19 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 27/28] oeqa ssh.py: fix hangs in run() Date: Sun, 26 Feb 2023 07:02:23 -1000 Message-Id: <3e1a4d572922eadc85ff6ac169722ad7ab118cf4.1677430770.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 ; Sun, 26 Feb 2023 17:03:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177765 From: Mikko Rapeli When qemu machine hangs, the ssh commands done by tests are not timing out. do_testimage() task has last logs like this: DEBUG: time: 1673531086.3155053, endtime: 1673531686.315502 The test process is stuck for hours, or for ever if the executing command or test case did not set a timeout correctly. The default 300 second timeout is not working when target hangs. Note that timeout is really a "inactive timeout" since data returned by the process will reset the timeout. Make the process stdout non-blocking so read() will always return right away using os.set_blocking() available in python 3.5 and later. Then change from python codec reader to plain read() and make the ssh subprocess stdout non-blocking. Even with select() making sure the file had input to be read, the codec reader was trying to find more stuff and blocking for ever when process hangs. While at it, add a small timeout to read data in larger chunks if possible. This avoids reading data one or few characters at a time and makes the debug logs more readable. close() the stdout file in all cases after read loop is complete. Then make sure to wait or kill the ssh subprocess in all cases. Just reading the output stream and receiving EOF there does not mean that the process exited, and wait() needs a timeout if the process is hanging. In the end kill the process and return the return value and captured output utf-8 encoded, just like before these changes. This fixes ssh run() related deadlocks when a qemu target hangs completely. Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni (cherry picked from commit 9c63970fce3a3d6029745252a6ec2bf9b9da862d) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/core/target/ssh.py | 39 ++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 48a463861d..4ab0cddb43 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -226,27 +226,33 @@ def SSHCall(command, logger, timeout=None, **opts): def run(): nonlocal output nonlocal process + output_raw = b'' starttime = time.time() process = subprocess.Popen(command, **options) if timeout: endtime = starttime + timeout eof = False + os.set_blocking(process.stdout.fileno(), False) while time.time() < endtime and not eof: - logger.debug('time: %s, endtime: %s' % (time.time(), endtime)) try: + logger.debug('Waiting for process output: time: %s, endtime: %s' % (time.time(), endtime)) if select.select([process.stdout], [], [], 5)[0] != []: - reader = codecs.getreader('utf-8')(process.stdout, 'ignore') - data = reader.read(1024, 4096) + # wait a bit for more data, tries to avoid reading single characters + time.sleep(0.2) + data = process.stdout.read() if not data: - process.stdout.close() eof = True else: - output += data - logger.debug('Partial data from SSH call:\n%s' % data) + output_raw += data + # ignore errors to capture as much as possible + logger.debug('Partial data from SSH call:\n%s' % data.decode('utf-8', errors='ignore')) endtime = time.time() + timeout except InterruptedError: + logger.debug('InterruptedError') continue + process.stdout.close() + # process hasn't returned yet if not eof: process.terminate() @@ -254,6 +260,7 @@ def SSHCall(command, logger, timeout=None, **opts): try: process.kill() except OSError: + logger.debug('OSError when killing process') pass endtime = time.time() - starttime lastline = ("\nProcess killed - no output for %d seconds. Total" @@ -262,8 +269,21 @@ def SSHCall(command, logger, timeout=None, **opts): output += lastline else: - output = process.communicate()[0].decode('utf-8', errors='ignore') - logger.debug('Data from SSH call:\n%s' % output.rstrip()) + output_raw = process.communicate()[0] + + output = output_raw.decode('utf-8', errors='ignore') + logger.debug('Data from SSH call:\n%s' % output.rstrip()) + + # timout or not, make sure process exits and is not hanging + if process.returncode == None: + try: + process.wait(timeout=5) + except TimeoutExpired: + try: + process.kill() + except OSError: + logger.debug('OSError') + pass options = { "stdout": subprocess.PIPE, @@ -292,4 +312,5 @@ def SSHCall(command, logger, timeout=None, **opts): process.kill() logger.debug('Something went wrong, killing SSH process') raise - return (process.wait(), output.rstrip()) + + return (process.returncode, output.rstrip()) From patchwork Sun Feb 26 17:02: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: 20179 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 8FC72C7EE2E for ; Sun, 26 Feb 2023 17:03:26 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.69608.1677431002139547200 for ; Sun, 26 Feb 2023 09:03:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lGQXtwls; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id qa18-20020a17090b4fd200b0023750b675f5so7736000pjb.3 for ; Sun, 26 Feb 2023 09:03:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=HYs3cfhwdNSUM+kzk4NAdYRnvFCQItvQOocSeYYJv3k=; b=lGQXtwlshRRIEdTkHADyqLhqKOMfDoK2x60g86xxB3Pu5dLi0u1FpALlRkIlHqdkz1 ribCFXNYGKSCo69aVzVlfBv7+lKqutpM6ktYL2E3ypIho9jvutCleTLXS8l810epttvz LVxUPbUjq1xOoK7yMJ1uiqcbLxyDNyYyTixbprWH3jx4O6CwjX0zdFhQ34STe3KfoTj5 /NEizeITqyoQYK4hx4M2QBQBOfdyYfzX6nWpbxVc4qyR7DhT6kXRZKpbCs3cL+eAPc6t hD/3nuQAlKGwxGu5j1yjweWGR4W/ejnSxolf+KAtV1xjXCARDrsfO03p2xrAtGxp3hpt +7Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=HYs3cfhwdNSUM+kzk4NAdYRnvFCQItvQOocSeYYJv3k=; b=0DSc2z5jrOOvmxytuMW80ij6l1eQw2xJv+mKwpmMVaQXDJ5GOIvusGJ+6XhwIAcHab keNcddxd/rJVTyi3J0d8KfIifMDMnHwSAWrB1fqaZXxCHMSRfUePJg8EYklAwijIblsT GfzEY0N4NqWWdtgj3KUPKdwkkK2YVr7xU1ll0FKtQ0dQdZ/YP5KC1Dc6jWWj3BRzDNTT az/jwZrZUYuGzgBUM9CTfc8D2mXd8efimrM1sx8/zLeUpiFJ1c7lnMPRnnTQCTTsySSp 3S2t0Ztgxa8Ew+nIF/BDQPRGTwkNtWiNk2wb+EvIWHAisSgWTxE7h8afQ/6f2xw/nc1Q tglg== X-Gm-Message-State: AO0yUKXinrINpMX1AqDlHFATqU1l3ajCaCtrMPGle3lXQGLsLeLPcqEk VPyhpRVfJJiaLs72OMZE7ndzETa7x8jPfOgS+KM= X-Google-Smtp-Source: AK7set8Fnfyas1YLq7B3lzDQB2OhetTUtFkpwGpzdNuSZjIQXqKLHxKAzE+27wzchxYYGK23Xb/FVA== X-Received: by 2002:a17:90b:1d82:b0:232:cdb6:c4ad with SMTP id pf2-20020a17090b1d8200b00232cdb6c4admr22826610pjb.0.1677431001123; Sun, 26 Feb 2023 09:03:21 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id s25-20020a63af59000000b004f1cb6ffe81sm2500856pgo.64.2023.02.26.09.03.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 09:03:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 28/28] runqemu: kill qemu if it hangs Date: Sun, 26 Feb 2023 07:02:24 -1000 Message-Id: <9047a07bc8a8c440cb30c6bb49710362eae41330.1677430770.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 ; Sun, 26 Feb 2023 17:03:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177766 From: Mikko Rapeli qemu doesn't always behave well and can hang too. kill it with force if it was still alive. Move clean up commands into cleanup() function. Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni (cherry picked from commit 079c2935d2f585ce49e1c7daab2155fcf0094c48) Signed-off-by: Steve Sakoman --- scripts/runqemu | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index a6ea578564..db35d83fa9 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -211,7 +211,7 @@ class BaseConfig(object): self.mac_slirp = "52:54:00:12:35:" # pid of the actual qemu process self.qemu_environ = os.environ.copy() - self.qemupid = None + self.qemuprocess = None # avoid cleanup twice self.cleaned = False # Files to cleanup after run @@ -1517,7 +1517,7 @@ class BaseConfig(object): for descriptor in self.portlocks.values(): pass_fds.append(descriptor.fileno()) process = subprocess.Popen(cmds, stderr=subprocess.PIPE, pass_fds=pass_fds, env=self.qemu_environ) - self.qemupid = process.pid + self.qemuprocess = process retcode = process.wait() if retcode: if retcode == -signal.SIGTERM: @@ -1533,6 +1533,15 @@ class BaseConfig(object): signal.signal(signal.SIGTERM, signal.SIG_IGN) logger.info("Cleaning up") + + if self.qemuprocess: + try: + # give it some time to shut down, ignore return values and output + self.qemuprocess.send_signal(signal.SIGTERM) + self.qemuprocess.communicate(timeout=5) + except subprocess.TimeoutExpired: + self.qemuprocess.kill() + with open('/proc/uptime', 'r') as f: uptime_seconds = f.readline().split()[0] logger.info('Host uptime: %s\n' % uptime_seconds) @@ -1560,6 +1569,9 @@ class BaseConfig(object): else: shutil.rmtree(ent) + # Deliberately ignore the return code of 'tput smam'. + subprocess.call(["tput", "smam"]) + self.cleaned = True def run_bitbake_env(self, mach=None): @@ -1636,12 +1648,8 @@ def main(): subprocess.check_call([renice, str(os.getpid())]) def sigterm_handler(signum, frame): - logger.info("SIGTERM received") - if config.qemupid: - os.kill(config.qemupid, signal.SIGTERM) + logger.info("Received signal: %s" % (signum)) config.cleanup() - # Deliberately ignore the return code of 'tput smam'. - subprocess.call(["tput", "smam"]) signal.signal(signal.SIGTERM, sigterm_handler) config.check_args() @@ -1663,8 +1671,6 @@ def main(): return 1 finally: config.cleanup() - # Deliberately ignore the return code of 'tput smam'. - subprocess.call(["tput", "smam"]) if __name__ == "__main__": sys.exit(main())