From patchwork Thu Jun 2 16:51:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8757 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 E0886C43334 for ; Thu, 2 Jun 2022 16:52:23 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.1535.1654188734778043074 for ; Thu, 02 Jun 2022 09:52:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CBQ/98vh; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id 187so5216296pfu.9 for ; Thu, 02 Jun 2022 09:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8qLkB4PvB4cnE0zDr7JJ479THCsAg8dgwn5URAe7hwM=; b=CBQ/98vh6GEDTJkWzsG9dLELLO8tpjE3IoxPabE8zfDY6r5z0MGALnbmCRG62DovPx olVPEeHG6xLEKDO667cL9FrJFXCPSprwFPO424cTuqtiFbJYxs4tjL1XfC3H9nuWHa3I Nj9Xat6Wgf2ma4CwvAFbOhM5fdbVCsAU+tZ+6YjIEJCs2YUFL+/MCXM4U1zmc4jFCRWw zP86dJ1qeqYA36OCJtDySjYnOlfwvlEa/gTtoNudEzHEXhy10ilcvayd9cFPa55c3hbb ACeoeKwQZZMz5sMDnS7ttdgvhmZPv8xrSPceqmuJUN4n6mJPtVboENOUbp/bOxGI+XBh bIyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8qLkB4PvB4cnE0zDr7JJ479THCsAg8dgwn5URAe7hwM=; b=EAUgRMM+F6yTfRiniGWC8cZwEbj91P5Qmp1z0Oe5hQUXnFQHPhGkSkr9o1liWaJjlI 1kITF0LXlJsu60FobxTPrdqegjAmQK9cBqU2580Sk/dWTPL7/R66HFlgl+GLO/nl+oAw bUgaMJ+iR0CFhFbPFTW9rD5IZK+vnmxDSlPBvFDTLoBRjYatUv7OZYmfR/qqVFBOtEyA /H4YvRvBMnnpAmDoQya8AiDv49mtmfbtmePYdGSSOfSAaFjWY05coxibMDJYsUs9urwm E8rEDu214tkcQ1X/SsYJ7Nk9041dZj7FcXjbyl7WRYd+zAVUmeHaACZyx39NcML01du/ CmSQ== X-Gm-Message-State: AOAM530rUGBvH2WzmYHSHOfslRpq1ZEBWB8+NyPBfCA5JJbccRw1TO+S lgsUXbr3YYlD/UldR0Mf8kNRxKH8isgvVo9k X-Google-Smtp-Source: ABdhPJyJWWFXskcA+GGznpz7ll7GSBh4/a9evZ9uq+coG5Cfw0cKMXeQ5rJBIHjXmT4+ibdgeWFdwA== X-Received: by 2002:a65:5886:0:b0:3fb:a6ea:b741 with SMTP id d6-20020a655886000000b003fba6eab741mr4937429pgu.502.1654188733608; Thu, 02 Jun 2022 09:52:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/26] vim: Upgrade 8.2.4912 -> 8.2.5034 to fix 9 CVEs Date: Thu, 2 Jun 2022 06:51:33 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166478 From: Richard Purdie Address CVE-2022-1621, CVE-2022-1629, CVE-2022-1674, CVE-2022-1733, CVE-2022-1735 CVE-2022-1769, CVE-2022-1771, CVE-2022-1785, CVE-2022-1796 Signed-off-by: Richard Purdie (cherry picked from commit fafce97bd440150ac5c586b53b887ee70a5b66bd) 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 c5922b7fcd..b22e8016ab 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".4912" -SRCREV = "a7583c42cd6b64fd276a5d7bb0db5ce7bfafa730" +PV .= ".5034" +SRCREV = "5a6ec10cc80ab02eeff644ab19b82312630ea855" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Thu Jun 2 16:51:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8756 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 E7024CCA47A for ; Thu, 2 Jun 2022 16:52:23 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web08.1495.1654188737673130248 for ; Thu, 02 Jun 2022 09:52:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=J90tqtOo; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id u18so4993748plb.3 for ; Thu, 02 Jun 2022 09:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qf4rcbrJUdD39vLOE3SO0se0ION5yXH8zoN9IayrSkA=; b=J90tqtOouspmzDIujl2YCmLgMjJSRVIB7cs0i2opP27DSRki7l3DwbmP3Ez8JPv50H jIVWSyKFJ51wBfJz0I/qcNgk+KRrc7o+sSLbIsKX0IVn5sUSrQd3eFGXZv9LL1KmLON5 Fc8/80N68RM2wt5OtRvUH8QVpkhTt8FJuuNIlYPbWTUez0kl5VVHVoJHgfyfyDloYrzd VWMWxT3yJGVB+IqCsDEDDZ7vfNS7Yvzj2VM19+I462JQY0Utrg450PuwdyyYKPhQiWVI YggYlOG+Oprf6bnGEaNvALtIWVE/YO/pG4eXp6joBcchwRIBeXKsAA0KFuFTOS8Rmw7X KJpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qf4rcbrJUdD39vLOE3SO0se0ION5yXH8zoN9IayrSkA=; b=rVKLCjyhlvlRegjLddlc67Ley1QxsmrTHVKUTIFyqen+XZ+e5wQ77yHSIrbUBA040r LeMwpegHfgY0WQCMOTkr2+ttYnSx2jiIDtdMmxjTejubTHgBgwHqMa+83SRepABvxLyB 5uCPoD77uVnrDet78TZf4p5itgr2xhGp2hQW43wV+UgXEeVEuclJvzHqIWyVx/xK6e75 aIQ5Hw+cv1j6niG2vC/syOIYT8+r9BoyfIGFtxz5pizytCBLpTbgTOe5uU4/PNEwz7NJ 3iZUdC0gx2sMGuBdfmMKEn0nZhzaq/EzmA0h5NvL/Ubej8xLlbRUtUGs5h11LFyeidIO bM0Q== X-Gm-Message-State: AOAM532pXoRPv91hFLafRMmV58erpgDL4ihpHqK47w5hegNLaHCq3PQc q6ErMTRanMEEAwHqNzzoyXcPiur35dP3WGWR X-Google-Smtp-Source: ABdhPJzkhiYd4wArMf8Gvo6PSD8BQsN++056htFcrySH8Pg7Cur5idv1teyRfdyfKek48uiZ/L5LoA== X-Received: by 2002:a17:90a:780d:b0:1df:959:235a with SMTP id w13-20020a17090a780d00b001df0959235amr6272930pjk.92.1654188736470; Thu, 02 Jun 2022 09:52:16 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/26] tiff: Add jbig PACKAGECONFIG and clarify CVE-2022-1210 Date: Thu, 2 Jun 2022 06:51:34 -1000 Message-Id: <95f1c5d0bb7bc7cae2715d0c9b569fa369a64575.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166479 From: Richard Purdie We never depended upon libjbig so this was never present. Add the PACKAGECONFIG to make this explict. CVE-2022-1210 is an issue in libjbig so we don't have a problem there, mark as such. Signed-off-by: Richard Purdie (cherry picked from commit 34e6a19f2430ee2fd0fec4bec1891e898a0d9766) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/libtiff/tiff_4.3.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb index c5e964ec8c..7a5e4816a6 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb @@ -32,6 +32,9 @@ CVE_CHECK_IGNORE += "CVE-2015-7313" # caused by 3079627e and fixed by b4e79bfa. CVE_CHECK_IGNORE += "CVE-2022-1622 CVE-2022-1623" +# Issue is in jbig which we don't enable +CVE_CHECK_IGNORE += "CVE-2022-1210" + inherit autotools multilib_header CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no" @@ -40,6 +43,7 @@ PACKAGECONFIG ?= "cxx jpeg zlib lzma \ strip-chopping extrasample-as-alpha check-ycbcr-subsampling" PACKAGECONFIG[cxx] = "--enable-cxx,--disable-cxx,," +PACKAGECONFIG[jbig] = "--enable-jbig,--disable-jbig,jbig," PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg," PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz," From patchwork Thu Jun 2 16:51:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8755 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 DA1A0CCA478 for ; Thu, 2 Jun 2022 16:52:23 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web09.1516.1654188740346702782 for ; Thu, 02 Jun 2022 09:52:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=IvxKkB1C; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id e11so5220085pfj.5 for ; Thu, 02 Jun 2022 09:52:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nlNnEJDPJeQ4+5kxOXAkyprb6MSAAEWdZfk4l6FOxLw=; b=IvxKkB1ChDYc73chhn1SvmQ8S4aXQItp5ar1e/a0g13z+y98XsM00MZQ/q3OjP/PFf ZzMUTnwCLwxlxXp9yR/0bc/0puzrqEkw0FCZgU5850B2BvusVWsQuihi3AWSiJNmeT1H gy/C0jgnVJ53Oa+c21IW+aXwpDd7yBQPjjJ41jugCJ0nP+z+F+X5tVi+UO0EqUbfJWd/ EXA4R4hnlckKjQaiTKA3DVI4g7NKMKhYmC/3C1OOpeXkjq0PRUHpN/XxwItWNyuPjKIV 4oZUr5UMdMJCewAUFAfFLVSGxzR0c+4Qx1W9T/eA7qZyB7psJC5lEEoH4fxSCa+OQOcW xrtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nlNnEJDPJeQ4+5kxOXAkyprb6MSAAEWdZfk4l6FOxLw=; b=T/JQDj3VVkUXCx4W3xAXpvDJx0H6MwSVYeovbLD2CxJ5W0I80Vr9C/mDetIifq6Gla /P3c9dXaEW0KMGOWcWCtQc0duMG36rgJERl/USV067a/o3GEW0mwnpY7s7W2rwCpiCdo fMscuHfIA9V1P1RwVnynoJ6uREffHdIaYur7K/UCFmFQb+aOOvTBKuH30E8dcG8aIIZI kPA8hpWPwr+xnB+9QrRjBkWmwnpjvXxsKc9M0XI0bQTwEj8+F3AguFrdOmTgtPIo9p9u Cj1ySqP4FVU4gw5XQ+y4EhdkT1j4cAvuxpC9QkV7g353XnRr1FHdMoHA5bJN1ogN1N7K 98jw== X-Gm-Message-State: AOAM532M3rE34J4G8Bgr3mv3eGJ9tVyI06+EFPU9MbSErnadncBKHCe3 iu0PcUlVE3777msPYosCOIq7YJjz+sypZN1L X-Google-Smtp-Source: ABdhPJw+ta4P0jjHRXypi9lQe1mX2GY5apqsEUH3ecIRv06CgHE4wXlYIy7kMFvG8jWLvUpCJ0nW5w== X-Received: by 2002:a63:1950:0:b0:3fc:652b:f8c9 with SMTP id 16-20020a631950000000b003fc652bf8c9mr5010486pgz.339.1654188739149; Thu, 02 Jun 2022 09:52:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/26] libxslt: Mark CVE-2022-29824 as not applying Date: Thu, 2 Jun 2022 06:51:35 -1000 Message-Id: <82f4186ec0b16d4c1d9a8612fc3b6c6701fee8ea.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166480 From: Richard Purdie We have libxml2 2.9.14 and we don't link statically against libxml2 anyway so the CVE doesn't apply to libxslt. Signed-off-by: Richard Purdie (cherry picked from commit c6315d8a2a1429a0fb7563b1d6352ceee7bc222c) Signed-off-by: Steve Sakoman --- meta/recipes-support/libxslt/libxslt_1.1.35.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.35.bb b/meta/recipes-support/libxslt/libxslt_1.1.35.bb index 51cfb2e281..2fd777766c 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.35.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.35.bb @@ -19,6 +19,10 @@ SRC_URI[sha256sum] = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f UPSTREAM_CHECK_REGEX = "libxslt-(?P\d+(\.\d+)+)\.tar" +# We have libxml2 2.9.14 and we don't link statically with it anyway +# so this isn't an issue. +CVE_CHECK_IGNORE += "CVE-2022-29824" + S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" From patchwork Thu Jun 2 16:51:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8758 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 E136DCCA47B for ; Thu, 2 Jun 2022 16:52:23 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web08.1499.1654188742491317921 for ; Thu, 02 Jun 2022 09:52:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=UvFoaaTH; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id s68so5220814pgs.10 for ; Thu, 02 Jun 2022 09:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uHnin0zXy0F+oqyNuMi8v+trMASG+hPMoAOgTk19x+g=; b=UvFoaaTHnRT2M/sIvh16sjqxKG2T0I6fb8jta4vWPkMTDakfoOH9TbJRn/U+i+LNaP qo8M0GjLYzycmsJW3MCkh7f6sa2pXSEfw8p72CqApM4Kaz4X1zhU2wvxj4dsqIAnQU6G fVMqoHVwHNFbZQzvK8kDa3LTdzE1lIebeohnEkRFsZ1ujw4FaAvwwPan4M+WrRD5/x6i riyYAmSTAgvsq/09u/FD/64Oso/9u6fGjdhJ9LYdSkL4+YTlBfOgDwIhJAqimdYqoVNr 3XWwMOSD4c8a+z9L6JuA+CdG+ySLd8o2v64Ct7nVruoGFrbH+tVaormSCT76q4ml0QCH h1VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uHnin0zXy0F+oqyNuMi8v+trMASG+hPMoAOgTk19x+g=; b=03/YdCJ1ewhGbp93TmCwirBh7m9ZyHw0Zs+1losVt7UfiXJ6zuK1RHj/7+ESvlLCmg 9+yRHsIPax16HOtzfglfa9zoDlzZ/rGpeHeRrIrRceZxQED0oK6xjAA08cD8tE8POT1e 8HMplTvcGmZI+4ph5nCQNMjxNUfxCNK8eyUOYVjRcusz+m6y8yImMaD/9OI3j6PQDQzI K8kKvayK6vd3MKIOdvQ+xUgHd58LxaVMAYf7FAuI3PfjhrITX8PiOOLjfJmVwOvE3+rk AxncQ5l6xUGuu40t42TExyvAmmLoK7y8Qem8UsB5gMvd5T9s1lui8KkyQiuZcNloGEgl j4Bg== X-Gm-Message-State: AOAM533Zl7WfF+g+tbSvmHS/D3XSCOvZHRsPtzSzarzhj00QGVyDBr8h I6FRELZDznKtuwE+bLBvjHMhPakiGgrxhWuQ X-Google-Smtp-Source: ABdhPJyR/Qbn/q2xYujlgvffW8zCQQsrtbilvRKmdyk1psGe1D8gs3rxQIjeSL9B3z3t6HlJPTa+Vg== X-Received: by 2002:a63:d813:0:b0:3f5:f9d8:7cce with SMTP id b19-20020a63d813000000b003f5f9d87ccemr5074664pgh.585.1654188741252; Thu, 02 Jun 2022 09:52:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/26] cve-check.bbclass: Added do_populate_sdk[recrdeptask]. Date: Thu, 2 Jun 2022 06:51:36 -1000 Message-Id: <637d6ff44bc17565edae5466addbbe251f0cdadc.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166481 From: leimaohui As product, sdk should do cve check as well as rootfs. Signed-off-by: Lei Maohui Signed-off-by: Luca Ceresoli (cherry picked from commit cc17753935c5f9e08aaa6c5886f059303147c07b) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 7cd98ae462..3729d9cba8 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -218,6 +218,7 @@ python cve_check_write_rootfs_manifest () { ROOTFS_POSTPROCESS_COMMAND:prepend = "${@'cve_check_write_rootfs_manifest; ' if d.getVar('CVE_CHECK_CREATE_MANIFEST') == '1' else ''}" do_rootfs[recrdeptask] += "${@'do_cve_check' if d.getVar('CVE_CHECK_CREATE_MANIFEST') == '1' else ''}" +do_populate_sdk[recrdeptask] += "${@'do_cve_check' if d.getVar('CVE_CHECK_CREATE_MANIFEST') == '1' else ''}" def check_cves(d, patched_cves): """ From patchwork Thu Jun 2 16:51:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14244 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 05/26] cve-check: Add helper for symlink handling Date: Thu, 2 Jun 2022 06:51:37 -1000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Ernst Sjöstrand Signed-off-by: Ernst Sjöstrand Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 5046d54df2c3057be2afa4143a2833183fca0d67) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 3729d9cba8..0ab7ec7ae6 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -79,6 +79,12 @@ CVE_CHECK_LAYER_INCLUDELIST ??= "" # set to "alphabetical" for version using single alphabetical character as increment release CVE_VERSION_SUFFIX ??= "" +def update_symlinks(target_path, link_path): + if link_path != target_path and os.path.exists(target_path): + if os.path.exists(os.path.realpath(link_path)): + os.remove(link_path) + os.symlink(os.path.basename(target_path), link_path) + def generate_json_report(d, out_path, link_path): if os.path.exists(d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")): import json @@ -98,10 +104,7 @@ def generate_json_report(d, out_path, link_path): with open(out_path, "w") as f: json.dump(summary, f, indent=2) - if link_path != out_path: - if os.path.exists(os.path.realpath(link_path)): - os.remove(link_path) - os.symlink(os.path.basename(out_path), link_path) + update_symlinks(out_path, link_path) python cve_save_summary_handler () { import shutil @@ -118,14 +121,9 @@ python cve_save_summary_handler () { if os.path.exists(cve_tmp_file): shutil.copyfile(cve_tmp_file, cve_summary_file) - - if cve_summary_file and os.path.exists(cve_summary_file): - cvefile_link = os.path.join(cvelogpath, cve_summary_name) - # if the paths are the same don't create the link - if cvefile_link != cve_summary_file: - if os.path.exists(os.path.realpath(cvefile_link)): - os.remove(cvefile_link) - os.symlink(os.path.basename(cve_summary_file), cvefile_link) + cvefile_link = os.path.join(cvelogpath, cve_summary_name) + update_symlinks(cve_summary_file, cvefile_link) + bb.plain("Complete CVE report summary created at: %s" % cvefile_link) if d.getVar("CVE_CHECK_FORMAT_JSON") == "1": json_summary_link_name = os.path.join(cvelogpath, d.getVar("CVE_CHECK_SUMMARY_FILE_NAME_JSON")) @@ -198,15 +196,9 @@ python cve_check_write_rootfs_manifest () { bb.utils.mkdirhier(os.path.dirname(manifest_name)) shutil.copyfile(cve_tmp_file, manifest_name) - if manifest_name and os.path.exists(manifest_name): - manifest_link = os.path.join(deploy_dir, "%s.cve" % link_name) - # if they are the same don't create the link - if manifest_link != manifest_name: - # If we already have another manifest, update symlinks - if os.path.exists(os.path.realpath(manifest_link)): - os.remove(manifest_link) - os.symlink(os.path.basename(manifest_name), manifest_link) - bb.plain("Image CVE report stored in: %s" % manifest_name) + manifest_link = os.path.join(deploy_dir, "%s.cve" % link_name) + update_symlinks(manifest_name, manifest_link) + bb.plain("Image CVE report stored in: %s" % manifest_name) if d.getVar("CVE_CHECK_FORMAT_JSON") == "1": link_path = os.path.join(deploy_dir, "%s.json" % link_name) From patchwork Thu Jun 2 16:51:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 06/26] cve-check: Only include installed packages for rootfs manifest Date: Thu, 2 Jun 2022 06:51:38 -1000 Message-Id: <65498411d73e8008d5550c2d0a1148f990717587.1654188574.git.steve@sakoman.com> In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Ernst Sjöstrand Before this the rootfs manifest and the summary were identical. We should separate the summary and rootfs manifest more clearly, now the summary is for all CVEs and the rootfs manifest is only for things in that image. This is even more useful if you build multiple images. Signed-off-by: Ernst Sjöstrand Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 3b8cc6fc45f0ea5677729ee2b1819bdc7a441ab1) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 69 ++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 15 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 0ab7ec7ae6..3bb924ba34 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -176,6 +176,8 @@ python cve_check_write_rootfs_manifest () { """ import shutil + import json + from oe.rootfs import image_list_installed_packages from oe.cve_check import cve_check_merge_jsons if d.getVar("CVE_CHECK_COPY_FILES") == "1": @@ -186,26 +188,63 @@ python cve_check_write_rootfs_manifest () { if os.path.exists(deploy_file_json): bb.utils.remove(deploy_file_json) - if os.path.exists(d.getVar("CVE_CHECK_TMP_FILE")): - bb.note("Writing rootfs CVE manifest") - deploy_dir = d.getVar("DEPLOY_DIR_IMAGE") - link_name = d.getVar("IMAGE_LINK_NAME") + # Create a list of relevant recipies + recipies = set() + for pkg in list(image_list_installed_packages(d)): + pkg_info = os.path.join(d.getVar('PKGDATA_DIR'), + 'runtime-reverse', pkg) + pkg_data = oe.packagedata.read_pkgdatafile(pkg_info) + recipies.add(pkg_data["PN"]) + + bb.note("Writing rootfs CVE manifest") + deploy_dir = d.getVar("DEPLOY_DIR_IMAGE") + link_name = d.getVar("IMAGE_LINK_NAME") + + json_data = {"version":"1", "package": []} + text_data = "" + enable_json = d.getVar("CVE_CHECK_FORMAT_JSON") == "1" + enable_text = d.getVar("CVE_CHECK_FORMAT_TEXT") == "1" + + save_pn = d.getVar("PN") + + for pkg in recipies: + # To be able to use the CVE_CHECK_RECIPE_FILE variable we have to evaluate + # it with the different PN names set each time. + d.setVar("PN", pkg) + if enable_text: + pkgfilepath = d.getVar("CVE_CHECK_RECIPE_FILE") + if os.path.exists(pkgfilepath): + with open(pkgfilepath) as pfile: + text_data += pfile.read() + + if enable_json: + pkgfilepath = d.getVar("CVE_CHECK_RECIPE_FILE_JSON") + if os.path.exists(pkgfilepath): + with open(pkgfilepath) as j: + data = json.load(j) + cve_check_merge_jsons(json_data, data) + + d.setVar("PN", save_pn) + + if enable_text: + link_path = os.path.join(deploy_dir, "%s.cve" % link_name) manifest_name = d.getVar("CVE_CHECK_MANIFEST") - cve_tmp_file = d.getVar("CVE_CHECK_TMP_FILE") - bb.utils.mkdirhier(os.path.dirname(manifest_name)) - shutil.copyfile(cve_tmp_file, manifest_name) + with open(manifest_name, "w") as f: + f.write(text_data) - manifest_link = os.path.join(deploy_dir, "%s.cve" % link_name) - update_symlinks(manifest_name, manifest_link) + update_symlinks(manifest_name, link_path) bb.plain("Image CVE report stored in: %s" % manifest_name) - if d.getVar("CVE_CHECK_FORMAT_JSON") == "1": - link_path = os.path.join(deploy_dir, "%s.json" % link_name) - manifest_path = d.getVar("CVE_CHECK_MANIFEST_JSON") - bb.note("Generating JSON CVE manifest") - generate_json_report(d, manifest_path, link_path) - bb.plain("Image CVE JSON report stored in: %s" % link_path) + if enable_json: + link_path = os.path.join(deploy_dir, "%s.json" % link_name) + manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") + + with open(manifest_name, "w") as f: + json.dump(json_data, f, indent=2) + + update_symlinks(manifest_name, link_path) + bb.plain("Image CVE JSON report stored in: %s" % manifest_name) } ROOTFS_POSTPROCESS_COMMAND:prepend = "${@'cve_check_write_rootfs_manifest; ' if d.getVar('CVE_CHECK_CREATE_MANIFEST') == '1' else ''}" From patchwork Thu Jun 2 16:51:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8759 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 DE680C43334 for ; Thu, 2 Jun 2022 16:52:33 +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.1503.1654188749882029691 for ; Thu, 02 Jun 2022 09:52:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=auRDetq6; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id o6-20020a17090a0a0600b001e2c6566046so9983429pjo.0 for ; Thu, 02 Jun 2022 09:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=eJ48cgCy3bN8SW290dk5FqaRjwruy+WBM/0Ka8ZkYaM=; b=auRDetq6GGB0clhOCQB+EKSkIXegr5GJ72qC+hdxqDN0+yFEApQAY9vNYnAJRLMkQY BunlhDLQ+ScskCGQxV4gK3dZHe4xdljAJA2zebqBEvkcXPrpWFvz3prP0j6HhVQkFt2/ pe0HYgVHL665VfxV6pJ0qB53nCxmQeMOjO8/xJMZmzoFT9fjjiWBWDNfrQYH98M5/wf2 oqjuOLX2vAzu8sIv0CT0LUGOwXxcLVsFoHpc5Sc9yhuDJUiaaqrtw5S3mAGAz7h1e/IG gs7UB5kRzTLqgDomXgXIqGbsgLqjZ7S5uNWhGJlOSYjLxmRhISKBMIEMDde51l1ZutXS TsmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eJ48cgCy3bN8SW290dk5FqaRjwruy+WBM/0Ka8ZkYaM=; b=EAVt2mn+SPAI0ujt9oni/TkOql3ELPh9YfXrfs8/A2RSHhE/UE7x6WRFT4r0uDHNtm mwa26RrZ7T9KOf6VUG7BWrAq4i3KMyxqxnYrteOPuMv3hWvUrK2/u9gRmU5F/o4KYTqH rtCkqSmA2FbfMQH0CHZAEw8GUPB/ZkKfjW0w3eyGjUtx6ZEIMNTeENJpDk31oVce5aqP kDi0m6gj7zKD04eaqimDDF9s7RMMgLCTWbALRqVbMn6BFEi1Rtz9X/klZ5fK8IkxRGI7 NRM3yNuNFY5F0oWrKrd6OcUl33LPQKji25gP4olo34y6ML4IhOFeTnJ9DkEXVocPNjZi w2cg== X-Gm-Message-State: AOAM532g3ZUOvxQhe5u1Bz0nNNCEwrcO6SCRrajoFyHlJGdrEy6sLx6o BsV0LUaua/tpxYbw5GsE2fTAwmoLtO9z9Qu3 X-Google-Smtp-Source: ABdhPJwafgkm4hAGcNgtiFDt0k4nzc7rPsGX2KbFybBqGSpwEjuchsLJsdqXXdXtxECj20Dgp63yLw== X-Received: by 2002:a17:90b:3b4c:b0:1e0:2c34:fbe8 with SMTP id ot12-20020a17090b3b4c00b001e02c34fbe8mr6368088pjb.70.1654188748630; Thu, 02 Jun 2022 09:52:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:27 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/26] cve-extra-exclusions: Add kernel CVEs Date: Thu, 2 Jun 2022 06:51:39 -1000 Message-Id: <726ce5bf1ea64d31f523ec5aff905407480c1095.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166484 From: Richard Purdie For OE-Core our policy is to stay as close to the kernel stable releases as we can. This should ensure the bulk of the major kernel CVEs are fixed and we don't dive into each individual issue as the stable maintainers are much more able to do that. Rather than just ignore all kernel CVEs which is what we have been doing, list the ones we ignore on this basis here, allowing new issues to be visible. If anyone wishes to clean up CPE entries with NIST for these, we'd welcome than and then entries can likely be removed from here. Signed-off-by: Richard Purdie Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 319d465d44328b5f062d2da0526c0e8b189b4239) Signed-off-by: Steve Sakoman --- .../distro/include/cve-extra-exclusions.inc | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/meta/conf/distro/include/cve-extra-exclusions.inc b/meta/conf/distro/include/cve-extra-exclusions.inc index 6c19cd293d..993ee2811a 100644 --- a/meta/conf/distro/include/cve-extra-exclusions.inc +++ b/meta/conf/distro/include/cve-extra-exclusions.inc @@ -53,6 +53,43 @@ CVE-2015-4778 CVE-2015-4779 CVE-2015-4780 CVE-2015-4781 CVE-2015-4782 CVE-2015-4 CVE-2015-4785 CVE-2015-4786 CVE-2015-4787 CVE-2015-4788 CVE-2015-4789 CVE-2015-4790 CVE-2016-0682 \ CVE-2016-0689 CVE-2016-0692 CVE-2016-0694 CVE-2016-3418 CVE-2020-2981" + +# +# Kernel CVEs, e.g. linux-yocto* +# +# For OE-Core our policy is to stay as close to the kernel stable releases as we can. This should +# ensure the bulk of the major kernel CVEs are fixed and we don't dive into each individual issue +# as the stable maintainers are much more able to do that. +# +# Rather than just ignore all kernel CVEs, list the ones we ignore on this basis here, allowing new +# issues to be visible. If anyone wishes to clean up CPE entries with NIST for these, we'd +# welcome than and then entries can likely be removed from here. +# +# 1999-2010 +CVE_CHECK_IGNORE += "CVE-1999-0524 CVE-1999-0656 CVE-2006-2932 CVE-2007-2764 CVE-2007-4998 CVE-2008-2544 \ + CVE-2008-4609 CVE-2010-0298 CVE-2010-4563" +# 2011-2017 +CVE_CHECK_IGNORE += "CVE-2011-0640 CVE-2014-2648 CVE-2014-8171 CVE-2016-0774 CVE-2016-3695 CVE-2016-3699 \ + CVE-2017-1000255 CVE-2017-1000377 CVE-2017-5897 CVE-2017-6264" +# 2018 +CVE_CHECK_IGNORE += "CVE-2018-1000026 CVE-2018-10840 CVE-2018-10876 CVE-2018-10882 CVE-2018-10901 CVE-2018-10902 \ + CVE-2018-14625 CVE-2018-16880 CVE-2018-16884 CVE-2018-5873 CVE-2018-6559" +# 2019 +CVE_CHECK_IGNORE += "CVE-2019-10126 CVE-2019-14899 CVE-2019-18910 CVE-2019-3016 CVE-2019-3819 CVE-2019-3846 CVE-2019-3887" +# 2020 +CVE_CHECK_IGNORE += "CVE-2020-10732 CVE-2020-10742 CVE-2020-16119 CVE-2020-1749 CVE-2020-25672 CVE-2020-27820 CVE-2020-35501 CVE-2020-8834" +# 2021 +CVE_CHECK_IGNORE += "CVE-2021-20194 CVE-2021-20226 CVE-2021-20265 CVE-2021-3564 CVE-2021-3743 CVE-2021-3847 CVE-2021-4002 \ + CVE-2021-4090 CVE-2021-4095 CVE-2021-4197 CVE-2021-4202 CVE-2021-44879 CVE-2021-45402" +# 2022 +CVE_CHECK_IGNORE += "CVE-2022-0185 CVE-2022-0264 CVE-2022-0286 CVE-2022-0330 CVE-2022-0382 CVE-2022-0433 CVE-2022-0435 \ + CVE-2022-0492 CVE-2022-0494 CVE-2022-0500 CVE-2022-0516 CVE-2022-0617 CVE-2022-0742 CVE-2022-0854 \ + CVE-2022-0995 CVE-2022-0998 CVE-2022-1011 CVE-2022-1015 CVE-2022-1048 CVE-2022-1055 CVE-2022-1195 \ + CVE-2022-1353 CVE-2022-24122 CVE-2022-24448 CVE-2022-24958 CVE-2022-24959 CVE-2022-25258 CVE-2022-25265 \ + CVE-2022-25375 CVE-2022-26490 CVE-2022-26878 CVE-2022-26966 CVE-2022-27223 CVE-2022-27666 CVE-2022-27950 \ + CVE-2022-28356 CVE-2022-28388 CVE-2022-28389 CVE-2022-28390 CVE-2022-28796 CVE-2022-28893 CVE-2022-29156 \ + CVE-2022-29582 CVE-2022-29968" + #### CPE update pending #### # groff:groff-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2000-0803 From patchwork Thu Jun 2 16:51:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8760 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 E5787CCA478 for ; Thu, 2 Jun 2022 16:52:33 +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.web09.1523.1654188751910318764 for ; Thu, 02 Jun 2022 09:52:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nRryyEcc; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id w3so4948848plp.13 for ; Thu, 02 Jun 2022 09:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OhfjCfeP0ET7fPSMlbukSWqwE3nqotzj/cMgbQlB1k0=; b=nRryyEccHDZq30foiBYbfp3huT3HT+SHnc/Z0ZeH2I4z9+5sdfqBXk0MNLg1J361Eb 9GGaeltG40hw8Y+AommcNndjH5aMBCue/oZRz8OP+SILuvCN9xy5Q4PiTDdQySgCWufL tU3tmO0+AgVxvyppaInQZqgus8ElAbg7MewSPm90pZUIO6DKSKzVontJkFVygueQlqQs /2GtK0nEt0hGUoUsSXw3kwp0joSUFiMICu9sc/5TEu3JIezi7EjXa+hN1nYLtE9Ar+k2 uccnCdhpnVEFr4dINg2rlimxuxzjvzWfCZROyPnw2jyYHeH66at48xde0NaJxdB5w3da P6aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OhfjCfeP0ET7fPSMlbukSWqwE3nqotzj/cMgbQlB1k0=; b=z5Z/En3Im8Mb/Wc84NodJWN8AgTKbM9h8wtdde3sWiLB5qojWOj/W5ZRsqueY+f+oF GH+vLGHilO0EsaBUbv+0OYLjYpQhf0to24qiKsqtoWbSf/0qEK9/uC/ab40eUFYI0pF5 StmmMrQRyzSXfgc8uS6q0UfaSBCCvz0A+SM7viKrKlAWlc/Y4Wq/SMi0qGSqouLSzfD9 /RRS7dLq6utDebXAwoFR+75jy9+vfs15Wblm+MGdEGI/E7q83X0OzLxPGP5xfjHqZfQT XVB/C185CdTKtBiCGeb0Gr2thnh3GCIFLVIC/2oWE7clVdF0OZK1DteYivppGpQuoYFM izJA== X-Gm-Message-State: AOAM5339jLnOw2sTzBXT/O1T2UwlueRiW1YNgdR6qI/OsWXZxHH+8Ior JNMKGdGq6YwVybZ+bb7WxtXcaxuZYy60qKpP X-Google-Smtp-Source: ABdhPJwrjXgsAeNa1GiUyZ7rxSOJIPJ8Oe83Brn9c0h61zQyyV6lgvJ4Xcj7L1kW7fPz3XBa6boAwg== X-Received: by 2002:a17:90a:5785:b0:1e0:3647:7851 with SMTP id g5-20020a17090a578500b001e036477851mr6232427pji.155.1654188750657; Thu, 02 Jun 2022 09:52:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/26] cve-check: Allow warnings to be disabled Date: Thu, 2 Jun 2022 06:51:40 -1000 Message-Id: <8fd6a9f521ea6b1e10c80fe33968943db30991ba.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166485 From: Richard Purdie When running CVE checks in CI we're usually not interested in warnings on the console for any CVEs present. Add a configuration option CVE_CHECK_SHOW_WARNINGS to allow this to be disabled (it is left enabled by default). Signed-off-by: Richard Purdie (cherry picked from commit 1054d3366ba528f2ad52585cf951e508958c5c68) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 3bb924ba34..c80a365819 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -48,6 +48,7 @@ CVE_CHECK_COPY_FILES ??= "1" CVE_CHECK_CREATE_MANIFEST ??= "1" CVE_CHECK_REPORT_PATCHED ??= "1" +CVE_CHECK_SHOW_WARNINGS ??= "1" # Provide text output CVE_CHECK_FORMAT_TEXT ??= "1" @@ -436,7 +437,7 @@ def cve_write_data_text(d, patched, unpatched, ignored, cve_data): write_string += "VECTOR: %s\n" % cve_data[cve]["vector"] write_string += "MORE INFORMATION: %s%s\n\n" % (nvd_link, cve) - if unpatched_cves: + if unpatched_cves and d.getVar("CVE_CHECK_SHOW_WARNINGS") == "1": bb.warn("Found unpatched CVE (%s), for more information check %s" % (" ".join(unpatched_cves),cve_file)) if write_string: From patchwork Thu Jun 2 16:51:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8764 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 E055FCCA47A for ; Thu, 2 Jun 2022 16:52:43 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web09.1524.1654188753795584318 for ; Thu, 02 Jun 2022 09:52:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=a2JCHHfW; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 129so5243723pgc.2 for ; Thu, 02 Jun 2022 09:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=u4g0UkzpbQ7am7L+c+MqSRgNW7N+vIkdajl91PHvO3Y=; b=a2JCHHfWaYCVq4X9xQqiCHVhaQcjPBZWo6BeNckHVN2u6XQZFmu973FmmOg+YM+npA APf+wKbxvPyAKkidH1VvGmPzdyroOGFQyDMi3P8ypme+l2VRZlGIWv5YQcBIlAmQ2sEA /GzqE5CyefwBy82p1GLGKtpHBLLUu7tPlCVY8E6huvqpjLI6763wN6MZT2L18Dj0t166 R/Nq/SDPQXunbLYs3hpgv47xsYb7kjUB/IvC7tDsmt7fZrinNv7ad+9NE+Ulda/qO7xa btxZe6GnKo5YU/t+E8IRYI60VfG/BYrZD3NmU3a0UPYKVUvxFBhbDbG43hixPeCDhnDz JlLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u4g0UkzpbQ7am7L+c+MqSRgNW7N+vIkdajl91PHvO3Y=; b=sdy81OKTkL6u0S4UkyrDmFH0m/r+RHI7Cf61eDMHpT2oqhn6N8DIjGsuUldqHniKcP V0ROz/pgphnm3YX811QLldAQFHYlwkfEGzHsN0Ge3TEhBMDUTliEmum4LZ9lg4JR3jgC jAB8h0klv01dq0S+WFVmNRKAJuyE5De2j04RF2wFAqP9Q9C8cXkTaalXQN7O6AH8y+V+ 6vBh4qbfnnVse1JcUDi7TC0Ew1yFC5PKgX9pEw0FSaM1PHYb1SNjDbRTX0dgAwuy6Hzh yU/Y7Y3prpn2nZJhR2/HFdobG1lzWsfJaFua/7v2YksRhSeCBrspxQg1SCrAxvRErW32 MHeA== X-Gm-Message-State: AOAM533YP4IYHHlmnCuhS/vWlLfpogiRNJ/blUt1GGlf9HF9d/kp4xUI v7Uojyh+5U+eFZo22HhUxN+s6RUw8yzW4lH+ X-Google-Smtp-Source: ABdhPJzMQqBpqeL8I4GhhWlHWY4EPQo9I3oUR69hexHbR8bUoGUVN/pathSeOSuaQ0yV0ayioGTgyA== X-Received: by 2002:a05:6a00:16cf:b0:51b:5f55:9bc with SMTP id l15-20020a056a0016cf00b0051b5f5509bcmr5950966pfc.7.1654188752631; Thu, 02 Jun 2022 09:52:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/26] linux-yocto/5.15: update to v5.15.37 Date: Thu, 2 Jun 2022 06:51:41 -1000 Message-Id: <90628b9bbcf4ed6f23e880248c92403b29ce20f3.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166486 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 4bf7f350c163 Linux 5.15.37 f59e6886cafb selftests/bpf: Add test for reg2btf_ids out of bounds access dcecd95a1357 mm: gup: make fault_in_safe_writeable() use fixup_user_fault() 4a0123bdb064 btrfs: fallback to blocking mode when doing async dio over multiple extents c81c4f566660 btrfs: fix deadlock due to page faults during direct IO reads and writes 640a6be8e861 gfs2: Fix mmap + page fault deadlocks for direct I/O f86f8d27840a iov_iter: Introduce nofault flag to disable page faults 6e213bc61446 gup: Introduce FOLL_NOFAULT flag to disable page faults d3b744791bf0 iomap: Add done_before argument to iomap_dio_rw ea7a57858875 iomap: Support partial direct I/O on user copy failures a00cc46f97b9 iomap: Fix iomap_dio_rw return value for user copies 81a7fc397a62 gfs2: Fix mmap + page fault deadlocks for buffered I/O 38b58498819a gfs2: Eliminate ip->i_gh 8d363d817353 gfs2: Move the inode glock locking to gfs2_file_buffered_write 416a705304e5 gfs2: Introduce flag for glock holder auto-demotion b25cfbc0e7de gfs2: Clean up function may_grant b88b998579ee gfs2: Add wrapper for iomap_file_buffered_write 1d91c912e7d1 iov_iter: Introduce fault_in_iov_iter_writeable 30e66b1dfcbb iov_iter: Turn iov_iter_fault_in_readable into fault_in_iov_iter_readable 923f05a660e6 gup: Turn fault_in_pages_{readable,writeable} into fault_in_{readable,writeable} 19cbd78fb26a mm: kfence: fix objcgs vector allocation 10033fa72d41 ARM: dts: socfpga: change qspi to "intel,socfpga-qspi" e8749d608847 spi: cadence-quadspi: fix write completion support 8c39925e98d4 bpf: Fix crash due to out of bounds access into reg2btf_ids. 379382b347db bpf/selftests: Test PTR_TO_RDONLY_MEM 2a77c58726ab bpf: Add MEM_RDONLY for helper args that are pointers to rdonly mem. 15166bb3000f bpf: Make per_cpu_ptr return rdonly PTR_TO_MEM. b710f73704d6 bpf: Convert PTR_TO_MEM_OR_NULL to composable types. b453361384c2 bpf: Introduce MEM_RDONLY flag 8d38cde47a7e bpf: Replace PTR_TO_XXX_OR_NULL with PTR_TO_XXX | PTR_MAYBE_NULL 3c141c82b958 bpf: Replace RET_XXX_OR_NULL with RET_XXX | PTR_MAYBE_NULL d58a396fa6c9 bpf: Replace ARG_XXX_OR_NULL with ARG_XXX | PTR_MAYBE_NULL a76020980b9f bpf: Introduce composable reg, ret and arg types. e52da8e4632f floppy: disable FDRAWCMD by default Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 786e668bdda1181438cbe570fa1155ad3b7f06d9) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index afcc715918..5bc02623e9 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2b74bd6a3a2341f079f914171bc92eadc8a7deaa" -SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" +SRCREV_machine ?= "0098c71753fab42ea29a58b8c39ae8852a0819b8" +SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.36" +LINUX_VERSION ?= "5.15.37" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 9a708804c1..4d2e9facda 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.36" +LINUX_VERSION ?= "5.15.37" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "9107fb1e04c2da3d84e1967aeb7f5bc190423d5b" -SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" +SRCREV_machine ?= "73e5fcde1e4d7b3ef0f122e309bf6feda2214133" +SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 0aef531659..a0af1f93cf 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "b5b62e5ba72e2ed669bbb53dd5707e27d777257e" -SRCREV_machine:qemuarm64 ?= "3f298fc00a40ed4f32805aba757c22c855f654b9" -SRCREV_machine:qemumips ?= "6d50f4ff023b65e226fd2e65feaa583d8b177ae3" -SRCREV_machine:qemuppc ?= "e51976427997a0b6f81e013ca6588e32c33cfeb0" -SRCREV_machine:qemuriscv64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" -SRCREV_machine:qemuriscv32 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" -SRCREV_machine:qemux86 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" -SRCREV_machine:qemux86-64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" -SRCREV_machine:qemumips64 ?= "1822ceafc13337881a81edeb7093b0c095d9efca" -SRCREV_machine ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" -SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" +SRCREV_machine:qemuarm ?= "487f0d10355bc4ea900c6cbfb6ba156541449263" +SRCREV_machine:qemuarm64 ?= "623ef2010028407442669ed9d3a50a86ad4031aa" +SRCREV_machine:qemumips ?= "d07fd1d207673b466616e5f806d97e2834ef35b2" +SRCREV_machine:qemuppc ?= "cbe3228711c2f3df43ffb3d865ef09dd91fb7100" +SRCREV_machine:qemuriscv64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" +SRCREV_machine:qemuriscv32 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" +SRCREV_machine:qemux86 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" +SRCREV_machine:qemux86-64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" +SRCREV_machine:qemumips64 ?= "08d20206727ae27296a3acf27a4fc6c9bdb874da" +SRCREV_machine ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" +SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "45451e8015a91de5d1a512c3e3d7373bbcb58fb0" +SRCREV_machine:class-devupstream ?= "4bf7f350c1638def0caa1835ad92948c15853916" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.36" +LINUX_VERSION ?= "5.15.37" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jun 2 16:51:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8763 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 00C62CCA47B for ; Thu, 2 Jun 2022 16:52:43 +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.web09.1529.1654188756392693090 for ; Thu, 02 Jun 2022 09:52:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=c1bl4ss5; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id u4so2260191pgk.11 for ; Thu, 02 Jun 2022 09:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=u3NMjKzEL3370GH34319iPG2rswYZwDfTCCHyyPdJqg=; b=c1bl4ss5QHsf2eQKwLZbvV3IND8Y10mXIJOdjSVjP7jUcrMp6j+nHuN+ewA9nsOyEF 8yOL+5dfwIrFE5ZbNC8749QXiXMuRYT6+P6laFep5AjUU6ChPT0R077fG+mOqSbzPoyw i2p+zSqkEsBjogGfEJ+g2CxnBQ0rzrwRQmHX82p/eQUUZsKIeGUDjhDLw5hZk1PE62X8 PRHS377gTOwvyx8iLSoaGFunwuNK5w0I0meSX0F4XqCUR6zWwA1rlwBVX726DXinSs2y rL3XN1gb5+uikFF2Ptvw9H02vUlZQh51XWMFNhbFGP2oGFMnyqG5NfInneP+ypD0dZxa i1YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u3NMjKzEL3370GH34319iPG2rswYZwDfTCCHyyPdJqg=; b=BI3CGYFHl+EQw6dF094bDjTG7F7taMGJhV0H7CejEMYxuEi3jPP7w4N6M0IvDgZ5c5 8sprmLkelvA971SnrEcjElWAEAGDwM8nR9+cG+JTU+yWJGzMEZikqtrvIJtJ91sjvWeX 9qJyjLn8h2N6mlg5fuh9UrxNb3t8Sv40tnUs7xuF36g4C4HjZCDo1mLMoxiU2OA2rRHS 8OGPexAuBa63u+JgKvrllc84kyEkR1FvI7+PNMDzkfvgwumZ+tNe2WAdwHtfi8pLJ8HK jZa7E+aX3ir947E8hTk3U6eChdQGYDOGuNPlEJtWEnstLGtgn0X2TT/xj3v/dCeyAbM7 irrQ== X-Gm-Message-State: AOAM5302Bf4yz80iHJLqmm4twMS+Asqlyy276HyIfx6Zp50t6DPBaxCs iggXZQV0j8f4GdrAKHV+L7Ttq129s6U4s4rq X-Google-Smtp-Source: ABdhPJywW3LlXdAHRt97Jw7HKI9iaO1OZclZZyCUA28Qa9AsSmMBRMOHkGJbrA4SmP8w7ry7r2jdxg== X-Received: by 2002:a05:6a00:1744:b0:51b:d4d5:f34 with SMTP id j4-20020a056a00174400b0051bd4d50f34mr1867011pfc.0.1654188754780; Thu, 02 Jun 2022 09:52:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/26] linux-yocto/5.10: update to v5.10.113 Date: Thu, 2 Jun 2022 06:51:42 -1000 Message-Id: <96ed22ed1e6b9fa1cbb7e232c17d1e558cdc4260.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166487 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 54af9dd2b958 Linux 5.10.113 7992fdb045fb Revert "net: micrel: fix KS8851_MLL Kconfig" 8bedbc8f7f35 block/compat_ioctl: fix range check in BLKGETSIZE fea24b07edfc staging: ion: Prevent incorrect reference counting behavour dccee748af17 spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller 572761645b88 jbd2: fix a potential race while discarding reserved buffers after an abort 50aac4427360 can: isotp: stop timeout monitoring when no first frame was sent e1e96e372721 ext4: force overhead calculation if the s_overhead_cluster makes no sense 4789149b9ea2 ext4: fix overhead calculation to account for the reserved gdt blocks 0c54b093766b ext4, doc: fix incorrect h_reserved size 22c450d39f89 ext4: limit length to bitmap_maxbytes - blocksize in punch_hole 75ac724684b7 ext4: fix use-after-free in ext4_search_dir a46b3d849864 ext4: fix symlink file size not match to file content f6038d43b25b ext4: fix fallocate to use file_modified to update permissions consistently 19590bbc691d perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event e012f9d1af54 powerpc/perf: Fix power9 event alternatives 0a2cef65b329 drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage f8f8b3124b89 KVM: PPC: Fix TCE handling for VFIO 405d98427416 drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare 231381f52116 drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised 51d9cbbb0f5a perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled 88fcfd6ee6c5 sched/pelt: Fix attach_entity_load_avg() corner case c55327bc3712 arm_pmu: Validate single/group leader events 5580b974a84b ARC: entry: fix syscall_trace_exit argument 7082650eb826 e1000e: Fix possible overflow in LTR decoding 43a2a3734aa3 ASoC: soc-dapm: fix two incorrect uses of list iterator 54e6180c8c2d gpio: Request interrupts after IRQ is initialized 0837ff17d052 openvswitch: fix OOB access in reserve_sfa_size() 19f6dcb1f0f0 xtensa: fix a7 clobbering in coprocessor context load/store f399ab11dd6c xtensa: patch_text: Fixup last cpu should be master ba2716da2336 net: atlantic: invert deep par in pm functions, preventing null derefs 358a3846f6a9 dma: at_xdmac: fix a missing check on list iterator cf23a960c5c6 ata: pata_marvell: Check the 'bmdma_addr' beforing reading 9ca66d791439 mm/mmu_notifier.c: fix race in mmu_interval_notifier_remove() ed5d4efb4df1 oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup 6b932920b96f mm, hugetlb: allow for "high" userspace addresses 50cbc583fa83 EDAC/synopsys: Read the error count from the correct register 7ec6e06ee405 nvme-pci: disable namespace identifiers for Qemu controllers 316bd86c2261 nvme: add a quirk to disable namespace identifiers 76101c8e0c31 stat: fix inconsistency between struct stat and struct compat_stat bf28bba30410 scsi: qedi: Fix failed disconnect handling a284cca3d81a net: macb: Restart tx only if queue pointer is lagging 9581e07b549b drm/msm/mdp5: check the return of kzalloc() 8d71edabb0ab dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info() b3afe5a7fd75 brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant 202748f44148 mt76: Fix undefined behavior due to shift overflowing the constant 0de9c104d04a net: atlantic: Avoid out-of-bounds indexing 5bef9fc38ffa cifs: Check the IOCB_DIRECT flag, not O_DIRECT e129c55153c8 vxlan: fix error return code in vxlan_fdb_append 8e7ea1136475 arm64: dts: imx: Fix imx8*-var-som touchscreen property sizes cd227ac03f2a ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant 490815f0b50e platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative cb17b56a9b4d reset: tegra-bpmp: Restore Handle errors in BPMP response d513ea9b7ef8 ARM: vexpress/spc: Avoid negative array index when !SMP 052e4a661f90 arm64: mm: fix p?d_leaf() 18ff7a2efa4e arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad() 3bf8ca350170 selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets 520aab8b723c dmaengine: idxd: add RO check for wq max_transfer_size write 9a3c026dc3a5 dmaengine: idxd: add RO check for wq max_batch_size write f593f49fcd17 net: stmmac: Use readl_poll_timeout_atomic() in atomic state 3d55b195747c netlink: reset network and mac headers in netlink_dump() 49516e6ed914 ipv6: make ip6_rt_gc_expire an atomic_t 078d839f11ac l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu 0ac8f83d8f64 net/sched: cls_u32: fix possible leak in u32_init_knode() 93366275be72 ip6_gre: Fix skb_under_panic in __gre6_xmit() 200f96ebb389 ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit() 8fb76adb89f0 net/packet: fix packet_sock xmit return value checking a499cb5f3ef9 net/smc: Fix sock leak when release after smc_shutdown() 60592f16a456 rxrpc: Restore removed timer deletion fc7116a79a86 igc: Fix BUG: scheduling while atomic 46b0e4f998ce igc: Fix infinite loop in release_swfw_sync c075c3ea0317 esp: limit skb_page_frag_refill use to a single page 3f7914dbeacd spi: spi-mtk-nor: initialize spi controller after resume f714abf28f81 dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources 9bc949a181ba dmaengine: imx-sdma: Fix error checking in sdma_event_remap 12aa8021c7a7 ASoC: codecs: wcd934x: do not switch off SIDO Buck when codec is in use b6f474cd3097 ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component 608fc58858bf ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek d29c78d3f9c5 dm: fix mempool NULL pointer race when completing IO cf9b19546494 ALSA: hda/realtek: Add quirk for Clevo NP70PNP 8ce3820fc9d4 ALSA: usb-audio: Clear MIDI port active flag after draining 43ce33a68e2b net/sched: cls_u32: fix netns refcount changes in u32_change() 04dd45d9776e gfs2: assign rgrp glock before compute_bitstructs 378061c9b886 perf tools: Fix segfault accessing sample_id xyarray 5e8446e3820c tracing: Dump stacktrace trigger to the corresponding instance 69848f9488bc mm: page_alloc: fix building error on -Werror=array-compare 08ad7a770efa etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 8be43ceaf742c4c1b59522ac75df4846cc271461) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 4c55a27abf..62d7494b88 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "bd6e7290bc766ef13e42a1e37f75e6e708b4e317" -SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee" +SRCREV_machine ?= "88b754b80392e1f1ac7df46595f9712edc8aec02" +SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.112" +LINUX_VERSION ?= "5.10.113" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 42d5c105b7..e0c693fed2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.112" +LINUX_VERSION ?= "5.10.113" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine:qemuarm ?= "ab911ca906ec6d1551ba12373d4133ccaf7f83cc" -SRCREV_machine ?= "aadc46b05e5c77328bd3461578c770af3efa8944" -SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee" +SRCREV_machine:qemuarm ?= "7dacc8332b0bc5600d97583f45b841c9724f2191" +SRCREV_machine ?= "8dc46fa883d7b9a3412791f6731096e2e516d949" +SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 3d3dad99b5..37f2db88a7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,23 +13,23 @@ KBRANCH:qemux86 ?= "v5.10/standard/base" KBRANCH:qemux86-64 ?= "v5.10/standard/base" KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "1c2e2b55a9d13e749131d812797fa0ddbb56fde2" -SRCREV_machine:qemuarm64 ?= "9d22ba94a0b4466ead91f24b138fd8e5814dad21" -SRCREV_machine:qemumips ?= "c8f392c534a331f6ee6d40c8b1ff428fc3599f7f" -SRCREV_machine:qemuppc ?= "498fcdc5dc2f0b99001e50da239976430eacf676" -SRCREV_machine:qemuriscv64 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" -SRCREV_machine:qemuriscv32 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" -SRCREV_machine:qemux86 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" -SRCREV_machine:qemux86-64 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" -SRCREV_machine:qemumips64 ?= "a005c07acd278c86ddab4cd8bc7a1bfae4638414" -SRCREV_machine ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" -SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee" +SRCREV_machine:qemuarm ?= "6092497574895b1179a3c7a9e07c7f40c2d4c136" +SRCREV_machine:qemuarm64 ?= "97ad6c5f9ffdb6b108cbbf99d9061dd0fe03e4e8" +SRCREV_machine:qemumips ?= "e53b2d1867f7bdc2c0cc904a15992178688c3ad4" +SRCREV_machine:qemuppc ?= "b12ed76165bfc9fe2b99fcc224b5e0134b7b533f" +SRCREV_machine:qemuriscv64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemuriscv32 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemux86 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemux86-64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemumips64 ?= "07580586b738406b4dec9bf91d4eecdb933f2a07" +SRCREV_machine ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.112" +LINUX_VERSION ?= "5.10.113" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jun 2 16:51:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8765 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 0508ECCA47D for ; Thu, 2 Jun 2022 16:52:44 +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.web12.1567.1654188758615807642 for ; Thu, 02 Jun 2022 09:52:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=IZFNab3y; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id d12-20020a17090abf8c00b001e2eb431ce4so5324408pjs.1 for ; Thu, 02 Jun 2022 09:52:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=SR1foBUDI2g0Z/MaKVIv/uPKOpcTDw4Ety4O4EH57F8=; b=IZFNab3ykdqdXHPp5dl7gHPTXpQnQdzKWanFcYVWBnz3mWfS5HHeCz4+++B8qRcQwC fmCU0Khdq5ywiM4YXx1H0PXqhqVNuvdv5ysEYImmmOtucuEBpoZGh9EoMqC9NFd+ykeO AQgExgh7AFIbqhCJjPyP29HO4mXdT7LbTv5/au2hEfY8i1r8/eif9it0pOlDE/2aun1n CIBZo+81eiUytChMrYKQgLMJC6gBpf91etpsPINXeMfwAC6M1jsbrLd+RlK0B6ZNQP0a PchrnT4GBuiDXY67/yiBXAtc4TAXbRzK7N8YmtJTs/1TjcAwUaIA1G3tO2C/sLz0JVmP rLLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SR1foBUDI2g0Z/MaKVIv/uPKOpcTDw4Ety4O4EH57F8=; b=IfQWU8/P3XlDkBVvCfppweaXTdMoExXvKmGn2k5VLOyInEQPnsskrWYI3Pa6xDoTbM oFIoPNjogVjSQSMWwze+Dj4Kyv9ZQV0VvuIQfL1fTQlbYjPt98yGiBdMSRtLe8HzNrE2 xl84HA3cni37KzllgMhDj+DlFgy2uOFkt9LyYCEWm0cWfrUHA5feTK1XMjaBLtMqr2DP AT/DxQkBLIV8Z69Xx6jdbr11Pb6yDk8DZzIhQL2ryildo3bwfz4FHB7uxxFl3eb0r4p8 L2DdJjb6onPSzI8JWxYxPiI9x+Cfd/oEnl92B1iq2bYiaRfWrwrXbAavxNmOfTAVB8z7 QZJg== X-Gm-Message-State: AOAM5317eOTtYY5Sh/E7zeFODXrcpOFzhQ+c9ghILrfIbzMsV6WDDQJq XtZbI7exryTJHTg6AtUci7vbNIp2z8kpH2ka X-Google-Smtp-Source: ABdhPJzXTbiFTLMPkh9ho61crdxX8s8kuMNlmSFGRHzVlw0l62ref2Cy/sROuS6ViUsNUHr6VWVOlw== X-Received: by 2002:a17:902:e806:b0:164:164c:5a63 with SMTP id u6-20020a170902e80600b00164164c5a63mr5820914plg.102.1654188757101; Thu, 02 Jun 2022 09:52:37 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/26] linux-yocto/5.15: update to v5.15.38 Date: Thu, 2 Jun 2022 06:51:43 -1000 Message-Id: <7d734c95baef7cb6dfbedfbad21edd86754d3ba1.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166488 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 3fbf24b73f4a Linux 5.15.38 151322c24e87 powerpc/64: Add UADDR64 relocation support ec1bb681eee2 objtool: Fix type of reloc::addend 19ffee7d6231 objtool: Fix code relocs vs weak symbols 80c71d76e88a eeprom: at25: Use DMA safe buffers 7d0010f62840 perf symbol: Remove arch__symbols__fixup_end() ea47db3bac7a tty: n_gsm: fix software flow control handling ab49c23668ea tty: n_gsm: fix incorrect UA handling e0a84ae1c662 tty: n_gsm: fix reset fifo race condition f92783b7568e tty: n_gsm: fix missing tty wakeup in convergence layer type 2 aeacc7e81c71 tty: n_gsm: fix wrong signal octets encoding in MSC ef2f08ee00b0 tty: n_gsm: fix wrong command frame length field encoding e51f35470383 tty: n_gsm: fix wrong command retry handling 73defa00a7bc tty: n_gsm: fix missing explicit ldisc flush 2484787cde3d tty: n_gsm: fix wrong DLCI release order 0a7fe1a47ca5 tty: n_gsm: fix insufficient txframe size 87e1b4f90703 netfilter: nft_socket: only do sk lookups when indev is available a93d2d3189e8 tty: n_gsm: fix malformed counter for out of frame data 0d6289c4a0e1 tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 4e1beef38c35 tty: n_gsm: fix mux cleanup after unregister tty device 8b19dfb3e817 tty: n_gsm: fix decoupled mux resource 7f71387d9f3b tty: n_gsm: fix restart handling via CLD command a87a36badd94 perf symbol: Update symbols__fixup_end() cf7bf78f10bd perf symbol: Pass is_kallsyms to symbols__fixup_end() f858bd6536e1 x86/cpu: Load microcode during restore_processor_state() 2333d2a72ba1 ARM: dts: imx8mm-venice-gw{71xx,72xx,73xx}: fix OTG controller OC mode 0dc5cad09e32 ARM: dts: at91: sama7g5ek: enable pull-up on flexcom3 console lines cf12ce1bd71d btrfs: fix leaked plug after failure syncing log on zoned filesystems 65b785cdb397 thermal: int340x: Fix attr.show callback prototype f3106b0b0113 ACPI: processor: idle: Avoid falling back to C3 type C-states d2bc6fc51e58 net: ethernet: stmmac: fix write to sgmii_adapter_base 4e308b21bc16 drm/i915: Fix SEL_FETCH_PLANE_*(PIPE_B+) register addresses 67434e132b8c drm/i915: Check EDID for HDR static metadata when choosing blc 891883c426b8 netfilter: Update ip6_route_me_harder to consider L3 domain c63fbe063ffb mtd: rawnand: qcom: fix memory corruption that causes panic 30083f049204 kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time 051e78dc1f97 zonefs: Clear inode information flags on inode creation 534c3f29acdd zonefs: Fix management of open zones 746140625a0f Revert "ACPI: processor: idle: fix lockup regression on 32-bit ThinkPad T40" 2688d967ec65 selftest/vm: verify remap destination address in mremap_test a17404fcbfd0 selftest/vm: verify mmap addr in mremap_test c18b69393b4f powerpc/perf: Fix 32bit compile 9a90c13f72e7 drivers: net: hippi: Fix deadlock in rr_close() 3bb73c4cc265 cifs: destage any unwritten data to the server before calling copychunk_write 4640802e1cd4 x86: __memcpy_flushcache: fix wrong alignment if size > 2^32 5bf8eda3815a bonding: do not discard lowest hash bit for non layer3+4 hashing d276bcc5f72e ksmbd: set fixed sector size to FS_SECTOR_SIZE_INFORMATION df30cbfd3d8a ksmbd: increment reference count of parent fp 50f79a2abb65 arch: xtensa: platforms: Fix deadlock in rs_close() 52c3a04f9ec2 ext4: fix bug_on in start_this_handle during umount filesystem dd2f7fcb2a43 ASoC: wm8731: Disable the regulator when probing fails 2c5ca9bde710 ASoC: Intel: soc-acpi: correct device endpoints for max98373 27e724bf7c51 tcp: fix F-RTO may not work correctly when receiving DSACK 8de15dad3c77 Revert "ibmvnic: Add ethtool private flag for driver-defined queue limits" 881c48b61fbb ixgbe: ensure IPsec VF<->PF compatibility 3bc7a1f85d5b perf arm-spe: Fix addresses of synthesized SPE events 3591293c19df gfs2: No short reads or writes upon glock contention b5afb477d2f8 gfs2: Make sure not to return short direct writes fe24959a79c9 gfs2: Minor retry logic cleanup e4ea3286b1aa gfs2: Prevent endless loops in gfs2_file_buffered_write a83ee2d81b34 net: fec: add missing of_node_put() in fec_enet_init_stop_mode() 925ebcac26e4 bnx2x: fix napi API usage sequence 87fe5a392d27 tls: Skip tls_append_frag on zero copy size 815b847af99d drm/amd/display: Fix memory leak in dcn21_clock_source_create ce9be3baec9b drm/amdkfd: Fix GWS queue count 54e0b949bf59 netfilter: conntrack: fix udp offload timeout sysctl 37811e46a232 io_uring: check reserved fields for recv/recvmsg 79c10cb18815 io_uring: check reserved fields for send/sendmsg ee6d708520b7 net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK 8a991ba5ddde drm/sun4i: Remove obsolete references to PHYS_OFFSET ede22fc0bf7e net: dsa: mv88e6xxx: Fix port_hidden_wait to account for port_base_addr 9b649f4c5672 net: phy: marvell10g: fix return value on error 21bf1dc99db4 net: bcmgenet: hide status block before TX timestamping abff341ac2f9 cpufreq: qcom-cpufreq-hw: Clear dcvs interrupts 7356c1f0ae47 clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource() 409789e2cec5 bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create() 45b7fca32bbc tcp: make sure treq->af_specific is initialized 6c4d4334e573 tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT 6b59df7d4d0a ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode e5e985dd99d8 ip6_gre: Make o_seqno start from 0 in native mode 2dec240fb161 ip_gre: Make o_seqno start from 0 in native mode 479dc5d15316 net/smc: sync err code when tcp connection was refused 8c59a61ffb11 net: hns3: add return value for mailbox handling in PF fc480b465ab6 net: hns3: add validity check for message data length cfedc70d3c63 net: hns3: modify the return code of hclge_get_ring_chain_from_mbx 88c39408187c net: hns3: clear inited state and stop client after failed to register netdev ac01adfa7d6d cpufreq: fix memory leak in sun50i_cpufreq_nvmem_probe cdc350a76925 pinctrl: pistachio: fix use of irq_of_parse_and_map() 111827dfea31 arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock a621f6ce1fb3 ARM: dts: imx6ull-colibri: fix vqmmc regulator 5a4da2e23351 sctp: check asoc strreset_chunk in sctp_generate_reconf_event 37a04788c573 wireguard: device: check for metadata_dst with skb_valid_dst() d632cba7dee7 tcp: ensure to use the most recently sent skb when filling the rate sample e9b1a51c3297 pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested eb90a4269c20 tcp: md5: incorrect tcp_header_len for incoming connections eea166561f7c pinctrl: rockchip: fix RK3308 pinmux bits 86d8076e5971 bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook c2a69ac00b42 netfilter: nft_set_rbtree: overlap detection with element re-addition after deletion 9cc897ca03df net: dsa: Add missing of_node_put() in dsa_port_link_register_of 72e7940b00b5 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode 2075f6f8e627 pinctrl: stm32: Do not call stm32_gpio_get() for edge triggered IRQs in EOI 291ee6787b35 mtd: fix 'part' field data corruption in mtd_info 6465a2120b23 mtd: rawnand: Fix return value check of wait_for_completion_timeout 102775603cd9 pinctrl: mediatek: moore: Fix build error d3dfa4954e35 phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe() b347b850a49f ipvs: correctly print the memory size of ip_vs_conn_tab 12d3fd4d8c49 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35 6b4928990b14 ARM: dts: am3517-evm: Fix misc pinmuxing 6476c49e8e31 ARM: dts: Fix mmc order for omap3-gta04 4e81598e2122 interconnect: qcom: sdx55: Drop IP0 interconnects 344558d201bb phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe cf6f119f8244 phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe 49c7d87f19d4 ARM: dts: at91: fix pinctrl phandles 7ecb2639eb8a ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name 1e68040245ad ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek 555bcbb7d0ff phy: ti: omap-usb2: Fix error handling in omap_usb2_enable_clocks d60abf246aa5 ARM: dts: dra7: Fix suspend warning for vpe powerdomain 127295f86f70 bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific 033cac39d0b7 ARM: OMAP2+: Fix refcount leak in omap_gic_of_init a933ee691dbd phy: samsung: exynos5250-sata: fix missing device put in probe error paths 3c8a02347f84 phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe bb0f3522cf42 arm64: dts: meson-sm1-bananapi-m5: fix wrong GPIO pin labeling for CON1 0f8e303faf88 arm64: dts: imx8mn: Fix SAI nodes f1266c4eba8a ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue 7596c4576a0e USB: Fix xhci event ring dequeue pointer ERDP update issue 11baa5edf37d arm64: dts: imx8qm: Correct SCU clock controller's compatible property d84f8327af13 xsk: Fix l2fwd for copy mode + busy poll combo 3ec920d755ae mtd: rawnand: fix ecc parameters for mt7622 9e4dedb8ec72 iio:imu:bmi160: disable regulator in error path d583cd6afc3b arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards 9f878775fceb arm64: dts: meson: remove CPU opps below 1GHz for G12B boards 4df1584738f1 video: fbdev: udlfb: properly check endpoint type 1ad0832e8712 cpufreq: qcom-cpufreq-hw: Fix throttle frequency value on EPSS platforms 38ac9ca93252 cpufreq: qcom-hw: fix the race between LMH worker and cpuhp 08b036bac865 virtio_net: fix wrong buf address calculation when using xdp 10f24144ca48 iocost: don't reset the inuse weight of under-weighted debtors 559d4f45958b x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests 95ad6bef5bf1 riscv: patch_text: Fixup last cpu should be master 3437091fcc2f hex2bin: fix access beyond string end 4541645b5881 hex2bin: make the function hex_to_bin constant-time 41dee1832617 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config 8f2dac58b39e arm64: dts: imx8mm-venice: fix spi2 pin configuration 34b5d2aa355a bus: mhi: host: pci_generic: Flush recovery worker during freeze b3d21deabcbe bus: mhi: host: pci_generic: Add missing poweroff() PM callback 732f861dd480 ceph: fix possible NULL pointer dereference for req->r_session 2b008197a06b arch_topology: Do not set llc_sibling if llc_id is invalid 03cab849da1a serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device 9445505273a5 serial: 8250: Also set sticky MCR bits in console restoration ac55cac5dcd4 serial: amba-pl011: do not time out prematurely when draining tx fifo 858d93280e83 serial: imx: fix overrun interrupts in DMA mode c0ea202fbc85 usb: phy: generic: Get the vbus supply dd2af3ad968f usb: cdns3: Fix issue for clear halt endpoint 455285db8717 usb: dwc3: pci: add support for the Intel Meteor Lake-P 0d1c407b1a74 usb: dwc3: gadget: Return proper request status 7d14c96bff09 usb: dwc3: core: Only handle soft-reset in DCTL 5d8299ead7c5 usb: dwc3: core: Fix tx/rx threshold settings b81be940eaca usb: dwc3: Try usb-role-switch first in dwc3_drd_init 9f051e510cd2 usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind() f9b2660d9c10 usb: gadget: uvc: Fix crash when encoding data for usb request e5e7d6c4b305 usb: typec: ucsi: Fix role swapping 3e5dd4cf30fe usb: typec: ucsi: Fix reuse of completion structure 6bf55f6b0ebf usb: core: Don't hold the device lock while sleeping in do_proc_control() 949d422949ee usb: misc: fix improper handling of refcount in uss720_probe() a590353a9506 iio: imu: inv_icm42600: Fix I2C init possible nack 7619f3c498a2 iio: magnetometer: ak8975: Fix the error handling in ak8975_power_on() 28e1f974e3e7 iio: dac: ad5446: Fix read_raw not returning set value cd266c38aaa4 iio: dac: ad5592r: Fix the missing return value. 48bc03979f30 xhci: increase usb U3 -> U0 link resume timeout from 100ms to 500ms 9faa311f65b0 xhci: stop polling roothubs after shutdown 10e0d30f99f4 xhci: Enable runtime PM on second Alderlake controller 576b40690e91 usb: xhci: tegra:Fix PM usage reference leak of tegra_xusb_unpowergate_partitions 4ebf2982db15 USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions be94d697baab USB: serial: option: add support for Cinterion MV32-WA/MV32-WB bb73ae98f086 USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader f183708e8ecc USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS 7f8fc606893c USB: quirks: add STRING quirk for VCOM device 96a5999e1f62 USB: quirks: add a Realtek card reader 0da0ac894129 usb: mtu3: fix USB 3.0 dual-role-switch from device to host Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 8017b8b05ad8c071f7fb56bfd8e983d9361b8c46) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 5bc02623e9..6bfb8deb1e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "0098c71753fab42ea29a58b8c39ae8852a0819b8" -SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4" +SRCREV_machine ?= "b028c4baada43d48014d4350dd66debe7e4cf362" +SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.37" +LINUX_VERSION ?= "5.15.38" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 4d2e9facda..0cf2d68d56 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.37" +LINUX_VERSION ?= "5.15.38" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "73e5fcde1e4d7b3ef0f122e309bf6feda2214133" -SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4" +SRCREV_machine ?= "7b1fe61102fd6efc26373305417cd683687eb7a0" +SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index a0af1f93cf..206cc0692d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "487f0d10355bc4ea900c6cbfb6ba156541449263" -SRCREV_machine:qemuarm64 ?= "623ef2010028407442669ed9d3a50a86ad4031aa" -SRCREV_machine:qemumips ?= "d07fd1d207673b466616e5f806d97e2834ef35b2" -SRCREV_machine:qemuppc ?= "cbe3228711c2f3df43ffb3d865ef09dd91fb7100" -SRCREV_machine:qemuriscv64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" -SRCREV_machine:qemuriscv32 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" -SRCREV_machine:qemux86 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" -SRCREV_machine:qemux86-64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" -SRCREV_machine:qemumips64 ?= "08d20206727ae27296a3acf27a4fc6c9bdb874da" -SRCREV_machine ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520" -SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4" +SRCREV_machine:qemuarm ?= "5a68f2d15d17f0f3c397e7f8c83f3f664f7037e5" +SRCREV_machine:qemuarm64 ?= "00e666e6154fcdf52268f2a5a612b96afad073b0" +SRCREV_machine:qemumips ?= "fb9e75076deade31754b7ad644952d63137e616b" +SRCREV_machine:qemuppc ?= "49f6567f3b85a843e8b6042a79c58aab0bdbd0c9" +SRCREV_machine:qemuriscv64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" +SRCREV_machine:qemuriscv32 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" +SRCREV_machine:qemux86 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" +SRCREV_machine:qemux86-64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c" +SRCREV_machine:qemumips64 ?= "1ad01ab47ec056d4126798f6d57a33b65b2be49c" +SRCREV_machine ?= "cc9695f5fd3b520464eb2ded66950734f308525c" +SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "4bf7f350c1638def0caa1835ad92948c15853916" +SRCREV_machine:class-devupstream ?= "3fbf24b73f4a5bc8fd39a6b7a29145451c1039ce" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.37" +LINUX_VERSION ?= "5.15.38" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jun 2 16:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8761 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 E4C88CCA478 for ; Thu, 2 Jun 2022 16:52:43 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web12.1560.1654188745315419437 for ; Thu, 02 Jun 2022 09:52:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5P6NXWoI; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id v5-20020a17090a7c0500b001df84fa82f8so5290907pjf.5 for ; Thu, 02 Jun 2022 09:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yZJp7J31JiQrX1C8Bsbs3iMEBfJNBxfw4d5XpM2lx3M=; b=5P6NXWoI1Nh4tk0K2oEEDcrnvwUFilLmIuFQBC/2rNcstQnZQWT0dEBp3BQkiV728q ltG6+VdC3s+U22rg0e6FhnziD91PyjPKNr8/cGHR447H6naxQ/hy/8eINwncKfx1X6bd 5iNjdCAwjKABNIoSy5DEQDXvjkQHjReOOrsRUKeOXJWFW9L8DFCZgNzwYm38rKOG0JNE YOwRvvETiR0PG3xNkmYcLphBYQ4un+W9Sm4EzYSDn+INzEdpvXE6M+ZNfPK78Xy+EgQy 09dxgAI8D3cJUTmrjfWT7IYNGO5G/SEWdm+M8V4u8dqoMAXFpm3AalG1mk1qgcPQdIsM 4V1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yZJp7J31JiQrX1C8Bsbs3iMEBfJNBxfw4d5XpM2lx3M=; b=UsR/RhFut1/YuTUNi3PMUjKj7kM13noX7nMxTNr4PXmwNVOASRvur299el1NCIerfC U1S4vvxGf+bMC+F9o8gqnm+i0Q3FOL1tAcN1vHucY0XzMAc5gvwW6V9YdQJM/wtMmDXd 0nqsUSIDCTR1+1M5sfaoC9M3uaquUhFs9xdg0O/f3KZ9gJghFxz1aULT+wTbuNGbBs1j RdHiox+S8i3olx6hjZwR+CsgqsEPQ7HrFSL8xE0oBFS6zlJwfDKhAXDH/ZSinPrLpPnZ NVeG38XKFLZM4Q6EAXd0YQQ2LVhLNQ6b3JB7EpjxeZBxFNFKZB1GvHnCR3+KGKVA/I0L dsLQ== X-Gm-Message-State: AOAM530kN+q99zjNSmTSrS3JCHHaLXQtGjXj9FShzoM8KoXXEQGBSyyJ xqD3FveP2JidAhesWaZqNpXLhzV5X0Izahln X-Google-Smtp-Source: ABdhPJwkmcc/sfXoGiCqrcDKzD+/aQVK8biVDCHH5ZkaviE4D+ekofgqYRH1vsrSYdJLEgeSlCd4og== X-Received: by 2002:a17:903:210:b0:15e:f139:f901 with SMTP id r16-20020a170903021000b0015ef139f901mr6098436plh.66.1654188759298; Thu, 02 Jun 2022 09:52:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/26] linux-yocto/5.10: update to v5.10.114 Date: Thu, 2 Jun 2022 06:51:44 -1000 Message-Id: <02982668ac4199b9c3a2680b6d0989a7a9b0eee4.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166489 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: f40e35e79c11 Linux 5.10.114 2d74f61787e6 perf symbol: Remove arch__symbols__fixup_end() bf98302e689d tty: n_gsm: fix software flow control handling 95b267271a7d tty: n_gsm: fix incorrect UA handling 70b045d9ae4f tty: n_gsm: fix reset fifo race condition 320a24c4ef44 tty: n_gsm: fix wrong command frame length field encoding 935f314b6fdb tty: n_gsm: fix wrong command retry handling 17b86db43c00 tty: n_gsm: fix missing explicit ldisc flush a2baa907c281 tty: n_gsm: fix wrong DLCI release order 705925e69360 tty: n_gsm: fix insufficient txframe size 842a9bbbeff1 netfilter: nft_socket: only do sk lookups when indev is available 7346e54dbf5b tty: n_gsm: fix malformed counter for out of frame data d19613895e15 tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 26f127f6d938 tty: n_gsm: fix mux cleanup after unregister tty device f26c271492b6 tty: n_gsm: fix decoupled mux resource 47132f9f7f76 tty: n_gsm: fix restart handling via CLD command b3c88d46db76 perf symbol: Update symbols__fixup_end() 3d0a3168a364 perf symbol: Pass is_kallsyms to symbols__fixup_end() 2ab14625b879 x86/cpu: Load microcode during restore_processor_state() 795afbe8b40c thermal: int340x: Fix attr.show callback prototype 11d16498d737 net: ethernet: stmmac: fix write to sgmii_adapter_base 236dd6223051 drm/i915: Fix SEL_FETCH_PLANE_*(PIPE_B+) register addresses 78d4dccf1601 kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time 5fef6df2731f zonefs: Clear inode information flags on inode creation 92ed64a9205b zonefs: Fix management of open zones 42e8ec3b4be8 powerpc/perf: Fix 32bit compile ac3d0770437e drivers: net: hippi: Fix deadlock in rr_close() 5399e7b80c37 cifs: destage any unwritten data to the server before calling copychunk_write 80fc45377f41 x86: __memcpy_flushcache: fix wrong alignment if size > 2^32 585ef03c9e79 ext4: fix bug_on in start_this_handle during umount filesystem 07da0be58853 ASoC: wm8731: Disable the regulator when probing fails 1b1747ad7e88 ASoC: Intel: soc-acpi: correct device endpoints for max98373 aa138efd2bbf tcp: fix F-RTO may not work correctly when receiving DSACK 9d56e369bd4f Revert "ibmvnic: Add ethtool private flag for driver-defined queue limits" 96904c828991 ibmvnic: fix miscellaneous checks 17f71272ef41 ixgbe: ensure IPsec VF<->PF compatibility c33d717e064a net: fec: add missing of_node_put() in fec_enet_init_stop_mode() 9591967ac4d5 bnx2x: fix napi API usage sequence 1781beb87935 tls: Skip tls_append_frag on zero copy size 77b922683e9e drm/amd/display: Fix memory leak in dcn21_clock_source_create 18068e0527d4 drm/amdkfd: Fix GWS queue count c0396f5e5bba net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK 1204386e2657 net: phy: marvell10g: fix return value on error e974c730f0af net: bcmgenet: hide status block before TX timestamping ee71b47da599 clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource() 8dacbef4fe58 bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create() 9f29f6f8da9e tcp: make sure treq->af_specific is initialized 8a9d6ca3608f tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT 720b6ced8549 ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode 41661b4c1ab1 ip6_gre: Make o_seqno start from 0 in native mode 7b187fbd7e38 ip_gre: Make o_seqno start from 0 in native mode 83d128daff2e net/smc: sync err code when tcp connection was refused 9eb25e00f59b net: hns3: add return value for mailbox handling in PF 929c30c02de4 net: hns3: add validity check for message data length e3ec78d82d48 net: hns3: modify the return code of hclge_get_ring_chain_from_mbx 06a40e71053a cpufreq: fix memory leak in sun50i_cpufreq_nvmem_probe fb172e93f861 pinctrl: pistachio: fix use of irq_of_parse_and_map() 8f042884aff8 arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock 73c35379dbdf ARM: dts: imx6ull-colibri: fix vqmmc regulator 61a89d0a5bce sctp: check asoc strreset_chunk in sctp_generate_reconf_event 41d6ac687da8 wireguard: device: check for metadata_dst with skb_valid_dst() 3c464db03c12 tcp: ensure to use the most recently sent skb when filling the rate sample ce4c3f708787 pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested 0c60271df026 tcp: md5: incorrect tcp_header_len for incoming connections f4dad5a48db5 pinctrl: rockchip: fix RK3308 pinmux bits 9ef33d23f86f bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook 6ac03e6ddde9 netfilter: nft_set_rbtree: overlap detection with element re-addition after deletion 72ae15d5ce5f net: dsa: Add missing of_node_put() in dsa_port_link_register_of 14cc2044c17e memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode 690c1bc4bfcf pinctrl: stm32: Do not call stm32_gpio_get() for edge triggered IRQs in EOI 6f2bf9c5ddfe mtd: fix 'part' field data corruption in mtd_info 4da421035baa mtd: rawnand: Fix return value check of wait_for_completion_timeout 94ca69b70225 pinctrl: mediatek: moore: Fix build error 123b7e0388e7 ipvs: correctly print the memory size of ip_vs_conn_tab f4446f213623 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35 4a526cc29cba ARM: dts: am3517-evm: Fix misc pinmuxing b622bca852f6 ARM: dts: Fix mmc order for omap3-gta04 9419d27fe142 phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe 9e00a6e1fd71 phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe eb659608e61e ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name bb524f5a95f2 ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek 4691ce8f28da phy: ti: omap-usb2: Fix error handling in omap_usb2_enable_clocks 76d1591a38c6 bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific 1b9855bf31e2 ARM: OMAP2+: Fix refcount leak in omap_gic_of_init 93cc8f184e3c phy: samsung: exynos5250-sata: fix missing device put in probe error paths 3ca74915702e phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe 8f7644ac24ba ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue 23b0711fcd3c USB: Fix xhci event ring dequeue pointer ERDP update issue 712302aed104 mtd: rawnand: fix ecc parameters for mt7622 207c7af3418f iio:imu:bmi160: disable regulator in error path 70d2df257eed arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards 2d320609be49 arm64: dts: meson: remove CPU opps below 1GHz for G12B boards c4fb41bdf4d6 video: fbdev: udlfb: properly check endpoint type 0967830e720d iocost: don't reset the inuse weight of under-weighted debtors ad604cbd1d54 x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests 8fcce58c59dd riscv: patch_text: Fixup last cpu should be master 51477d3b387b hex2bin: fix access beyond string end 616d354fb9e8 hex2bin: make the function hex_to_bin constant-time 1633cb2d4a1d pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config bdc3ad925131 arch_topology: Do not set llc_sibling if llc_id is invalid aaee3f661799 serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device 662f945a2091 serial: 8250: Also set sticky MCR bits in console restoration 8be962c89de6 serial: imx: fix overrun interrupts in DMA mode d22d92230ffb usb: phy: generic: Get the vbus supply b820764c6450 usb: cdns3: Fix issue for clear halt endpoint bd7f84708ea0 usb: dwc3: gadget: Return proper request status a633b8c34149 usb: dwc3: core: Only handle soft-reset in DCTL 5fa59bb867a0 usb: dwc3: core: Fix tx/rx threshold settings 140801d3fbd3 usb: dwc3: Try usb-role-switch first in dwc3_drd_init 4dd5feb27939 usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind() 6c3da0e19c98 usb: gadget: uvc: Fix crash when encoding data for usb request fb1fe1a4557a usb: typec: ucsi: Fix role swapping 06826eb0631c usb: typec: ucsi: Fix reuse of completion structure 7b510d4bb468 usb: misc: fix improper handling of refcount in uss720_probe() bb8ecca2ddf9 iio: imu: inv_icm42600: Fix I2C init possible nack ca2b54b6ad69 iio: magnetometer: ak8975: Fix the error handling in ak8975_power_on() 1060604fc7f2 iio: dac: ad5446: Fix read_raw not returning set value 6ff33c01befb iio: dac: ad5592r: Fix the missing return value. 06ada9487f24 xhci: increase usb U3 -> U0 link resume timeout from 100ms to 500ms e1be0001664d xhci: stop polling roothubs after shutdown 2eb6c8689146 xhci: Enable runtime PM on second Alderlake controller 63eda431b2f7 USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions e9971dac69a3 USB: serial: option: add support for Cinterion MV32-WA/MV32-WB 34ff5455eed2 USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader 729a81ae101b USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS 008ba29f339d USB: quirks: add STRING quirk for VCOM device ac6ad0ef83cf USB: quirks: add a Realtek card reader 8ba02cebb734 usb: mtu3: fix USB 3.0 dual-role-switch from device to host 549209caabc8 lightnvm: disable the subsystem 54c028cfc496 floppy: disable FDRAWCMD by default Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit e222f60784034809b4d81a77fcca54669237915b) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 62d7494b88..ad206e4235 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "88b754b80392e1f1ac7df46595f9712edc8aec02" -SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" +SRCREV_machine ?= "a8d19259c63cbf1254fe545d0a1aacf8f82547ac" +SRCREV_meta ?= "b368b4c1c8ee0e0e7573caa7f1596c3385ad855f" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.113" +LINUX_VERSION ?= "5.10.114" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index e0c693fed2..9a8e6ecffc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.113" +LINUX_VERSION ?= "5.10.114" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine:qemuarm ?= "7dacc8332b0bc5600d97583f45b841c9724f2191" -SRCREV_machine ?= "8dc46fa883d7b9a3412791f6731096e2e516d949" -SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" +SRCREV_machine:qemuarm ?= "a0664baa09b1c6265bd404e4d3a7ceb14577dcb8" +SRCREV_machine ?= "63b2e48029f00bfc90371adc378050181ba5d253" +SRCREV_meta ?= "b368b4c1c8ee0e0e7573caa7f1596c3385ad855f" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 37f2db88a7..ffd9538633 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,23 +13,23 @@ KBRANCH:qemux86 ?= "v5.10/standard/base" KBRANCH:qemux86-64 ?= "v5.10/standard/base" KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "6092497574895b1179a3c7a9e07c7f40c2d4c136" -SRCREV_machine:qemuarm64 ?= "97ad6c5f9ffdb6b108cbbf99d9061dd0fe03e4e8" -SRCREV_machine:qemumips ?= "e53b2d1867f7bdc2c0cc904a15992178688c3ad4" -SRCREV_machine:qemuppc ?= "b12ed76165bfc9fe2b99fcc224b5e0134b7b533f" -SRCREV_machine:qemuriscv64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" -SRCREV_machine:qemuriscv32 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" -SRCREV_machine:qemux86 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" -SRCREV_machine:qemux86-64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" -SRCREV_machine:qemumips64 ?= "07580586b738406b4dec9bf91d4eecdb933f2a07" -SRCREV_machine ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" -SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" +SRCREV_machine:qemuarm ?= "49e2af0d85dc824c7829427c18e06ad2b1abbb8d" +SRCREV_machine:qemuarm64 ?= "2b403ec0a7f60be807890902dbd0d5467bdef545" +SRCREV_machine:qemumips ?= "793de0c2e4a3aa0e2f3091af8ff06df35f156fb3" +SRCREV_machine:qemuppc ?= "9875eb3923e3d20893774ee7304142e2ce5ab22b" +SRCREV_machine:qemuriscv64 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437" +SRCREV_machine:qemuriscv32 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437" +SRCREV_machine:qemux86 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437" +SRCREV_machine:qemux86-64 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437" +SRCREV_machine:qemumips64 ?= "4c3d57cc8bec91ea6225a7c9f134fd97bc1e8e0d" +SRCREV_machine ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437" +SRCREV_meta ?= "b368b4c1c8ee0e0e7573caa7f1596c3385ad855f" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.113" +LINUX_VERSION ?= "5.10.114" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Thu Jun 2 16:51:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8762 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 E052EC433EF for ; Thu, 2 Jun 2022 16:52:43 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web08.1505.1654188762827917563 for ; Thu, 02 Jun 2022 09:52:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cKn81Hid; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id p8so5223030pfh.8 for ; Thu, 02 Jun 2022 09:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aF9SQgilysgMTZY631PXyJUdfyKhtVEumUlRgkbZp4c=; b=cKn81HidA33sd8Og1UXKL27391qeOvcJMgHTyNJQhS4c6vNhVKxCTgUr/lcRoIwFZT vRsL02EMbebhUQJj2BDzQ3Rx8yxayBlCjX1E2NnhcZnrYO9cGH48oAv9+RbY4LtR+5To amMU0R75udy9kD8/+fLR815lNTU6OtdJBCYrEVLsl6OQwk1cQ7HELJ02z4qmVp7dqKep zyKy96KNjDp1DX15ow4x5RPEgXPILKcwEV5G5D8GUyXZYTLKMSIVWzR5Z6rcpw/NNI6D h4z2PEcBRwC1LHgIsenXPZZRKiLgdCJNP4YWxN2SH1R2obs2lZo3RYhxwaiyz7IUfSHa Pv4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aF9SQgilysgMTZY631PXyJUdfyKhtVEumUlRgkbZp4c=; b=BRnjBMxfuvwuUsFDL82/uvOEx3UxrxmqFaBbwTkX6mh6brnvUkvOyEuHGWxuYLuSzm +Sq++LBgpAhN4fHeNTcZgQvEwmc/Se/l/0vgH9PQ9x6vM4m0paga1t1d4yG5RpFA7EpE l2M1wV6NX+p8uXke7+0qvE4JFBd0tSLNaAVHZ9sKIe0AMueOAatigXOYUFQ2WUC/vDB5 E+8xJ1+SihZGrq55ryLU01dxET5+067g5kgaBKohT83R7iimBxBsPl/TNHJFctRvTV76 Ae9gWjO1NUe2nLoSA0VwifR0YLrH3Dm92x6sOO/QJjh0Ti4caeKqSgABjq8GXebXt6DK SJsw== X-Gm-Message-State: AOAM533o83CcWroE8bxRivsnrP7DYprLiPCoZuQ99mvBYXC2ko8vz9UF iqiJx+n+Bwg6GW+/v1HLAFgML8nGpE4zVIU9 X-Google-Smtp-Source: ABdhPJx9u8E5QpRSAbjI+xDRZm20lB44Zki3sSnLSCTj9hZQeeBhpp2Jfs9BIINrjJ9CPVqWrO6Sxg== X-Received: by 2002:a63:4f15:0:b0:3fb:fa13:9209 with SMTP id d21-20020a634f15000000b003fbfa139209mr5019842pgb.290.1654188761562; Thu, 02 Jun 2022 09:52:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/26] libpcre2: upgrade 10.39 -> 10.40 Date: Thu, 2 Jun 2022 06:51:45 -1000 Message-Id: <9cf49b4f07afcf48a5e6d1ed12d0959d5d040e00.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166490 From: Davide Gardenal Security fixes and update to Unicode property handling. Upstream release notes: https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.40 CVE: CVE-2022-1587 Signed-off-by: Davide Gardenal Signed-off-by: Steve Sakoman --- .../libpcre/libpcre2/CVE-2022-1586.patch | 58 ------------------- .../{libpcre2_10.39.bb => libpcre2_10.40.bb} | 5 +- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-support/libpcre/libpcre2/CVE-2022-1586.patch rename meta/recipes-support/libpcre/{libpcre2_10.39.bb => libpcre2_10.40.bb} (90%) diff --git a/meta/recipes-support/libpcre/libpcre2/CVE-2022-1586.patch b/meta/recipes-support/libpcre/libpcre2/CVE-2022-1586.patch deleted file mode 100644 index 10d88d7b73..0000000000 --- a/meta/recipes-support/libpcre/libpcre2/CVE-2022-1586.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e881ed5028622959cf8859c053501fb1b16387f1 Mon Sep 17 00:00:00 2001 -From: Hitendra Prajapati -Date: Mon, 23 May 2022 13:52:39 +0530 -Subject: [PATCH] CVE-2022-1586 - -Upstream-Status: Backport from https://github.com/PCRE2Project/pcre2/commit/50a51cb7e67268e6ad417eb07c9de9bfea5cc55a - -Signed-off-by: Hitendra Prajapati ---- - ChangeLog | 3 +++ - src/pcre2_jit_compile.c | 2 +- - src/pcre2_jit_test.c | 3 +++ - 3 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index d27542d..cd3da65 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -63,6 +63,9 @@ Version 10.39 29-October-2021 - - Reformat slightly to make it C89 compatible again. - -+23. Fixed a unicode properrty matching issue in JIT. The character was not -+fully read in caseless matching. -+ - - Version 10.38 01-October-2021 - ----------------------------- -diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c -index db2ce65..5baca9b 100644 ---- a/src/pcre2_jit_compile.c -+++ b/src/pcre2_jit_compile.c -@@ -7473,7 +7473,7 @@ while (*cc != XCL_END) - { - SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP); - cc++; -- if (*cc == PT_CLIST) -+ if (*cc == PT_CLIST && *cc == XCL_PROP) - { - other_cases = PRIV(ucd_caseless_sets) + cc[1]; - while (*other_cases != NOTACHAR) -diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c -index 8dee16e..7bb307e 100644 ---- a/src/pcre2_jit_test.c -+++ b/src/pcre2_jit_test.c -@@ -412,6 +412,9 @@ static struct regression_test_case regression_test_cases[] = { - { MUP, A, 0, 0 | F_PROPERTY, "[\\P{L&}]{2}[^\xc2\x85-\xc2\x89\\p{Ll}\\p{Lu}]{2}", "\xc3\xa9\xe6\x92\xad.a\xe6\x92\xad|\xc2\x8a#" }, - { PCRE2_UCP, 0, 0, 0 | F_PROPERTY, "[a-b\\s]{2,5}[^a]", "AB baaa" }, - { MUP, 0, 0, 0 | F_NOMATCH, "[^\\p{Hangul}\\p{Z}]", " " }, -+ { MUP, 0, 0, 0, "[\\p{Lu}\\P{Latin}]+", "c\xEA\xA4\xAE,A,b" }, -+ { MUP, 0, 0, 0, "[\\x{a92e}\\p{Lu}\\P{Latin}]+", "c\xEA\xA4\xAE,A,b" }, -+ { CMUP, 0, 0, 0, "[^S]\\B", "\xe2\x80\x8a" }, - - /* Possible empty brackets. */ - { MU, A, 0, 0, "(?:|ab||bc|a)+d", "abcxabcabd" }, --- -2.35.3 - diff --git a/meta/recipes-support/libpcre/libpcre2_10.39.bb b/meta/recipes-support/libpcre/libpcre2_10.40.bb similarity index 90% rename from meta/recipes-support/libpcre/libpcre2_10.39.bb rename to meta/recipes-support/libpcre/libpcre2_10.40.bb index 36c51d700a..3843d43b69 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.39.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.40.bb @@ -8,14 +8,13 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=43cfa999260dd853cd6cb174dc396f3d" +LIC_FILES_CHKSUM = "file://LICENCE;md5=41bfb977e4933c506588724ce69bf5d2" SRC_URI = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2 \ - file://CVE-2022-1586.patch \ " UPSTREAM_CHECK_URI = "https://github.com/PhilipHazel/pcre2/releases" -SRC_URI[sha256sum] = "0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440" +SRC_URI[sha256sum] = "14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68" CVE_PRODUCT = "pcre2" From patchwork Thu Jun 2 16:51:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8766 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 E14BACCA47A for ; Thu, 2 Jun 2022 16:52:53 +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.web08.1502.1654188747732108168 for ; Thu, 02 Jun 2022 09:52:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=HR/ZJZSK; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d22so4967583plr.9 for ; Thu, 02 Jun 2022 09:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gFdJmle6sBVlNvoYJg1HU9ERoQn71czKUHC5DBYrgc0=; b=HR/ZJZSKhkP8/jywXE5HE5r+eBbmShikqLmaWCNq+RkiEjHP/e8NJTlggKoninPffX 1hnuICSJ9FebRPRXWTOVcf1S89af772p/mnrfNbsG5Y9RnMurHn20naghjlbso/R0Lhj TSajzQ9V5+jUq7c9ocU581D3nqQrC9giMX5SYYHgm4tDWuI9JSeHnBilgCmow3znR2cI eLxI08bNJvWX8yAD2ETadHHTZh9ufkyr0pHCrSAUTozq0GE3ZCY8o7gFdbNHiBgDBis9 NCJDtFUB3oXtXiWDkn2zWUL9TLUumsTE2paE/KuT0dzuKMVm3el+5TI4o+8UX1HxHGNL hg5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gFdJmle6sBVlNvoYJg1HU9ERoQn71czKUHC5DBYrgc0=; b=tzyYQ4dr8IaYlKtpzIuv6nY936ke51zOc+T8+JrIjgQ5wl0JhyPcKNrU0STjwkf192 rmDblL/xlayO51+rxkB6hAMY12NLmCIeDA/ctaKtg7qy169Emgm2OE+BaJGxTJp9OMbz jUnz+CD/IFZVzFyCCb96fFbHWR40mv2JK8+DL8pR4JwkSeN+3wkobZtj1Kez2Veegvya LAf2iyUoEapERkzaU81+T/ookZw2xwXuXUJJGf9ezRa7BJfdBB7T00081Q+5Y1zwIooC 2n7VhwtQA7YJV0n0ifQ/QtAtOzBCqnf1wrKh+RksGWBz3wGjEweinU0UAr9MT/+bGxCy 4HFA== X-Gm-Message-State: AOAM5320Dwh6CqbzU7UJtAv43lZ3Wz7YKJnDyKZW+XG5o95uqlKmlbLo JcrGefvQh7SPwbagj1wTNx/xYktn/ZDnKbns X-Google-Smtp-Source: ABdhPJxq/cIiLftPbSC27lapfmUvhHj0U8SQ5Aj8b3S7YF1askOGMkqa8v9VPPG9nPztLadKeAzSug== X-Received: by 2002:a17:903:240e:b0:163:e057:6cf9 with SMTP id e14-20020a170903240e00b00163e0576cf9mr5697351plo.29.1654188764418; Thu, 02 Jun 2022 09:52:44 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/26] ncurses: update to patchlevel 20220423 Date: Thu, 2 Jun 2022 06:51:46 -1000 Message-Id: <862c1b109cf8f31522a250cc9ff4146fe526450c.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166491 From: Davide Gardenal CVE: CVE-2022-29458 Signed-off-by: Davide Gardenal Signed-off-by: Steve Sakoman --- meta/recipes-core/ncurses/ncurses.inc | 2 +- .../ncurses/{ncurses_6.3.bb => ncurses_6.3+20220423.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-core/ncurses/{ncurses_6.3.bb => ncurses_6.3+20220423.bb} (77%) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 7a7c7dd227..1abcfae1fe 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9529289636145d1bf093c96af067695a;endline=27" +LIC_FILES_CHKSUM = "file://COPYING;md5=c5a4600fdef86384c41ca33ecc70a4b8;endline=27" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS:class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.3.bb b/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb similarity index 77% rename from meta/recipes-core/ncurses/ncurses_6.3.bb rename to meta/recipes-core/ncurses/ncurses_6.3+20220423.bb index f0256dad22..f67a3f5bf4 100644 --- a/meta/recipes-core/ncurses/ncurses_6.3.bb +++ b/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb @@ -5,10 +5,10 @@ SRC_URI += "file://0001-tic-hang.patch \ file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ " # commit id corresponds to the revision in package version -SRCREV = "51d0fd9cc3edb975f04224f29f777f8f448e8ced" +SRCREV = "a0bc708bc6954b5d3c0a38d92b683c3ec3135260" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)$" # This is needed when using patchlevel versions like 6.1+20181013 -#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" +CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" From patchwork Thu Jun 2 16:51:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8767 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 D9946C43334 for ; Thu, 2 Jun 2022 16:52:53 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web09.1535.1654188768476044096 for ; Thu, 02 Jun 2022 09:52:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Edgs5ADw; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id y189so5199227pfy.10 for ; Thu, 02 Jun 2022 09:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gYab1GisB/b7Jw/nb84Ps+gwJ7ktO4NoqYt/YBPbUic=; b=Edgs5ADwiUaLCX0E5h99pk4ZeGhsACeuHvdBk8sTEawkhzF7fT2qfEh3z0eBiHGH+2 a1HN/qvtUPsvax3cicYT15YLsUaZ7KjnYIksbrQQydl4VaKnVSxGB2q2H9gcVByVTJkv DRFYNEqjqVS2q8SS3AkSH7Y7u6LR7mLZ0FqPjhxDAs/tG/0aS4YWMmJ6tB4HzCeTnToY umBgY0RfD7FYwU0cxC1aIoTpd22yzfprqzNlamB/B4pWOMKBy5Az7jKqpAaSMbaBIXi2 M272wpav35uyg+5oFztAmq+kmB0u8DLMyhfLoHo7d6bhxiE2wC8BqxSx4XyFmMzftvkc VVtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gYab1GisB/b7Jw/nb84Ps+gwJ7ktO4NoqYt/YBPbUic=; b=YWd5Lx8ASw/modQVzBdvinEcuq/ua3EEWzZSOLZSwFbu7f8G12EgG6s3rsBdD2DV2m EhQ6F2Hf9Nuc1mLdua2B5peZYW8vu/lYUxO40QsbZd9BeS1A2APpaolab1CaLNWJj3PB CDzksD7nEmX/MeJ07r0/+adqPK95CsyVvdz2XGAWG/o/hwJt4of5wAAbT+sve8VNc5V2 misSuyn+LrvYmC9FAKqhckzv6nwWibfwnXApf+6sWjN6q4pUwaUGGDH1fI9WAsKWr9A8 VaNJuzA5lC3b/ARRIzqDrO4Bv8jEMkVG/Y0xjPVIuLd3QekoDFJlA3i6W6eaeQ0fccn9 vNOQ== X-Gm-Message-State: AOAM533TXtAG+GnWehXYHc38bHYWz7aLLZdcx1S0lMlYB4O/A49k60FF 9/gClipOc0MS3lJ266mWkl46/Kr9GAszOlM+ X-Google-Smtp-Source: ABdhPJxDlY7KrabeJHYdhUjaWPsmAf541+hhkDIpF9fmket/3gZNdXg5to+8ivSJNN+9vJxZu8alJA== X-Received: by 2002:a65:63d1:0:b0:3c6:25b2:22ba with SMTP id n17-20020a6563d1000000b003c625b222bamr4996247pgv.360.1654188767287; Thu, 02 Jun 2022 09:52:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/26] mesa.inc: package 00-radv-defaults.conf Date: Thu, 2 Jun 2022 06:51:47 -1000 Message-Id: <8d5f5823b357e5bba107511f62cfd0777da2e401.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166492 From: Markus Volk this fixes: ERROR: mesa-2_22.0.2-r0 do_package: QA Issue: mesa: Files/directories were installed but not shipped in any package: /usr/share/drirc.d/00-radv-defaults.conf Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. mesa: 1 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Markus Volk Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit e306dd7d300727852a2794cd78f3097d5999eb58) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/mesa/mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index d7bce3a008..0628151e96 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -286,7 +286,7 @@ PACKAGESPLITFUNCS:prepend = "mesa_populate_packages " PACKAGES_DYNAMIC += "^mesa-driver-.*" PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native" -FILES:mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf" +FILES:mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d" FILES:mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" FILES:${PN}-vdpau-drivers = "${libdir}/vdpau/*.so.*" FILES:libegl-mesa = "${libdir}/libEGL.so.*" From patchwork Thu Jun 2 16:51:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8768 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 E13CDC433EF for ; Thu, 2 Jun 2022 16:52:53 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web09.1535.1654188768476044096 for ; Thu, 02 Jun 2022 09:52:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CQsN9kOe; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id y189so5199227pfy.10 for ; Thu, 02 Jun 2022 09:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ko1d/yugSDSMUa0qMC/sgakf45qC1DZPdXQWcM0tjH8=; b=CQsN9kOeEniTkoptVYxk3gg5ZpEo5zbp4ceTe8BWNBGe9u41A33UaW3PeIvG5wsL30 MIT0qjYtm+uTzlyaKczg/2QF+YPvf3LzFq3GORGzNgFf4TgiZ8yegzbBt7XPoFpk2cyn C8olueS3zf7QyE5Q6GstX1OVAjuKVrrdFHh3JRPt/fPPzCaMSeYEbhRqShzUZPYip5iR ycPEdrPOItBj7rAVmYX1ZQiiq2m/XGNZkmY+GjI4Tsv8oa5h7Tz7BdIRQ0IX5Y0rzhqJ IAJvjqjusqFY/aixT8R58zyxLN4Zbxc8f3xtLXfk8rXdkWwBqbnNw0VU7npSsZ+58DQv 9JEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ko1d/yugSDSMUa0qMC/sgakf45qC1DZPdXQWcM0tjH8=; b=7abgaXV6J13rdGuG+fsqIZ5k4stHQ/asubeD8+XLGO8o7NVSUgn4XTM8D1ff5hshKk +qUfsi+SflrgV4qzoaX4hJuIoyfdPloBOOkfCM33GEYx9WipXc5RmkROUAsvJW5sAyTx YoghYfZWZychUOYY/MaEBFekfovffsOIpS4hovE4bkLlAFZ+dKlSM5kMLLOK2oHQhUM0 l1BTqO7gr97bfYYemSs9bORC6A09hcUAPZx6r2zV1sGrgaYCVfWi09Mg5HDMrhyX5YMR Heoq+XSxl43Asm4nUpN2QhUYlaOSLiCr/tP0JN7Cerc6VExfOikoKR4WflU7FE7uaUql 6F0w== X-Gm-Message-State: AOAM531NuvcCDTf8smon5FxOkyXR2CiuY26uw3vHBnwowghp0LggI/cE rSEyK4+RnA7WUWetAXSlfzMySCOPoYdYP4rR X-Google-Smtp-Source: ABdhPJydzdeuAdfUuOEgH8VBCl6bk7Q6nYcOjc5gL7kM1mNZ7jJjyGKa5Ix2ZZ0wf7dUtzz5h3xngA== X-Received: by 2002:a65:428c:0:b0:3db:822e:2163 with SMTP id j12-20020a65428c000000b003db822e2163mr4912957pgp.466.1654188770325; Thu, 02 Jun 2022 09:52:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/26] staging.bbclass: process direct dependencies in deterministic order Date: Thu, 2 Jun 2022 06:51:48 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:52:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166493 From: Martin Jansa * this doesn't fix any issue (at least AFAIK), just keeps the log files more deterministic to avoid unnecessary churn like in: --- /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/keymaps/1.0-r31/temp/log.do_patch.2213051 2022-05-26 11:35:44.110063749 +0200 +++ /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/keymaps/1.0-r31/temp/log.do_patch.2213372 2022-05-26 11:35:54.553062630 +0200 @@ -1,7 +1,7 @@ DEBUG: Executing python function extend_recipe_sysroot -NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.67.bb:do_populate_sysroot'] +NOTE: Direct dependencies are ['/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.67.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot'] NOTE: Installed into sysroot: [] -NOTE: Skipping as already exists in sysroot: ['patch-native', 'quilt-native', 'attr-native', 'libtool-native', 'gettext-minimal-native', 'texinfo-dummy-native'] +NOTE: Skipping as already exists in sysroot: ['quilt-native', 'patch-native', 'attr-native', 'libtool-native', 'gettext-minimal-native', 'texinfo-dummy-native'] DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing python function do_patch DEBUG: Executing python function patch_do_patch Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit d3ebb37b97da15166d452bf51f5f7e0c312ae42e) Signed-off-by: Steve Sakoman --- meta/classes/staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 8372a4574a..bf8ca58b0b 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -352,7 +352,7 @@ python extend_recipe_sysroot() { #bb.note(" start is %s" % str(start)) # Direct dependencies should be present and can be depended upon - for dep in set(start): + for dep in sorted(set(start)): if setscenedeps[dep][1] == "do_populate_sysroot": if dep not in configuredeps: configuredeps.append(dep) From patchwork Thu Jun 2 16:51:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8772 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 DFFAEC433EF for ; Thu, 2 Jun 2022 16:53:03 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web09.1537.1654188773760435436 for ; Thu, 02 Jun 2022 09:52:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=bXjAnIqP; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id s12so5027302plp.0 for ; Thu, 02 Jun 2022 09:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8qMFFYEGxwEJHSRapfF023MhFo2It8jzp8d2swBHbmQ=; b=bXjAnIqP09tuOvCItB1ieXi8OKcDWxifaZKt3Z02gErylphgFk54C1vHCLI9lm3+V7 xjk/xnYxNrOeKdQ4a4beQDbP/DeBRFSam6CM0lSTL7qadFf92OLxZ1Gh0yvAcRT3tSkS ecpLgK+KVaH7c9hib1lFpPNbmmLWlX+Fi55/ck8ewQ6IvXZxR6ebbnjC9yPWhstaLRRG CdawRA2agWqGDKNC+w+iNormc8+/yDoZmblxBroGzmTm/wIHvbD1A+S0wmheML2YbMs0 9aFo+kCR9lcJsXI/LwKQqONwpC9juhpxgPdkGRGCqm2p1JicGqNE9T8ZULbt6aSpVBnd 5PIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8qMFFYEGxwEJHSRapfF023MhFo2It8jzp8d2swBHbmQ=; b=xE2EuwmLkR4Jj7qKEqOZHagbxDHZax4En/ZXMqoSQJOfdMKDrBADENXa15yaadSbj2 gPcb5zaSiem6GDfJ1YOOS4Hs3xM+xNgHdKM5i7LcWKKgXY74JNhr4EprEQLVrvhB/9WI vEODezimwDQC65HBA5yv1xwmBRxGpi3R+1cgXJYvngrMlw3mLFsE/H8/89tocaDGlNAD axsTq95jmEI3wTqUUBLh3II8Esy3LbvZxh7G6OKzRiUFFy9ie0pdrm1G1FoHYwM2DCfI 8FoBv8NQ0taJGHFBgs6YN56MC3r5xBL0137qzDTYWgNhpKGInGfeNy42423R5mjoSLOF gHDA== X-Gm-Message-State: AOAM5306Rf1GbpdHZlUTgcdYYYYnr8JXo1QSayDnzXUHuY6psBGIg8hl qml6YG18UJhRMOvoLaqU7GksUj/7UVebh3Er X-Google-Smtp-Source: ABdhPJzaDsbxVcwQY0nGA8EqtTaYPlmhKfRdW0GyV+S5qMTN09Dwg+NJyLDArhXafzFaJ11nWgUDGQ== X-Received: by 2002:a17:90b:1b49:b0:1e6:a23:69c6 with SMTP id nv9-20020a17090b1b4900b001e60a2369c6mr6219885pjb.124.1654188772684; Thu, 02 Jun 2022 09:52:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/26] libseccomp: Add missing files for ptests Date: Thu, 2 Jun 2022 06:51:49 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166494 From: Joerg Vehlow pfc files are used e.g. in 38-basic-pfc_coverage.sh valgrind_test.supp is required, when valgrind is installed, otherwise all valgrind tests fail Signed-off-by: Joerg Vehlow Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 32ba67bc37b5ca73f7d29cb6c7de281ab8f824bd) Signed-off-by: Steve Sakoman --- meta/recipes-support/libseccomp/libseccomp_2.5.3.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb index e6260a7754..d47200e01c 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb @@ -37,6 +37,10 @@ do_install_ptest() { for file in $(find tests/*.tests -type f); do install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests done + for file in $(find tests/*.pfc -type f); do + install -m 644 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + install -m 644 ${S}/tests/valgrind_test.supp ${D}/${PTEST_PATH}/tests for file in $(find tools/* -executable -type f); do install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools done From patchwork Thu Jun 2 16:51:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8771 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 EAAAFCCA47B for ; Thu, 2 Jun 2022 16:53:03 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.1511.1654188776124680630 for ; Thu, 02 Jun 2022 09:52:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4Iz0QNV3; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id s14so4973567plk.8 for ; Thu, 02 Jun 2022 09:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Jf9RD8KiMCJ4pPyOj93DJp6CaupJKYFBBZcPn5T8gCA=; b=4Iz0QNV3Ucu1VDdimXqC3Pt24rxLcxGW/QoH8BoTcSESLIR0giepnvkbgcRGrfkPBL 3rOLqwLb4rHIGRNKBgdaSw+Q06Pv9SVDJrfsIFvQFvLIZYMqkAkqOpKDL2W5XPMmTC13 UZ9N9j21DfvSA6QPTa2TowyHbxsyclHakShmykfuncN0ODwS6BFCc9AJOpt3bzsoTSoJ oGOBH7WrkRTMpwjk9P0xn4VxEn4MK5mpLXrYkR7ZBRkPdWcoo60n63jxvnpxrcVQD5gJ j/74EiV22ctBofu/2nLrW/LICLwGBcEVzNQ7eX2nnbpGlqjGcOuIAi9NIqJl4fUKbvjm PVWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jf9RD8KiMCJ4pPyOj93DJp6CaupJKYFBBZcPn5T8gCA=; b=bdjTlxjRz/iEkhqPHH5p6OTTUjd+dw5iG5TKc3FkaQSd+/rcOMjFv3cx8lfyaB0Kaw 5AroBq6/wNntoO3Nf2m2EUaE2N8t2r5mVlfq20GlcY9yujJyWtNojHGcbqzekB/8ferA 6LNmWvOKI0hOjFH2EZdFOiwdDE1Lrn6cRY+Yzv76uyfZSjBlYTloghXGqAxLnIXwtknR 3Rn82BFem1SNi6Thc3L7smXBDz2MISO2kfbnV9xrx+pnZ84FcZE3aUjUYlrwgOWDAeii xNjgN5f1nbu5MtQvCSm7sjAoXp7+xFDjsozvgk5WL4/3RwsFub03tpX0tgGBZqI03Vab oJFA== X-Gm-Message-State: AOAM530QrlBj/cEa1vDGl1xjnTjDzzFEQxfnHZ/zOqgG6xYsnhOE/D3Z e3oLvgxlN3giyugmaiMml5pO07pV9nDDp0gU X-Google-Smtp-Source: ABdhPJzwS662TKuQjM8QbRG71xOSE5ovSsD/hcAnu6nS8Od3pATC5wVXAZnrUcKfm8+XzN7C4++I9g== X-Received: by 2002:a17:902:cf06:b0:161:53b6:474d with SMTP id i6-20020a170902cf0600b0016153b6474dmr5828653plg.63.1654188774990; Thu, 02 Jun 2022 09:52:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/26] insane.bbclass: make sure to close .patch files Date: Thu, 2 Jun 2022 06:51:50 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166495 From: Martin Jansa * fixes: DEBUG: Executing python function do_qa_patch /OE/build/oe-core/openembedded-core/meta/classes/insane.bbclass:1189: ResourceWarning: unclosed file <_io.TextIOWrapper name='/OE/build/oe-core/openembedded-core/meta/recipes-bsp/keymaps/files/GPLv2.patch' mode='r' encoding='utf-8'> content = open(fullpath, encoding='utf-8', errors='ignore').read() ResourceWarning: Enable tracemalloc to get the object allocation traceback DEBUG: Python function do_qa_patch finished Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 61be3668d866834adfff688620aee7e29f6d8c44) Signed-off-by: Steve Sakoman --- meta/classes/insane.bbclass | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 0bc6492c83..9ca84bace9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1201,18 +1201,20 @@ python do_qa_patch() { if '/meta/' not in fullpath: continue - content = open(fullpath, encoding='utf-8', errors='ignore').read() kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) - match_kinda = kinda_status_re.search(content) - match_strict = strict_status_re.search(content) guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" - if not match_strict: - if match_kinda: - bb.error("Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))) - else: - bb.error("Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)) + with open(fullpath, encoding='utf-8', errors='ignore') as f: + file_content = f.read() + match_kinda = kinda_status_re.search(file_content) + match_strict = strict_status_re.search(file_content) + + if not match_strict: + if match_kinda: + bb.error("Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))) + else: + bb.error("Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)) } python do_qa_configure() { From patchwork Thu Jun 2 16:51:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8769 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 EAF7AC3F2D4 for ; Thu, 2 Jun 2022 16:53:03 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web12.1570.1654188778563560505 for ; Thu, 02 Jun 2022 09:52:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Ie14yXIj; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id g205so5201960pfb.11 for ; Thu, 02 Jun 2022 09:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bUAjnzBPC+PRQHQC4mMFWZZuziiWrZHhm5J8dJdphFw=; b=Ie14yXIjluCLYqDkUqm2MBVMRDNj1VBmiti5qrqbtkCr1fz3iq4ux9Xe+p+2Pic5aq LYZyr5wS7GQ/90SjArBAkQG1VxidOmUTtvhRhrYqZ8kgTk0ln2H9liwdmu3EVQg7codZ +dturNofE1T6EoBsKJpYrOlsnjVVdVb2NM8R/GijPNcgLGRUHDZkBErT6V+y+S3jsQHq aF2u6SimH8uKzaVqrSJq22Wf1VrYtN1Y+SYsKlvBhAinBRQxbz4UJRbWnAVUniw28JWD /tyQ4vs47gmFj2kWDXCFiKfIMncmW8Y3PbBR7p+ZgPvfVcqrCFEDGpcxaF8l7S7fhimq tJmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bUAjnzBPC+PRQHQC4mMFWZZuziiWrZHhm5J8dJdphFw=; b=r9KEc2Pf155ziheBeKjsPLS3uO29F4/8AawqImU22dIHgZRIbCvox4wqF2XiPuTFl4 JraNcQ/SsSaSqdn8gfMjp9ZWSdD7gvRgPJt4cwieLRzZ7q2yxx2JEUPf3YwCXOGJxH5n KeYBXTzjQptHvy6cWSJ7dUWmiaEmB5czCTZvUYosZTnlswVemaF7h2+61bzn2l8xLei+ kJJlwxNPFSLNtDjgPvhneejK6Jak0ymUNrCswtqof36yRkiMf7e90vwz+ZJ4Vikpn67k olFqxpU4byJogxD7NKs1BYSETlqNZeHT9U8JYBH8FAHy2ecx1FZUrxo5W1Y+oTjtCM5o MuoA== X-Gm-Message-State: AOAM5328BUrsJc8+FETQrw+aP5M+rqiWyIC30p6U42laechu/1LFkB83 vnioNsdVVTAF4CnqhRl0mg4jWs5QU8qCi0bQ X-Google-Smtp-Source: ABdhPJxPQ1DlJLVzj46EJ/5JBjfoUqOAaygovMbmJKQ7VFdpq8ssjQI9zEfCNJBECvrGrX7wwU/ASA== X-Received: by 2002:a05:6a00:a04:b0:51b:6ea0:43ca with SMTP id p4-20020a056a000a0400b0051b6ea043camr5936580pfh.78.1654188777429; Thu, 02 Jun 2022 09:52:57 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/26] pciutils: avoid lspci conflict with busybox Date: Thu, 2 Jun 2022 06:51:51 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166496 From: Naveen Saini if virtualization is enabled as DISTRO_FEATURES, then meta-virtualization layer enables CONFIG_LSPCI=y for busybox, which in result have conflicts with pciutils update-alternatives: Error: not linking ..core-image-base/1.0-r0/rootfs/usr/bin/lspci to /bin/busybox.nosuid since ..core-image-base/1.0-r0/rootfs/usr/bin/lspci exists and is not a link So marking it as ALTERNATIVE with ALTERNATIVE_PRIORITY set to 100 Ref: https://git.yoctoproject.org/poky/commit/meta/recipes-bsp/pciutils?id=a81af375dfc51446b21548dce2afa6a77bc02df3 https://github.com/pciutils/pciutils/commit/0b307156c92f61c1a02d232f4c6ed17e888de9a9 https://git.yoctoproject.org/meta-virtualization/tree/recipes-core/busybox/busybox/lspci.cfg https://git.yoctoproject.org/meta-virtualization/tree/recipes-core/busybox/busybox_virtualization.inc#n4 https://git.yoctoproject.org/meta-virtualization/tree/recipes-core/busybox/busybox_%25.bbappend#n1 Signed-off-by: Naveen Saini Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 257e7620a79ea50c0c59746ff9a3817d43411e39) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/pciutils/pciutils_3.7.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb index 7d1740f665..311e57a98b 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb @@ -13,7 +13,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ SRC_URI[sha256sum] = "9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb" -inherit multilib_header pkgconfig +inherit multilib_header pkgconfig update-alternatives PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" @@ -57,3 +57,6 @@ FILES:libpci = "${libdir}/libpci.so.*" SUMMARY:${PN}-ids = "PCI utilities - device ID database" DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciutils." RDEPENDS:${PN} += "${PN}-ids" + +ALTERNATIVE:${PN} = "lspci" +ALTERNATIVE_PRIORITY = "100" From patchwork Thu Jun 2 16:51:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8773 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 E587ACCA47A for ; Thu, 2 Jun 2022 16:53:03 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web12.1571.1654188781214858912 for ; Thu, 02 Jun 2022 09:53:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pB9veLOM; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id e66so5214264pgc.8 for ; Thu, 02 Jun 2022 09:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WGQnQFxwwidFi9+FstFI97h0TjxCfGxkI/rZoQfFNQI=; b=pB9veLOMPpDtPAeawhXwz5FIrrpA4Bop3YIbkZ8E8hOYQIxrjtXF6CCUS8K3WTm/FO quIIhIqfd2QDozhUTO39lrSG6hTatAxt6cn7UWJfVF80hbthi/H1T2fESGBBUBuWydWZ ZGKyboMN6bMcFlrwsc2Ke8W3MvLcU6eTP5hDyNDE3tvKLUXfmDOOuhZnRZraZjTwgTPa f59i/Nm1fa+R5B667/IBEetQyircXi8y3rghB/oHhZZBaU+1D7FOiev4Q2mQsFaoUBS6 yeXlqF5BcrO0ozKyOAVaWYNJ5WMzyOYinJB5UCsVupoBRnbZHwr4oQ8nxPg6Xtuz6+0r JT8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WGQnQFxwwidFi9+FstFI97h0TjxCfGxkI/rZoQfFNQI=; b=OGh3a9tAK6J9CBME3wmyRqSkM40c70rkmnSgoWR0YZ3J52DssGSVijfAfuU9a8qk+9 ViuwZCHf5F8vscYAZTak+nVXTypGb+txSypc0CXgfSDby9xrcQ2brya6GskXjplcTpgi MdlgkrTeYGaYglux3A2qwZlLtldzl7WGHDBfuh1YOR22B+m6iZ8nv8Wys1A4RGkpxTL4 KIAVq3MQyKDp8VvhSarKWKecPbYF2Ej5vco8LU7eL4k7JCaKV/Y+uHRr1Nkds0vooCiX a31tjTKuQQI6fUBI7TE8w30h4UO070KZg5zE1rQGq/e7YHfejYBn+V+J5cod2l2TxD+y UgBw== X-Gm-Message-State: AOAM533eoYNSLTj2fPDRrR8V3R8ZqpeoElGM5yawnC3c0A/9tfi2VZaP /Y9l4zMiwwb4pWrcN3ndootx5p9TGx3USi7T X-Google-Smtp-Source: ABdhPJwzlHEfQANLUIwnakgxYHTMI8yzF8zWneflD7qLcTdZd97qSqpxNkjXrEE0VgB+3DR5ZmqSsg== X-Received: by 2002:a62:878b:0:b0:51b:c452:33cf with SMTP id i133-20020a62878b000000b0051bc45233cfmr5219367pfe.72.1654188779939; Thu, 02 Jun 2022 09:52:59 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.52.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:52:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/26] ovmf: Fix native build with gcc-12 Date: Thu, 2 Jun 2022 06:51:52 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166497 From: Khem Raj Host distros have started deploying gcc12 as well e.g. archlinux this build failure shows up which has been fixed upstream In function ‘GetAlignmentFromFile’, inlined from ‘main’ at GenFfs.c:816:20: GenFfs.c:545:5: error: pointer ‘InFileHandle’ used after ‘fclose’ [-Werror=use-after-free] 545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 7b67f19d353d88107f52cceda3c858730ac1db54) Signed-off-by: Steve Sakoman --- .../0001-BaseTools-fix-gcc12-warning-1.patch | 51 +++++++++++++++++++ .../0001-BaseTools-fix-gcc12-warning.patch | 49 ++++++++++++++++++ meta/recipes-core/ovmf/ovmf_git.bb | 6 +++ 3 files changed, 106 insertions(+) create mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch create mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch diff --git a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch b/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch new file mode 100644 index 0000000000..23366b4d07 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch @@ -0,0 +1,51 @@ +From b0a0b7b605aeb8106e7b50d1efeb746f401498cc Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Thu, 24 Mar 2022 20:04:35 +0800 +Subject: [PATCH] BaseTools: fix gcc12 warning + +Sdk/C/LzmaEnc.c: In function ?LzmaEnc_CodeOneMemBlock?: +Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*p.rc.outStream? [-Werror=dangling-pointer=] + 2828 | p->rc.outStream = &outStream.vt; + | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ +Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here + 2811 | CLzmaEnc_SeqOutStreamBuf outStream; + | ^~~~~~~~~ +Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here +Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*(CLzmaEnc *)pp.rc.outStream? [-Werror=dangling-pointer=] + 2828 | p->rc.outStream = &outStream.vt; + | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ +Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here + 2811 | CLzmaEnc_SeqOutStreamBuf outStream; + | ^~~~~~~~~ +Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here +cc1: all warnings being treated as errors + +Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/85021f8cf22d1bd4114803c6c610dea5ef0059f1] +Signed-off-by: Gerd Hoffmann +Reviewed-by: Bob Feng +--- + BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c +index 4e9b499f8d..4b9f5fa692 100644 +--- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c ++++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c +@@ -2825,12 +2825,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit, + + nowPos64 = p->nowPos64; + RangeEnc_Init(&p->rc); +- p->rc.outStream = &outStream.vt; + + if (desiredPackSize == 0) + return SZ_ERROR_OUTPUT_EOF; + ++ p->rc.outStream = &outStream.vt; + res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize); ++ p->rc.outStream = NULL; + + *unpackSize = (UInt32)(p->nowPos64 - nowPos64); + *destLen -= outStream.rem; +-- +2.36.1 + diff --git a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch b/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch new file mode 100644 index 0000000000..91c01647db --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch @@ -0,0 +1,49 @@ +From 2435c17e56652479315853cec5b91fb0ea0911a3 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Thu, 24 Mar 2022 20:04:34 +0800 +Subject: [PATCH] BaseTools: fix gcc12 warning + +GenFfs.c:545:5: error: pointer ?InFileHandle? used after ?fclose? [-Werror=use-after-free] + 545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +GenFfs.c:544:5: note: call to ?fclose? here + 544 | fclose (InFileHandle); + | ^~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/7b005f344e533cd913c3ca05b266f9872df886d1] +Signed-off-by: Gerd Hoffmann +Reviewed-by: Bob Feng +--- + BaseTools/Source/C/GenFfs/GenFfs.c | 2 +- + BaseTools/Source/C/GenSec/GenSec.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c +index 949025c333..d78d62ab36 100644 +--- a/BaseTools/Source/C/GenFfs/GenFfs.c ++++ b/BaseTools/Source/C/GenFfs/GenFfs.c +@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment) + PeFileBuffer = (UINT8 *) malloc (PeFileSize); + if (PeFileBuffer == NULL) { + fclose (InFileHandle); +- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); ++ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile); + return EFI_OUT_OF_RESOURCES; + } + fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle); +diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c +index d54a4f9e0a..b1d05367ec 100644 +--- a/BaseTools/Source/C/GenSec/GenSec.c ++++ b/BaseTools/Source/C/GenSec/GenSec.c +@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment) + PeFileBuffer = (UINT8 *) malloc (PeFileSize); + if (PeFileBuffer == NULL) { + fclose (InFileHandle); +- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); ++ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile); + return EFI_OUT_OF_RESOURCES; + } + fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle); +-- +2.36.1 + diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index b15d40eac8..84e3360a3a 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -15,12 +15,18 @@ PACKAGECONFIG += "${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'tpm', '', d) PACKAGECONFIG[secureboot] = ",,," PACKAGECONFIG[tpm] = "-D TPM_ENABLE=TRUE,-D TPM_ENABLE=FALSE,," +# GCC12 trips on it +#see https://src.fedoraproject.org/rpms/edk2/blob/rawhide/f/0032-Basetools-turn-off-gcc12-warning.patch +BUILD_CFLAGS += "-Wno-error=stringop-overflow" + SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0001-ovmf-update-path-to-native-BaseTools.patch \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-ovmf-Update-to-latest.patch \ file://0005-debug-prefix-map.patch \ file://0006-reproducible.patch \ + file://0001-BaseTools-fix-gcc12-warning.patch \ + file://0001-BaseTools-fix-gcc12-warning-1.patch \ " PV = "edk2-stable202202" From patchwork Thu Jun 2 16:51:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8770 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 E071AC43334 for ; Thu, 2 Jun 2022 16:53:03 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web12.1571.1654188781214858912 for ; Thu, 02 Jun 2022 09:53:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=oM3AZMXA; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id e66so5214264pgc.8 for ; Thu, 02 Jun 2022 09:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VkbN5rB+tnd1I5hVr9BTZbGy1c+22guOXSzDuhvo5s4=; b=oM3AZMXAGePILmIj4/h4xgiPwObBdLMwvD+HI8EDMEHaIPSiW7lhEnvmNd42BWtmMW oIOF3HklMzcgsCYxC4BvwWM3cRzXZ44weEKpkJ/eGm7SgqQjzAl+P4Tyzal9ojBMwB62 dPfaefTfjJTgocQgw9bvBgYUj7hZ08mPFFumxj/6SJ0vpDmF4niEqu7EHivinWYo7gBt UkJTbq8LBlXdgoJxtEJs3zw2dUNaht33CznQ28A4sFpWvRKSKR+vdfkAvrGMnEmmzrQ1 3Z8ZmKm1u5ff0QvHnGQkR0GwMIEexyVk5h2TUZABHSL1GWPbQCqFxfMB3VXDcDE+ZFHv p1GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VkbN5rB+tnd1I5hVr9BTZbGy1c+22guOXSzDuhvo5s4=; b=tk4Br9oAMPq0tBc1dUX5jdu7iISQOGGChZDR15SCxdXkeQQx/WRwZ5CyLyR6ww955a tipJdu+m0IgTsH1aiHFgw5cH4HMeqWpDysINEp7FNb07SzvtTe+tRlGkmkVMH61pZISl QZF4nRb/eAbhk4OigxW3GE4nwj0MOkx0O2BuiTbTaZfFP0/Q3eyIW8CB73nSwS3cMDWg FW7HBdIZ+XRna+lXIIZzu/QvjfetQm2Li0rkpBbqg5dAnehqTpPvpC0or+sjXL9dJqIa cuPY8XoU5qp79PXCvG0TTcinUT++MgLCudi/an6lmh/4gnaT4uymPUm2wusBKAh2nZKb gzug== X-Gm-Message-State: AOAM532WSWXeYN5UcA5zPXwAQ2eaBB7oP567MnZ3MRCjmMmcVc3HU0KE hH3CS5n11LQpP/84F5rCMmb0jLmAkdl7e+Sb X-Google-Smtp-Source: ABdhPJzDHxDVy9r/C2voHtkjXjaItNur3S8YMUG2XnyZZTfgGHYq14pKO+zNFDJRQGiWTemC5pxE+g== X-Received: by 2002:a05:6a00:1487:b0:518:b952:889b with SMTP id v7-20020a056a00148700b00518b952889bmr6064126pfu.43.1654188782292; Thu, 02 Jun 2022 09:53:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.53.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:53:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/26] rust-common: Fix sstate signatures between arm hf and non-hf Date: Thu, 2 Jun 2022 06:51:53 -1000 Message-Id: <424b81ae680057a8c285157ea081f167381b6c62.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166498 From: Richard Purdie Building with MACHINE=qemuarm and MACHINE=qemux86-64 causes rust-native to rebuild. The reason is all the ingredients into the RUST_*_SYS variables are being tracked but that doesn't really make sense in this case: $ bitbake-diffsigs tmp/stamps/x86_64-linux/rust-native/1.60.0-r0.do_rust_gen_targets.sigdata.63* tmp/stamps/x86_64-linux/rust-native/1.60.0-r0.do_rust_gen_targets.sigdata.34* NOTE: Starting bitbake server... basehash changed from 860b8f11b10182dc5b2737f62cdb697477f714adb63eeb4d4b932d67cac8eec2 to 9379e8b9df9696e8056fec7d1534661f34dda073f6d816e241b09a2dff76ae2d Variable rust_base_triple value changed: @@ -36,4 +36,4 @@ # In some cases uname and the toolchain differ on their idea of the arch name -TUNE_FEATURES{callconvention-hard} = Set +TUNE_FEATURES{callconvention-hard} = Unset Switch to using the final variable value for sstate signature purposes which avoids this issue. Signed-off-by: Richard Purdie (cherry picked from commit 38b61aeaf877f6a34c3c0060c175119975ebd782) Signed-off-by: Steve Sakoman --- meta/classes/rust-common.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass index 02a538258a..cb811ac5da 100644 --- a/meta/classes/rust-common.bbclass +++ b/meta/classes/rust-common.bbclass @@ -117,8 +117,11 @@ RUST_BUILD_ARCH = "${@oe.rust.arch_to_rust_arch(d.getVar('BUILD_ARCH'))}" # its likely best to not use the triple suffix due to potential confusion. RUST_BUILD_SYS = "${@rust_base_triple(d, 'BUILD')}" +RUST_BUILD_SYS[vardepvalue] = "${RUST_BUILD_SYS}" RUST_HOST_SYS = "${@rust_base_triple(d, 'HOST')}" +RUST_HOST_SYS[vardepvalue] = "${RUST_HOST_SYS}" RUST_TARGET_SYS = "${@rust_base_triple(d, 'TARGET')}" +RUST_TARGET_SYS[vardepvalue] = "${RUST_TARGET_SYS}" # wrappers to get around the fact that Rust needs a single # binary but Yocto's compiler and linker commands have From patchwork Thu Jun 2 16:51:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8776 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 E3E71CCA47D for ; Thu, 2 Jun 2022 16:53:13 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web12.1560.1654188745315419437 for ; Thu, 02 Jun 2022 09:53:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VCDjF6A9; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id v5-20020a17090a7c0500b001df84fa82f8so5290907pjf.5 for ; Thu, 02 Jun 2022 09:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lP9rkWvZXViotoFH1BfM7nfN78fq74sAaMpkwaY1iPk=; b=VCDjF6A91h1i/mFfIJoZF1BuCdII6A6Tfgjgi2qIe0Qq0NjQ/hNObBS7PeFyLtW0mQ dXWhRBHu//V0GAwIthCb2PzZdmbhjCbSrlhS9UJ3F127kIKIgV5cFBxSHu4s1zdyTuQ5 HZ5Ou7/9neA1ezVyboUniKc+NH92iHP2CZsJty0qGi1XQwxY66/WbjeComPJnOVY5a0T vCHCIA5ndUNze04RYXd8gZKTZgaePtSbzxEp1t+VmfB6w3eBwfFNQc44ZggptpG8b+kR WJNvoP3lXK8Km0fu0GSDa4EYdS5Escf2Ka/1T4mJQWZkxr87ClpJFYp66FnV40NCRoHJ nIYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lP9rkWvZXViotoFH1BfM7nfN78fq74sAaMpkwaY1iPk=; b=En5vsZDPja/v6ERhrSwTXF++Vwb5soFYRFdqIaIglLtukJ+sbFBqxQGpkSsE1XU6En KrktKQPNhdEhufsPOfGlx65OI4rIbWNVGvTyEfC8XqJuUKOqokyoigPPmLVabOBbAgoX eHscnaPF8Zi/qmFigUQ3EY5lZGKTPXUmSbsqV8ZWcmfVxe4W05SVLjR1Pja+Tmm5VBCd lua1AvyH6UNOMqioTgBkirwy3VkWbjqV+fZB3pzIt6Tn8tphMMJtO0t1Kj+/i/32Ap0N 1vGS5+VHTR0RGBjBarO/ygiUvLXfI7W9Ru/7A9jw69dEvZIYRfEXziUJa0L45bCjYBIU 9Wpg== X-Gm-Message-State: AOAM531aXUQ/JNZYwnEdrJ5EU2GOqOResOjJVhstDfnIyWzmH+KYmsFB ujeu+Dfc0ACOPlAXS5GW+QB6/4NeUL6cAQY7 X-Google-Smtp-Source: ABdhPJwfhi0RCYQHT95Xi3Xfrv+m94kBYoTAwL+ETtybHlgg54Y21aDF+ZpMgHXYy6DKO0uQHTImbA== X-Received: by 2002:a17:902:7048:b0:161:debe:c3f7 with SMTP id h8-20020a170902704800b00161debec3f7mr5590557plt.121.1654188784422; Thu, 02 Jun 2022 09:53:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.53.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:53:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/26] rust-common: Ensure sstate signatures have correct dependencues for do_rust_gen_targets Date: Thu, 2 Jun 2022 06:51:54 -1000 Message-Id: <84e891d812874311b4afa20fd7d3dc4c457009f6.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166499 From: Sundeep KOKKONDA The do_rust_gen_targets task was not rerunning when the configuration variables it uses were changed. Add the missing variable dependencies to fix this. [RP: Split to separate patch and add commit message] Signed-off-by: Sundeep KOKKONDA Signed-off-by: Richard Purdie (cherry picked from commit 65ce2d129154d4540cb8ec960971bcf6aa5a9480) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/rust/rust-common.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index 310aecef22..29b17cb955 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc @@ -360,6 +360,8 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): with open(wd + sys + '.json', 'w') as f: json.dump(tspec, f, indent=4) +do_rust_gen_targets[vardeps] += "DATA_LAYOUT LLVM_TARGET TARGET_ENDIAN TARGET_POINTER_WIDTH TARGET_C_INT_WIDTH MAX_ATOMIC_WIDTH FEATURES" + python do_rust_gen_targets () { wd = d.getVar('WORKDIR') + '/targets/' build_arch = d.getVar('BUILD_ARCH') From patchwork Thu Jun 2 16:51:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8775 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 E5669CCA47E for ; Thu, 2 Jun 2022 16:53:13 +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.web09.1543.1654188788085768207 for ; Thu, 02 Jun 2022 09:53:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=upRqRkmK; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id v11-20020a17090a4ecb00b001e2c5b837ccso9944390pjl.3 for ; Thu, 02 Jun 2022 09:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=m4ukp2ol2O1zxwZ5Zp8ndkxECH0I9fNk0qdLNWuC9zc=; b=upRqRkmK9mbaa00PKTl9R2T9R31q7E6VzmHyloK9df0w7m1+X607i9UJAiDiCfFDFw zA3RJXso0dFiXYA+7y/H6h5RM2bqKw5UR0G/Qk18ti3oxFbXaNHOCPZo196N9LHy7wQs rASCaKGqgG4upMjxjC0XAuqFmXoky35V1BgZd74rEzL91mvK74R1WvDK0hSZJ4KYo9nk d/Yx6jhONA0CBeIOiiSP64U3xiu9oe4GkYvEGAQ/BtxODJeSpKYqusmriEYXjiSSuwlY bXVHy1GC0ECjKrMuQVPRZ/FMoge25jCkusssOpZAEzqsQxAeyUEPFyx9OMu6w5/73QW+ L6VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m4ukp2ol2O1zxwZ5Zp8ndkxECH0I9fNk0qdLNWuC9zc=; b=cUxTQGId89fYE2H14qnkyaIhGR26fZhm8lmO5BvoaQRFq5yck3EBKDfVpY11okHAaA Pv4hCLNQer+61nfSyk4CP084t0pbmOxEufF+8DfHIcdIaaj4xU6n6ISZmZ2UvchFzYfq YRUR8KBz8V6LyXvNjrfHRN8DZGaEyT7y7asl3bo4QPNZT8BoNU3ZcdpxOKIUX32kCjO+ c2w7DSHIMQLeTYri6oQ1bnvqyCzPnvyJIzrbrJKv6I47+OTA5P5+QY3or6xu9uJz+TMP TU7AQ4uKsmwwD4mKjFf0hIOXAqherZOLfIIGQzwf74VfJH5XU3O3Qze8KlzPekIP5t/c 7hDA== X-Gm-Message-State: AOAM533RaOo5sDrVMt1JxU2M71Zbd6KCzp7a1xj5ttOs2Cq+uTpLKBKj t2VMgC0FVAE9FfdbyQbIKNu418Vx8FpfKyJU X-Google-Smtp-Source: ABdhPJwccwNF0aXKzibtlL2QkQv6CuCIB6NypgDqu+M1uI3NzqH4/gs4pgHQ8eCNnFrZP0fA6r7lsw== X-Received: by 2002:a17:90a:5d03:b0:1e0:cc5b:4808 with SMTP id s3-20020a17090a5d0300b001e0cc5b4808mr6308574pji.180.1654188786791; Thu, 02 Jun 2022 09:53:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:53:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/26] rust-common: Fix for target definitions returning 'NoneType' for arm Date: Thu, 2 Jun 2022 06:51:55 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166500 From: Sundeep KOKKONDA [YOCTO #14742] The build shows below error while building for arm machines. Exception: TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType' Detailed error info : Steps to reproduce: 1. Set MACHINE ?= "qemuarm" in local.conf & add 'TOOLCHAIN_HOST_TASK:append = " packagegroup-rust-cross-canadian-${MACHINE}"' 2. bitbake core-image-minimal -cpopulate_sdk Complete Error: ERROR: rust-cross-canadian-arm-1.59.0-r0 do_rust_gen_targets: Error executing a python function in exec_func_python() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_func_python() autogenerated', lineno: 2, function: 0001: *** 0002:do_rust_gen_targets(d) 0003: File: '/ala-lpggp31/skokkonda/yocto/poky/meta/recipes-devtools/rust/rust-cross-canadian-common.inc', lineno: 31, function: do_rust_gen_targets 0027: 0028:LLVM_TARGET[x86_64] = "${RUST_HOST_SYS}" 0029:python do_rust_gen_targets () { 0030: wd = d.getVar('WORKDIR') + '/targets/' *** 0031: rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_LLVM_FEATURES') or "", d.getVar('TARGET_LLVM_CPU'), d.getVar('TARGET_ARCH')) 0032: rust_gen_target(d, 'HOST', wd, "", "generic", d.getVar('HOST_ARCH')) 0033: rust_gen_target(d, 'BUILD', wd, "", "generic", d.getVar('BUILD_ARCH')) 0034:} 0035: File: '/ala-lpggp31/skokkonda/yocto/poky/meta/recipes-devtools/rust/rust-common.inc', lineno: 330, function: rust_gen_target 0326: # build tspec 0327: tspec = {} 0328: tspec['llvm-target'] = d.getVarFlag('LLVM_TARGET', arch_abi) 0329: tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch_abi) *** 0330: tspec['max-atomic-width'] = int(d.getVarFlag('MAX_ATOMIC_WIDTH', arch_abi)) 0331: tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) 0332: tspec['target-c-int-width'] = d.getVarFlag('TARGET_C_INT_WIDTH', arch_abi) 0333: tspec['target-endian'] = d.getVarFlag('TARGET_ENDIAN', arch_abi) 0334: tspec['arch'] = arch_to_rust_target_arch(rust_arch) Exception: TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType' Below are the local variables from rust_gen_target function for arm and aarch64 targets. Refer below, the tspec varibles for 'arm' generated with NoneType. (a) Locals at rust_gen_target for arm:: tspec['data-layout'] = None, Type of tspec['data-layout'] = tspec['data-layout'] = None, Type of tspec['data-layout'] = DEBUG: Python function do_rust_gen_targets finished (b) Locals at rust_gen_target for aarch64:: tspec['data-layout'] = aarch64-unknown-linux-gnu, Type of tspec['data-layout'] = tspec['max-atomic-width'] = 128, Type of tspec['max-atomic-width'] = Reason for changing arm-eabi to arm: The earlier changes introduced this bug, so reverting the change 'arm-eabi' to 'arm' fixed the issue. Signed-off-by: Sundeep KOKKONDA Signed-off-by: Richard Purdie (cherry picked from commit 8ed000debb026477abd86ea3bf72adaf21d69f39) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/rust/rust-common.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index 29b17cb955..984fe9099e 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc @@ -119,13 +119,13 @@ def llvm_features(d): ## arm-unknown-linux-gnueabihf -DATA_LAYOUT[arm-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" -LLVM_TARGET[arm-eabi] = "${RUST_TARGET_SYS}" -TARGET_ENDIAN[arm-eabi] = "little" -TARGET_POINTER_WIDTH[arm-eabi] = "32" -TARGET_C_INT_WIDTH[arm-eabi] = "32" -MAX_ATOMIC_WIDTH[arm-eabi] = "64" -FEATURES[arm-eabi] = "+v6,+vfp2" +DATA_LAYOUT[arm] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" +LLVM_TARGET[arm] = "${RUST_TARGET_SYS}" +TARGET_ENDIAN[arm] = "little" +TARGET_POINTER_WIDTH[arm] = "32" +TARGET_C_INT_WIDTH[arm] = "32" +MAX_ATOMIC_WIDTH[arm] = "64" +FEATURES[arm] = "+v6,+vfp2" ## armv7-unknown-linux-gnueabihf DATA_LAYOUT[armv7-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" From patchwork Thu Jun 2 16:51:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8777 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 DE51DCCA47A for ; Thu, 2 Jun 2022 16:53:13 +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.1517.1654188790202788905 for ; Thu, 02 Jun 2022 09:53:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=T6cfAYLo; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id l20-20020a17090a409400b001dd2a9d555bso5342860pjg.0 for ; Thu, 02 Jun 2022 09:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=E+aU9OZJ39fJlmFuB4OOBK80FlTWQ3odTvVbJ2sk39Q=; b=T6cfAYLoeZKtUW36wuExyiH9JGEcpsGsXL2f0YLORi4UqQH2Mtqs/vwiVgnukuITs+ AIgCnILHmoVuFleq4etT0uZldb1rZxxDc9TvwbyTUaYRChBimL2SOUElasxBd+QEGhR4 u6RWtg4xnQLUp3tJvIYgmkOpMVsGj22vssAHpromasWpweuhBA4Va51P4t9ZcUXVzdeg DSBt9OghmLIvtIyshj9kklAjhCAknNqlDQQoGukZUp04xdaulEs0sPGRpZJTHXrTXjPI PlwTahWksIcGLm98XzhizcsCRhGCS7y/H4+878wbJFvxnrqAdEDEHmZC+pIWHxP8bqXe 1r5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E+aU9OZJ39fJlmFuB4OOBK80FlTWQ3odTvVbJ2sk39Q=; b=4g3h9h5VjFTMtc2aT2jY8SiNYcCOpRlHYautukFtiU2ddtNwEW8De2TD4IbLmOKgj4 cyj5Uc6eilvD0r65lwTg5IQtGhGBhkd6odiu0uHlGcV8Erf++5YFgo0A84nGw0O1k1Eg YXEe0PUpSXy3xNw4lDALMWDoHFmTZO1fmYwhk8/ELlcreEvshLf4PWPzlJjxFDfWKoRl ZtMVVeCazAuVMIAusOWSCzorQQaIp4BisucfP2hy++ZJWT6TF/Xcsk6XsBoxkKzLTzE9 YKNQ0CY+6Wnuf2XiLmOfVn6aUJ4Va97Hclqv8NSUlA1JgALtVAxg8+iqW2RMFwdjoO25 VQgQ== X-Gm-Message-State: AOAM531BxWPzn+PKb5P36BbEyNGhrz/5AsNKmTh37TSvggOg0Cje9tny PlBl0v8I7Uha2IvBZqwG4CFQ9MJET/AVf9hg X-Google-Smtp-Source: ABdhPJyqrLL+KL3JmRCQRRoc9gJmkySXqUzziogTyvw1XyWWPKflh5ZVaeCr5iN+Rx417S5SL5YhFg== X-Received: by 2002:a17:902:704a:b0:161:996e:bf4 with SMTP id h10-20020a170902704a00b00161996e0bf4mr5781000plt.118.1654188788922; Thu, 02 Jun 2022 09:53:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.53.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:53:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/26] rust-common: Drop LLVM_TARGET and simplify Date: Thu, 2 Jun 2022 06:51:56 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166501 From: Richard Purdie This all seems over complicated for something which is basically always one of two values. This might even help cross-canadian work on something which isn't x86-64. Signed-off-by: Richard Purdie (cherry picked from commit bd36593ba3db758b3eacc974e48468a665967961) Signed-off-by: Steve Sakoman --- .../cargo/cargo-cross-canadian.inc | 2 -- meta/recipes-devtools/rust/rust-common.inc | 23 ++++--------------- .../rust/rust-cross-canadian-common.inc | 1 - 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc index 840793c50b..7fc22a4128 100644 --- a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc +++ b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc @@ -28,8 +28,6 @@ inherit cross-canadian PN = "cargo-cross-canadian-${TRANSLATED_TARGET_ARCH}" -LLVM_TARGET[x86_64] = "${RUST_HOST_SYS}" - python do_rust_gen_targets () { wd = d.getVar('WORKDIR') + '/targets/' diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index 984fe9099e..3cdce36439 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc @@ -120,7 +120,6 @@ def llvm_features(d): ## arm-unknown-linux-gnueabihf DATA_LAYOUT[arm] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" -LLVM_TARGET[arm] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[arm] = "little" TARGET_POINTER_WIDTH[arm] = "32" TARGET_C_INT_WIDTH[arm] = "32" @@ -129,7 +128,6 @@ FEATURES[arm] = "+v6,+vfp2" ## armv7-unknown-linux-gnueabihf DATA_LAYOUT[armv7-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" -LLVM_TARGET[armv7-eabi] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[armv7-eabi] = "little" TARGET_POINTER_WIDTH[armv7-eabi] = "32" TARGET_C_INT_WIDTH[armv7-eabi] = "32" @@ -138,7 +136,6 @@ FEATURES[armv7-eabi] = "+v7,+vfp2,+thumb2" ## aarch64-unknown-linux-{gnu, musl} DATA_LAYOUT[aarch64] = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" -LLVM_TARGET[aarch64] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[aarch64] = "little" TARGET_POINTER_WIDTH[aarch64] = "64" TARGET_C_INT_WIDTH[aarch64] = "32" @@ -146,7 +143,6 @@ MAX_ATOMIC_WIDTH[aarch64] = "128" ## x86_64-unknown-linux-{gnu, musl} DATA_LAYOUT[x86_64] = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -LLVM_TARGET[x86_64] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[x86_64] = "little" TARGET_POINTER_WIDTH[x86_64] = "64" TARGET_C_INT_WIDTH[x86_64] = "32" @@ -154,7 +150,6 @@ MAX_ATOMIC_WIDTH[x86_64] = "64" ## x86_64-unknown-linux-gnux32 DATA_LAYOUT[x86_64-x32] = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" -LLVM_TARGET[x86_64-x32] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[x86_64-x32] = "little" TARGET_POINTER_WIDTH[x86_64-x32] = "32" TARGET_C_INT_WIDTH[x86_64-x32] = "32" @@ -162,7 +157,6 @@ MAX_ATOMIC_WIDTH[x86_64-x32] = "64" ## i686-unknown-linux-{gnu, musl} DATA_LAYOUT[i686] = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128" -LLVM_TARGET[i686] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[i686] = "little" TARGET_POINTER_WIDTH[i686] = "32" TARGET_C_INT_WIDTH[i686] = "32" @@ -170,7 +164,6 @@ MAX_ATOMIC_WIDTH[i686] = "64" ## XXX: a bit of a hack so qemux86 builds, clone of i686-unknown-linux-{gnu, musl} above DATA_LAYOUT[i586] = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128" -LLVM_TARGET[i586] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[i586] = "little" TARGET_POINTER_WIDTH[i586] = "32" TARGET_C_INT_WIDTH[i586] = "32" @@ -178,7 +171,6 @@ MAX_ATOMIC_WIDTH[i586] = "64" ## mips-unknown-linux-{gnu, musl} DATA_LAYOUT[mips] = "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64" -LLVM_TARGET[mips] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[mips] = "big" TARGET_POINTER_WIDTH[mips] = "32" TARGET_C_INT_WIDTH[mips] = "32" @@ -186,7 +178,6 @@ MAX_ATOMIC_WIDTH[mips] = "32" ## mipsel-unknown-linux-{gnu, musl} DATA_LAYOUT[mipsel] = "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64" -LLVM_TARGET[mipsel] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[mipsel] = "little" TARGET_POINTER_WIDTH[mipsel] = "32" TARGET_C_INT_WIDTH[mipsel] = "32" @@ -194,7 +185,6 @@ MAX_ATOMIC_WIDTH[mipsel] = "32" ## mips64-unknown-linux-{gnu, musl} DATA_LAYOUT[mips64] = "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128" -LLVM_TARGET[mips64] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[mips64] = "big" TARGET_POINTER_WIDTH[mips64] = "64" TARGET_C_INT_WIDTH[mips64] = "64" @@ -202,7 +192,6 @@ MAX_ATOMIC_WIDTH[mips64] = "64" ## mips64el-unknown-linux-{gnu, musl} DATA_LAYOUT[mips64el] = "e-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128" -LLVM_TARGET[mips64el] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[mips64el] = "little" TARGET_POINTER_WIDTH[mips64el] = "64" TARGET_C_INT_WIDTH[mips64el] = "64" @@ -210,7 +199,6 @@ MAX_ATOMIC_WIDTH[mips64el] = "64" ## powerpc-unknown-linux-{gnu, musl} DATA_LAYOUT[powerpc] = "E-m:e-p:32:32-i64:64-n32" -LLVM_TARGET[powerpc] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[powerpc] = "big" TARGET_POINTER_WIDTH[powerpc] = "32" TARGET_C_INT_WIDTH[powerpc] = "32" @@ -218,7 +206,6 @@ MAX_ATOMIC_WIDTH[powerpc] = "32" ## powerpc64-unknown-linux-{gnu, musl} DATA_LAYOUT[powerpc64] = "E-m:e-i64:64-n32:64-S128-v256:256:256-v512:512:512" -LLVM_TARGET[powerpc64] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[powerpc64] = "big" TARGET_POINTER_WIDTH[powerpc64] = "64" TARGET_C_INT_WIDTH[powerpc64] = "64" @@ -226,7 +213,6 @@ MAX_ATOMIC_WIDTH[powerpc64] = "64" ## powerpc64le-unknown-linux-{gnu, musl} DATA_LAYOUT[powerpc64le] = "e-m:e-i64:64-n32:64-v256:256:256-v512:512:512" -LLVM_TARGET[powerpc64le] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[powerpc64le] = "little" TARGET_POINTER_WIDTH[powerpc64le] = "64" TARGET_C_INT_WIDTH[powerpc64le] = "64" @@ -234,7 +220,6 @@ MAX_ATOMIC_WIDTH[powerpc64le] = "64" ## riscv32-unknown-linux-{gnu, musl} DATA_LAYOUT[riscv32] = "e-m:e-p:32:32-i64:64-n32-S128" -LLVM_TARGET[riscv32] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[riscv32] = "little" TARGET_POINTER_WIDTH[riscv32] = "32" TARGET_C_INT_WIDTH[riscv32] = "32" @@ -242,7 +227,6 @@ MAX_ATOMIC_WIDTH[riscv32] = "32" ## riscv64-unknown-linux-{gnu, musl} DATA_LAYOUT[riscv64] = "e-m:e-p:64:64-i64:64-i128:128-n64-S128" -LLVM_TARGET[riscv64] = "${RUST_TARGET_SYS}" TARGET_ENDIAN[riscv64] = "little" TARGET_POINTER_WIDTH[riscv64] = "64" TARGET_C_INT_WIDTH[riscv64] = "64" @@ -325,7 +309,10 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): # build tspec tspec = {} - tspec['llvm-target'] = d.getVarFlag('LLVM_TARGET', arch_abi) + if bb.data.inherits_class('cross-canadian', d): + tspec['llvm-target'] = d.getVar('RUST_HOST_SYS', arch_abi) + else: + tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi) tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch_abi) tspec['max-atomic-width'] = int(d.getVarFlag('MAX_ATOMIC_WIDTH', arch_abi)) tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) @@ -360,7 +347,7 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): with open(wd + sys + '.json', 'w') as f: json.dump(tspec, f, indent=4) -do_rust_gen_targets[vardeps] += "DATA_LAYOUT LLVM_TARGET TARGET_ENDIAN TARGET_POINTER_WIDTH TARGET_C_INT_WIDTH MAX_ATOMIC_WIDTH FEATURES" +do_rust_gen_targets[vardeps] += "DATA_LAYOUT TARGET_ENDIAN TARGET_POINTER_WIDTH TARGET_C_INT_WIDTH MAX_ATOMIC_WIDTH FEATURES" python do_rust_gen_targets () { wd = d.getVar('WORKDIR') + '/targets/' diff --git a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc index 827000f7bd..1f21c8af26 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc @@ -25,7 +25,6 @@ DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDP -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ " -LLVM_TARGET[x86_64] = "${RUST_HOST_SYS}" python do_rust_gen_targets () { wd = d.getVar('WORKDIR') + '/targets/' rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_LLVM_FEATURES') or "", d.getVar('TARGET_LLVM_CPU'), d.getVar('TARGET_ARCH')) From patchwork Thu Jun 2 16:51:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8774 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 D9085C43334 for ; Thu, 2 Jun 2022 16:53:13 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web09.1544.1654188792394489359 for ; Thu, 02 Jun 2022 09:53:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=z8j8dOyp; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id j7so5422299pjn.4 for ; Thu, 02 Jun 2022 09:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZyAIgHiOSDWEuKSa4JVgO2QyHWKMROWdRaVhJ0gZh+w=; b=z8j8dOypma6K2Z++J8YCCWdTQZ6JPXSGwub/DLzNvXhcvqNV3SNS0H/pmiuJCOeFrs FmVxTUYSMuQ49wSzqZE+o4WLDi6lWRuVkp6rdEBDRejgU1PKOpqkIwlffy8TT+bsCvpk htftS4xrPbDIaq/2VW0oUEjSKtYyxyIx5t/M0MIE4t/J/IUWs85+YxIeKolIaWQaK4+0 /IfSXJ0nTyxv/u9A1V6zOSsV1M4OerIEvQQ7OJjNVRwSIAzpNILOpYh3t5+9GgeOX3Bq EGXzEzelmCtZ/lRtrPJh/JmaznW03LtVmea/V53cHXlKT3fwrppLEPYz9LaTZJCNOUZ3 Dhdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZyAIgHiOSDWEuKSa4JVgO2QyHWKMROWdRaVhJ0gZh+w=; b=yFjfmt2odvQ9JJ2VokGdaJ8v/32pOkGnmtrIp/4b46+ddksXnSn39SzQnZwSOZJe/S 9/CSh6cHHZW4qiFUvjQ8tFsmadHr0X5wVUsL6o/udILb8xAQ/PHnUM23ereiqD4XOUHi zJBVSTqEYM0lRAU4ZgB/r66HfaRHPrHuuzo4DbJBE7EGnm9rGGszWFP1cezLeRQ9YvQE 8xoXcdSKSs3MCdklB79aR5WRKTCvsEK7JQ0SNORfIqVNcQowhet+GhmY4fYENgGZVBEY cB/57FisQGLl7/Mgvt4xcR0KrtdG3kyXiohVe2AbUI1DKACobQz3fn8WUNBG2zhfA7Nn EgZQ== X-Gm-Message-State: AOAM532inGrrRdBEGGQJpmt2JmJd7WDkjfOtjGDYijInV7l3EikUkYdZ 7A/cVyQR+e6i21UTuUb9AHSDjxbfX3So0Yox X-Google-Smtp-Source: ABdhPJx4FzWaFtdj1k+kr8YuSoQjGnGftJPiosw4gnESRjys3G+3Mzn2EKfutj6gWGUvfoojpRL3uA== X-Received: by 2002:a17:90a:7e02:b0:1e0:a6a7:6eb with SMTP id i2-20020a17090a7e0200b001e0a6a706ebmr6238572pjl.203.1654188790959; Thu, 02 Jun 2022 09:53:10 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.53.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:53:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/26] rust-common: Fix native signature dependency issues Date: Thu, 2 Jun 2022 06:51:57 -1000 Message-Id: <1887a69a1738cdf34d27f396943bce6a7e4f8e39.1654188574.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166502 From: Richard Purdie The previous changes cause sstatetests.SStateTests.test_sstate_32_64_same_hash to fail since RUST_XXX_SYS changes depending on the native architecture. This is correct but these are accounted for in the layout of paths in TMPDIR so they should be excluded from the task signatures for the correct behaviour. Signed-off-by: Richard Purdie (cherry picked from commit 2b9bb4c07d0ab53f58cbdd8a96896780a90be9a8) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/rust/rust-common.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index 3cdce36439..621cd4ad57 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc @@ -347,6 +347,9 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): with open(wd + sys + '.json', 'w') as f: json.dump(tspec, f, indent=4) +# These are accounted for in tmpdir path names so don't need to be in the task sig +rust_gen_target[vardepsexclude] += "RUST_HOST_SYS RUST_TARGET_SYS" + do_rust_gen_targets[vardeps] += "DATA_LAYOUT TARGET_ENDIAN TARGET_POINTER_WIDTH TARGET_C_INT_WIDTH MAX_ATOMIC_WIDTH FEATURES" python do_rust_gen_targets () { From patchwork Thu Jun 2 16:51:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8778 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 EC9B4C433EF for ; Thu, 2 Jun 2022 16:53:23 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web12.1576.1654188796124760974 for ; Thu, 02 Jun 2022 09:53:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=P6L5/I70; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id d129so5222722pgc.9 for ; Thu, 02 Jun 2022 09:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=J8WPWXC5AX7bVdYd9kTNWE0eIgguCw+DkZmc4YmUmVY=; b=P6L5/I70LpDay8z05OKVlS58EO1ZFU2s+1LyeLEKZVhWqIEurXPm6xaJKLRZWCIXOJ S2TxsU86rWAlWP+ICygmZufGGB/GuZLBr59JfttFrBppROTdAOSgMooKkfBqZ9V7DW8u efum3Ab97mfgmMI6DJzyvDapNaPFpoBWqP2IcBXfXufuowcAsvQLLj+gsROQinMEtJvn lsb+9fYWy0+LHM88etHCXyhVU4AYUdG8bPIAEYmSsaWQzcmaBnMvooLj1JTovUR2xwNB BDEHfCGy7gF9l3bjh46ns1iKw6YW+59WRBnzREv6dDw8LaxRdL3eV6JE/xVLd19CzFHt RzpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J8WPWXC5AX7bVdYd9kTNWE0eIgguCw+DkZmc4YmUmVY=; b=7YbwZlFYqtWrduT1FhThMaV/yZzRfxnITuv4WlR2dap77ziORQVNCLk4D2UPaY4m4B AfY7m/LQLJ2RxFTErwcG/oX8TL7Lfzsae+AzmifJ4kf/RGu/UBRA0ZTH0ZACLUXLJAci bbAsoNScazrAKLCmQCJSx9iCCIHJqPsgqYWR2LX3A6Wb7WLnAX4/e1ziDHxMuAtBCT9r 7Mpuk/FM5OwLdXq8TeQMLBd7qkmQ/m1jxTeTBwyiRvghj7QZbBvOEJ247+BTLYDVaUrl b4jdizHhjfPBQR0YBHxIMvHpxRWmsY5zYzO6DyLnU97Xb1yWcK3A2h5Idzir4lMyUCq1 F4VQ== X-Gm-Message-State: AOAM5325g2CuMQKmdS8oxrgmJz5Hvtx898YB4m9yo0mFeMvPxjCo7l84 5nHfSogBe9H2sr5+SflzpcP1uXgC3H/mr8nY X-Google-Smtp-Source: ABdhPJylZGNUOQWikdK6nxN1lLLWIXcy7+Bn+1HXC1Dk5BNzGP61/2qmaZ5xPSGlPRTTaTiWUHWefQ== X-Received: by 2002:a63:5b5d:0:b0:3fc:97d5:f8b2 with SMTP id l29-20020a635b5d000000b003fc97d5f8b2mr5110591pgm.322.1654188793636; Thu, 02 Jun 2022 09:53:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i188-20020a626dc5000000b0050dc762815asm3782233pfc.52.2022.06.02.09.53.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:53:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/26] gcc: Upgrade to 11.3 release Date: Thu, 2 Jun 2022 06:51:58 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Jun 2022 16:53:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166503 From: Khem Raj This is a bugfix release on gcc-11 series, fixes 189 bugs [1] Drop backported patches already included in 11.3 release [1] https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=11.3 Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 2 +- .../gcc/{gcc-11.2.inc => gcc-11.3.inc} | 66 ++-- ...ian_11.2.bb => gcc-cross-canadian_11.3.bb} | 0 .../{gcc-cross_11.2.bb => gcc-cross_11.3.bb} | 0 ...-crosssdk_11.2.bb => gcc-crosssdk_11.3.bb} | 0 ...cc-runtime_11.2.bb => gcc-runtime_11.3.bb} | 0 ...itizers_11.2.bb => gcc-sanitizers_11.3.bb} | 0 ...{gcc-source_11.2.bb => gcc-source_11.3.bb} | 0 .../gcc/gcc/0001-CVE-2021-35465.patch | 138 -------- ...0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 10 +- .../gcc/gcc/0002-CVE-2021-35465.patch | 39 --- .../0002-gcc-poison-system-directories.patch | 26 +- ....patch => 0003-64-bit-multilib-hack.patch} | 2 +- .../gcc/gcc/0003-CVE-2021-35465.patch | 103 ------ .../gcc/gcc/0004-CVE-2021-35465.patch | 304 ------------------ ...s.h-in-B-instead-of-S-and-t-oe-in-B.patch} | 12 +- ...oot.patch => 0005-cpp-honor-sysroot.patch} | 54 ++-- ...MIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch} | 101 +++--- ...gcc-Fix-argument-list-too-long-error.patch | 42 +++ ...{0014-libtool.patch => 0008-libtool.patch} | 2 +- ...-fix-v4bx-to-linker-to-support-EABI.patch} | 2 +- ...config-files-from-B-instead-of-usin.patch} | 14 +- ...r-from-.la-which-usually-points-to-.patch} | 2 +- ...-target-gcc-headers-can-be-included.patch} | 6 +- ...gcc-Fix-argument-list-too-long-error.patch | 38 --- ...-directory-during-relink-if-inst_pr.patch} | 2 +- ...fix-libcc1-s-install-path-and-rpath.patch} | 8 +- ...e-build-CPP-CPPFLAGS-is-used-for-bu.patch} | 89 ++--- ...ins-something-unsupported-by-the-bu.patch} | 39 +-- ...e-sysroot-support-for-nativesdk-gcc.patch} | 14 +- ...root-gcc-version-specific-dirs-with.patch} | 8 +- ...19-nios2-Define-MUSL_DYNAMIC_LINKER.patch} | 28 +- ...-to-link-commandline-for-musl-targe.patch} | 10 +- ...sing-LDFLAGS-not-just-SHLIB_LDFLAGS.patch} | 2 +- ...=> 0022-sync-gcc-stddef.h-with-musl.patch} | 2 +- ...e-introduce-spe-commandline-options.patch} | 4 +- ...s-for-__cpu_indicator_init-instead-.patch} | 6 +- ...-Do-not-use-__LINE__-for-maintainin.patch} | 4 +- ...gw32-Enable-operation_not_supported.patch} | 2 +- ...mic-Do-not-enforce-march-on-aarch64.patch} | 10 +- ...y-debug-prefix-maps-before-checksum.patch} | 24 +- ... 0029-Fix-install-path-of-linux64.h.patch} | 10 +- .../gcc/0042-Fix-thread-stack-size-init.patch | 23 -- .../gcc/{gcc_11.2.bb => gcc_11.3.bb} | 0 ...initial_11.2.bb => libgcc-initial_11.3.bb} | 0 .../gcc/{libgcc_11.2.bb => libgcc_11.3.bb} | 0 ...ibgfortran_11.2.bb => libgfortran_11.3.bb} | 0 47 files changed, 329 insertions(+), 919 deletions(-) rename meta/recipes-devtools/gcc/{gcc-11.2.inc => gcc-11.3.inc} (58%) rename meta/recipes-devtools/gcc/{gcc-cross-canadian_11.2.bb => gcc-cross-canadian_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-cross_11.2.bb => gcc-cross_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-crosssdk_11.2.bb => gcc-crosssdk_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-runtime_11.2.bb => gcc-runtime_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-sanitizers_11.2.bb => gcc-sanitizers_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-source_11.2.bb => gcc-source_11.3.bb} (100%) delete mode 100644 meta/recipes-devtools/gcc/gcc/0001-CVE-2021-35465.patch delete mode 100644 meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch rename meta/recipes-devtools/gcc/gcc/{0004-64-bit-multilib-hack.patch => 0003-64-bit-multilib-hack.patch} (99%) delete mode 100644 meta/recipes-devtools/gcc/gcc/0003-CVE-2021-35465.patch delete mode 100644 meta/recipes-devtools/gcc/gcc/0004-CVE-2021-35465.patch rename meta/recipes-devtools/gcc/gcc/{0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch => 0004-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch} (91%) rename meta/recipes-devtools/gcc/gcc/{0009-cpp-honor-sysroot.patch => 0005-cpp-honor-sysroot.patch} (41%) rename meta/recipes-devtools/gcc/gcc/{0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch => 0006-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch} (81%) create mode 100644 meta/recipes-devtools/gcc/gcc/0007-gcc-Fix-argument-list-too-long-error.patch rename meta/recipes-devtools/gcc/gcc/{0014-libtool.patch => 0008-libtool.patch} (94%) rename meta/recipes-devtools/gcc/gcc/{0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch => 0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch} (95%) rename meta/recipes-devtools/gcc/gcc/{0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch => 0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch} (89%) rename meta/recipes-devtools/gcc/gcc/{0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch => 0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch} (92%) rename meta/recipes-devtools/gcc/gcc/{0019-Ensure-target-gcc-headers-can-be-included.patch => 0012-Ensure-target-gcc-headers-can-be-included.patch} (96%) delete mode 100644 meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch rename meta/recipes-devtools/gcc/gcc/{0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch => 0013-Don-t-search-host-directory-during-relink-if-inst_pr.patch} (93%) rename meta/recipes-devtools/gcc/gcc/{0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch => 0014-libcc1-fix-libcc1-s-install-path-and-rpath.patch} (90%) rename meta/recipes-devtools/gcc/gcc/{0018-export-CPP.patch => 0015-Makefile.in-Ensure-build-CPP-CPPFLAGS-is-used-for-bu.patch} (79%) rename meta/recipes-devtools/gcc/gcc/{0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch => 0016-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch} (68%) rename meta/recipes-devtools/gcc/gcc/{0024-handle-sysroot-support-for-nativesdk-gcc.patch => 0017-handle-sysroot-support-for-nativesdk-gcc.patch} (98%) rename meta/recipes-devtools/gcc/gcc/{0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch => 0018-Search-target-sysroot-gcc-version-specific-dirs-with.patch} (92%) rename meta/recipes-devtools/gcc/gcc/{0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch => 0019-nios2-Define-MUSL_DYNAMIC_LINKER.patch} (40%) rename meta/recipes-devtools/gcc/gcc/{0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch => 0020-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch} (84%) rename meta/recipes-devtools/gcc/gcc/{0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch => 0021-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch} (93%) rename meta/recipes-devtools/gcc/gcc/{0030-sync-gcc-stddef.h-with-musl.patch => 0022-sync-gcc-stddef.h-with-musl.patch} (97%) rename meta/recipes-devtools/gcc/gcc/{0033-Re-introduce-spe-commandline-options.patch => 0023-Re-introduce-spe-commandline-options.patch} (90%) rename meta/recipes-devtools/gcc/gcc/{0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch => 0024-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch} (94%) rename meta/recipes-devtools/gcc/gcc/{0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch => 0025-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch} (98%) rename meta/recipes-devtools/gcc/gcc/{0036-mingw32-Enable-operation_not_supported.patch => 0026-mingw32-Enable-operation_not_supported.patch} (93%) rename meta/recipes-devtools/gcc/gcc/{0037-libatomic-Do-not-enforce-march-on-aarch64.patch => 0027-libatomic-Do-not-enforce-march-on-aarch64.patch} (85%) rename meta/recipes-devtools/gcc/gcc/{0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch => 0028-debug-101473-apply-debug-prefix-maps-before-checksum.patch} (81%) rename meta/recipes-devtools/gcc/gcc/{0001-Fix-install-path-of-linux64.h.patch => 0029-Fix-install-path-of-linux64.h.patch} (81%) delete mode 100644 meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch rename meta/recipes-devtools/gcc/{gcc_11.2.bb => gcc_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc-initial_11.2.bb => libgcc-initial_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc_11.2.bb => libgcc_11.3.bb} (100%) rename meta/recipes-devtools/gcc/{libgfortran_11.2.bb => libgfortran_11.3.bb} (100%) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 2c5e730827..0a1897fc92 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -189,7 +189,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj -Date: Fri, 11 Jun 2021 16:02:05 +0100 -Subject: [PATCH] arm: Add command-line option for enabling CVE-2021-35465 - mitigation [PR102035] - -Add a new option, -mfix-cmse-cve-2021-35465 and document it. Enable it -automatically for cortex-m33, cortex-m35p and cortex-m55. - -gcc: - PR target/102035 - * config/arm/arm.opt (mfix-cmse-cve-2021-35465): New option. - * doc/invoke.texi (Arm Options): Document it. - * config/arm/arm-cpus.in (quirk_vlldm): New feature bit. - (ALL_QUIRKS): Add quirk_vlldm. - (cortex-m33): Add quirk_vlldm. - (cortex-m35p, cortex-m55): Likewise. - * config/arm/arm.c (arm_option_override): Enable fix_vlldm if - targetting an affected CPU and not explicitly controlled on - the command line. - -CVE: CVE-2021-35465 -Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=3929bca9ca95de9d35e82ae8828b188029e3eb70] -Signed-off-by: Pgowda - ---- - gcc/config/arm/arm-cpus.in | 9 +++++++-- - gcc/config/arm/arm.c | 9 +++++++++ - gcc/config/arm/arm.opt | 4 ++++ - gcc/doc/invoke.texi | 9 +++++++++ - 4 files changed, 29 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c ---- a/gcc/config/arm/arm.c 2021-11-15 02:13:11.100579812 -0800 -+++ b/gcc/config/arm/arm.c 2021-11-15 02:17:36.988237692 -0800 -@@ -3610,6 +3610,15 @@ arm_option_override (void) - fix_cm3_ldrd = 0; - } - -+ /* Enable fix_vlldm by default if required. */ -+ if (fix_vlldm == 2) -+ { -+ if (bitmap_bit_p (arm_active_target.isa, isa_bit_quirk_vlldm)) -+ fix_vlldm = 1; -+ else -+ fix_vlldm = 0; -+ } -+ - /* Hot/Cold partitioning is not currently supported, since we can't - handle literal pool placement in that case. */ - if (flag_reorder_blocks_and_partition) -diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in ---- a/gcc/config/arm/arm-cpus.in 2021-11-15 02:13:11.104579747 -0800 -+++ b/gcc/config/arm/arm-cpus.in 2021-11-15 02:17:36.984237757 -0800 -@@ -186,6 +186,9 @@ define feature quirk_armv6kz - # Cortex-M3 LDRD quirk. - define feature quirk_cm3_ldrd - -+# v8-m/v8.1-m VLLDM errata. -+define feature quirk_vlldm -+ - # Don't use .cpu assembly directive - define feature quirk_no_asmcpu - -@@ -322,7 +325,7 @@ define implied vfp_base MVE MVE_FP ALL_F - # architectures. - # xscale isn't really a 'quirk', but it isn't an architecture either and we - # need to ignore it for matching purposes. --define fgroup ALL_QUIRKS quirk_no_volatile_ce quirk_armv6kz quirk_cm3_ldrd xscale quirk_no_asmcpu -+define fgroup ALL_QUIRKS quirk_no_volatile_ce quirk_armv6kz quirk_cm3_ldrd quirk_vlldm xscale quirk_no_asmcpu - - define fgroup IGNORE_FOR_MULTILIB cdecp0 cdecp1 cdecp2 cdecp3 cdecp4 cdecp5 cdecp6 cdecp7 - -@@ -1570,6 +1573,7 @@ begin cpu cortex-m33 - architecture armv8-m.main+dsp+fp - option nofp remove ALL_FP - option nodsp remove armv7em -+ isa quirk_vlldm - costs v7m - end cpu cortex-m33 - -@@ -1579,6 +1583,7 @@ begin cpu cortex-m35p - architecture armv8-m.main+dsp+fp - option nofp remove ALL_FP - option nodsp remove armv7em -+ isa quirk_vlldm - costs v7m - end cpu cortex-m35p - -@@ -1590,7 +1595,7 @@ begin cpu cortex-m55 - option nomve remove mve mve_float - option nofp remove ALL_FP mve_float - option nodsp remove MVE mve_float -- isa quirk_no_asmcpu -+ isa quirk_no_asmcpu quirk_vlldm - costs v7m - vendor 41 - end cpu cortex-m55 -diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt ---- a/gcc/config/arm/arm.opt 2021-11-15 02:13:11.104579747 -0800 -+++ b/gcc/config/arm/arm.opt 2021-11-15 02:17:36.988237692 -0800 -@@ -268,6 +268,10 @@ Target Var(fix_cm3_ldrd) Init(2) - Avoid overlapping destination and address registers on LDRD instructions - that may trigger Cortex-M3 errata. - -+mfix-cmse-cve-2021-35465 -+Target Var(fix_vlldm) Init(2) -+Mitigate issues with VLLDM on some M-profile devices (CVE-2021-35465). -+ - munaligned-access - Target Var(unaligned_access) Init(2) Save - Enable unaligned word and halfword accesses to packed data. -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi ---- a/gcc/doc/invoke.texi 2021-11-15 02:13:11.112579616 -0800 -+++ b/gcc/doc/invoke.texi 2021-11-15 02:17:36.996237562 -0800 -@@ -804,6 +804,7 @@ Objective-C and Objective-C++ Dialects}. - -mverbose-cost-dump @gol - -mpure-code @gol - -mcmse @gol -+-mfix-cmse-cve-2021-35465 @gol - -mfdpic} - - @emph{AVR Options} -@@ -20487,6 +20488,14 @@ Generate secure code as per the "ARMv8-M - Development Tools Engineering Specification", which can be found on - @url{https://developer.arm.com/documentation/ecm0359818/latest/}. - -+@item -mfix-cmse-cve-2021-35465 -+@opindex mfix-cmse-cve-2021-35465 -+Mitigate against a potential security issue with the @code{VLLDM} instruction -+in some M-profile devices when using CMSE (CVE-2021-365465). This option is -+enabled by default when the option @option{-mcpu=} is used with -+@code{cortex-m33}, @code{cortex-m35p} or @code{cortex-m55}. The option -+@option{-mno-fix-cmse-cve-2021-35465} can be used to disable the mitigation. -+ - @item -mfdpic - @itemx -mno-fdpic - @opindex mfdpic diff --git a/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch index 0a108ee51b..0bf8834bb2 100644 --- a/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch +++ b/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch @@ -1,4 +1,4 @@ -From 368eaf1846733a9920c7cf5bc547a377e7167785 Mon Sep 17 00:00:00 2001 +From 6badb97389cae4ff9a533d38dc7cceefe21b97a8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 08:37:11 +0400 Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET @@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [embedded specific] 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 504f6410274..bcebad264ec 100755 +index e218a19e333..45744e6e471 100755 --- a/configure +++ b/configure -@@ -9728,7 +9728,7 @@ fi +@@ -9750,7 +9750,7 @@ fi # for target_alias and gcc doesn't manage it consistently. target_configargs="--cache-file=./config.cache ${target_configargs}" @@ -25,10 +25,10 @@ index 504f6410274..bcebad264ec 100755 *" newlib "*) case " $target_configargs " in diff --git a/configure.ac b/configure.ac -index 088e735c5db..1289fe08760 100644 +index 7e8e628b325..bf66b51373c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3240,7 +3240,7 @@ fi +@@ -3255,7 +3255,7 @@ fi # for target_alias and gcc doesn't manage it consistently. target_configargs="--cache-file=./config.cache ${target_configargs}" diff --git a/meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch b/meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch deleted file mode 100644 index e09818fecf..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 574e7950bd6b34e9e2cacce18c802b45505d1d0a Mon Sep 17 00:00:00 2001 -From: Richard Earnshaw -Date: Fri, 18 Jun 2021 17:16:25 +0100 -Subject: [PATCH] arm: add erratum mitigation to __gnu_cmse_nonsecure_call - [PR102035] - -Add the recommended erratum mitigation sequence to -__gnu_cmse_nonsecure_call for use on Armv8-m.main devices. Since this -is in the library code we cannot know in advance whether the core we -are running on will be affected by this, so always enable it. - -libgcc: - PR target/102035 - * config/arm/cmse_nonsecure_call.S (__gnu_cmse_nonsecure_call): - Add vlldm erratum work-around. - -CVE: CVE-2021-35465 -Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=574e7950bd6b34e9e2cacce18c802b45505d1d0a] -Signed-off-by: Pgowda - ---- - libgcc/config/arm/cmse_nonsecure_call.S | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libgcc/config/arm/cmse_nonsecure_call.S b/libgcc/config/arm/cmse_nonsecure_call.S ---- a/libgcc/config/arm/cmse_nonsecure_call.S -+++ b/libgcc/config/arm/cmse_nonsecure_call.S -@@ -102,6 +102,11 @@ blxns r4 - #ifdef __ARM_PCS_VFP - vpop.f64 {d8-d15} - #else -+/* VLLDM erratum mitigation sequence. */ -+mrs r5, control -+tst r5, #8 /* CONTROL_S.SFPA */ -+it ne -+.inst.w 0xeeb00a40 /* vmovne s0, s0 */ - vlldm sp /* Lazy restore of d0-d16 and FPSCR. */ - add sp, sp, #0x88 /* Free space used to save floating point registers. */ - #endif /* __ARM_PCS_VFP */ diff --git a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch index 18a9fb8701..d19cefbdf9 100644 --- a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch +++ b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch @@ -1,4 +1,4 @@ -From 118c6f054711d437167ff125a88c9236bfc8099c Mon Sep 17 00:00:00 2001 +From 863f1f9dc78839ecd021b2cb01d501e8c9e00ef7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 8 Mar 2021 16:04:20 -0800 Subject: [PATCH] gcc: poison-system-directories @@ -25,7 +25,7 @@ Signed-off-by: Khem Raj 7 files changed, 86 insertions(+), 2 deletions(-) diff --git a/gcc/common.opt b/gcc/common.opt -index c75dd36843e..49acbd6ed44 100644 +index a75b44ee47e..d15105a73f3 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -683,6 +683,10 @@ Wreturn-local-addr @@ -40,10 +40,10 @@ index c75dd36843e..49acbd6ed44 100644 Common Var(warn_shadow) Warning Warn when one variable shadows another. Same as -Wshadow=global. diff --git a/gcc/config.in b/gcc/config.in -index 10a13cde586..8848284da41 100644 +index 048bf52e8c2..4f973f7906a 100644 --- a/gcc/config.in +++ b/gcc/config.in -@@ -218,6 +218,16 @@ +@@ -230,6 +230,16 @@ #endif @@ -61,10 +61,10 @@ index 10a13cde586..8848284da41 100644 optimizer and back end) to be checked for dynamic type safety at runtime. This is quite expensive. */ diff --git a/gcc/configure b/gcc/configure -index 9bb436ce7bd..3f0734bff11 100755 +index 7218b0c331a..d7445339f9a 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -1020,6 +1020,7 @@ enable_maintainer_mode +@@ -1019,6 +1019,7 @@ enable_maintainer_mode enable_link_mutex enable_link_serialization enable_version_specific_runtime_libs @@ -72,7 +72,7 @@ index 9bb436ce7bd..3f0734bff11 100755 enable_plugin enable_host_shared enable_libquadmath_support -@@ -1782,6 +1783,8 @@ Optional Features: +@@ -1781,6 +1782,8 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory @@ -81,7 +81,7 @@ index 9bb436ce7bd..3f0734bff11 100755 --enable-plugin enable plugin support --enable-host-shared build host code as shared libraries --disable-libquadmath-support -@@ -31325,6 +31328,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : +@@ -31932,6 +31935,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi @@ -105,10 +105,10 @@ index 9bb436ce7bd..3f0734bff11 100755 diff --git a/gcc/configure.ac b/gcc/configure.ac -index caa611933df..54e21764b3e 100644 +index 49f043ed29b..fe488f2232b 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -7123,6 +7123,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, +@@ -7393,6 +7393,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [specify that runtime libraries should be installed in a compiler-specific directory])]) @@ -132,7 +132,7 @@ index caa611933df..54e21764b3e 100644 AC_SUBST(subdirs) AC_SUBST(srcdir) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 7a368959e5e..6659a903bf0 100644 +index 35508efb4ef..40f798eac78 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}. @@ -143,7 +143,7 @@ index 7a368959e5e..6659a903bf0 100644 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol -Wrestrict -Wno-return-local-addr -Wreturn-type @gol -Wno-scalar-storage-order -Wsequence-point @gol -@@ -7735,6 +7736,14 @@ made up of data only and thus requires no special treatment. But, for +@@ -7728,6 +7729,14 @@ made up of data only and thus requires no special treatment. But, for most targets, it is made up of code and thus requires the stack to be made executable in order for the program to work properly. @@ -159,7 +159,7 @@ index 7a368959e5e..6659a903bf0 100644 @opindex Wfloat-equal @opindex Wno-float-equal diff --git a/gcc/gcc.c b/gcc/gcc.c -index 7837553958b..19c75b6e20d 100644 +index 0af888c7d78..b047fc31c2f 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -1152,6 +1152,8 @@ proper position among the other output files. */ diff --git a/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch similarity index 99% rename from meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch rename to meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch index 5f14dd2a58..c0e8cbd4d9 100644 --- a/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch @@ -1,4 +1,4 @@ -From 2fa5c93641b75a662839c1b6eee172b6c481c70e Mon Sep 17 00:00:00 2001 +From b87a3ac51df372128be2fda992238c5aab4a719a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:10:06 +0400 Subject: [PATCH] 64-bit multilib hack. diff --git a/meta/recipes-devtools/gcc/gcc/0003-CVE-2021-35465.patch b/meta/recipes-devtools/gcc/gcc/0003-CVE-2021-35465.patch deleted file mode 100644 index c7a7c76bf8..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0003-CVE-2021-35465.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 30461cf8dba3d3adb15a125e4da48800eb2b9b8f Mon Sep 17 00:00:00 2001 -From: Richard Earnshaw -Date: Fri, 18 Jun 2021 17:18:37 +0100 -Subject: [PATCH] arm: fix vlldm erratum for Armv8.1-m [PR102035] - -For Armv8.1-m we generate code that emits VLLDM directly and do not -rely on support code in the library, so emit the mitigation directly -as well, when required. In this case, we can use the compiler options -to determine when to apply the fix and when it is safe to omit it. - -gcc: - PR target/102035 - * config/arm/arm.md (attribute arch): Add fix_vlldm. - (arch_enabled): Use it. - * config/arm/vfp.md (lazy_store_multiple_insn): Add alternative to - use when erratum mitigation is needed. - -CVE: CVE-2021-35465 -Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=30461cf8dba3d3adb15a125e4da48800eb2b9b8f] -Signed-off-by: Pgowda - ---- - gcc/config/arm/arm.md | 11 +++++++++-- - gcc/config/arm/vfp.md | 10 +++++++--- - 2 files changed, 16 insertions(+), 5 deletions(-) - -diff -upr a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md ---- a/gcc/config/arm/arm.md 2020-07-22 23:35:17.344384552 -0700 -+++ b/gcc/config/arm/arm.md 2021-11-11 20:33:58.431543947 -0800 -@@ -132,9 +132,12 @@ - ; TARGET_32BIT, "t1" or "t2" to specify a specific Thumb mode. "v6" - ; for ARM or Thumb-2 with arm_arch6, and nov6 for ARM without - ; arm_arch6. "v6t2" for Thumb-2 with arm_arch6 and "v8mb" for ARMv8-M --; Baseline. This attribute is used to compute attribute "enabled", -+; Baseline. "fix_vlldm" is for fixing the v8-m/v8.1-m VLLDM erratum. -+; This attribute is used to compute attribute "enabled", - ; use type "any" to enable an alternative in all cases. --(define_attr "arch" "any,a,t,32,t1,t2,v6,nov6,v6t2,v8mb,iwmmxt,iwmmxt2,armv6_or_vfpv3,neon,mve" -+(define_attr "arch" "any, a, t, 32, t1, t2, v6,nov6, v6t2, \ -+ v8mb, fix_vlldm, iwmmxt, iwmmxt2, armv6_or_vfpv3, \ -+ neon, mve" - (const_string "any")) - - (define_attr "arch_enabled" "no,yes" -@@ -177,6 +180,10 @@ - (match_test "TARGET_THUMB1 && arm_arch8")) - (const_string "yes") - -+ (and (eq_attr "arch" "fix_vlldm") -+ (match_test "fix_vlldm")) -+ (const_string "yes") -+ - (and (eq_attr "arch" "iwmmxt2") - (match_test "TARGET_REALLY_IWMMXT2")) - (const_string "yes") -diff -upr a/gcc/config/arm/vfp.md b/gcc/config/arm/vfp.md ---- a/gcc/config/arm/vfp.md 2020-07-22 23:35:17.356384684 -0700 -+++ b/gcc/config/arm/vfp.md 2021-11-11 20:33:58.431543947 -0800 -@@ -1703,12 +1703,15 @@ - (set_attr "type" "mov_reg")] - ) - -+;; Both this and the next instruction are treated by GCC in the same -+;; way as a blockage pattern. That's perhaps stronger than it needs -+;; to be, but we do not want accesses to the VFP register bank to be -+;; moved across either instruction. -+ - (define_insn "lazy_store_multiple_insn" -- [(set (match_operand:SI 0 "s_register_operand" "+&rk") -- (post_dec:SI (match_dup 0))) -- (unspec_volatile [(const_int 0) -- (mem:SI (post_dec:SI (match_dup 0)))] -- VUNSPEC_VLSTM)] -+ [(unspec_volatile -+ [(mem:BLK (match_operand:SI 0 "s_register_operand" "rk"))] -+ VUNSPEC_VLSTM)] - "use_cmse && reload_completed" - "vlstm%?\\t%0" - [(set_attr "predicable" "yes") -@@ -1716,14 +1719,16 @@ - ) - - (define_insn "lazy_load_multiple_insn" -- [(set (match_operand:SI 0 "s_register_operand" "+&rk") -- (post_inc:SI (match_dup 0))) -- (unspec_volatile:SI [(const_int 0) -- (mem:SI (match_dup 0))] -- VUNSPEC_VLLDM)] -+ [(unspec_volatile -+ [(mem:BLK (match_operand:SI 0 "s_register_operand" "rk,rk"))] -+ VUNSPEC_VLLDM)] - "use_cmse && reload_completed" -- "vlldm%?\\t%0" -- [(set_attr "predicable" "yes") -+ "@ -+ vscclrm\\t{vpr}\;vlldm\\t%0 -+ vlldm\\t%0" -+ [(set_attr "arch" "fix_vlldm,*") -+ (set_attr "predicable" "no") -+ (set_attr "length" "8,4") - (set_attr "type" "load_4")] - ) - diff --git a/meta/recipes-devtools/gcc/gcc/0004-CVE-2021-35465.patch b/meta/recipes-devtools/gcc/gcc/0004-CVE-2021-35465.patch deleted file mode 100644 index 9dd6a313c2..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0004-CVE-2021-35465.patch +++ /dev/null @@ -1,304 +0,0 @@ -From 809330ab8450261e05919b472783bf15e4b000f7 Mon Sep 17 00:00:00 2001 -From: Richard Earnshaw -Date: Tue, 6 Jul 2021 15:10:18 +0100 -Subject: [PATCH] arm: Add tests for VLLDM mitigation [PR102035] - -New tests for the erratum mitigation. - -gcc/testsuite: - PR target/102035 - * gcc.target/arm/cmse/mainline/8_1m/soft/cmse-13a.c: New test. - * gcc.target/arm/cmse/mainline/8_1m/soft/cmse-7a.c: Likewise. - * gcc.target/arm/cmse/mainline/8_1m/soft/cmse-8a.c: Likewise. - * gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-7a.c: Likewise. - * gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-8a.c: Likewise. - * gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-13a.c: Likewise. - * gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-7a.c: Likewise. - * gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-8a.c: Likewise. - -CVE: CVE-2021-35465 -Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=809330ab8450261e05919b472783bf15e4b000f7] -Signed-off-by: Pgowda - ---- - .../arm/cmse/mainline/8_1m/soft/cmse-13a.c | 31 +++++++++++++++++++ - .../arm/cmse/mainline/8_1m/soft/cmse-7a.c | 28 +++++++++++++++++ - .../arm/cmse/mainline/8_1m/soft/cmse-8a.c | 30 ++++++++++++++++++ - .../cmse/mainline/8_1m/softfp-sp/cmse-7a.c | 27 ++++++++++++++++ - .../cmse/mainline/8_1m/softfp-sp/cmse-8a.c | 29 +++++++++++++++++ - .../arm/cmse/mainline/8_1m/softfp/cmse-13a.c | 30 ++++++++++++++++++ - .../arm/cmse/mainline/8_1m/softfp/cmse-7a.c | 27 ++++++++++++++++ - .../arm/cmse/mainline/8_1m/softfp/cmse-8a.c | 29 +++++++++++++++++ - 8 files changed, 231 insertions(+) - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-13a.c - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-7a.c - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-8a.c - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-7a.c - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-8a.c - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-13a.c - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-7a.c - create mode 100644 gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-8a.c - -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-13a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-13a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-13a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-13a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,31 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=soft -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ -+ -+#include "../../../cmse-13.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[1,4-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[1,4-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler-not "mov\tr0, r4" } } */ -+/* { dg-final { scan-assembler-not "mov\tr2, r4" } } */ -+/* { dg-final { scan-assembler-not "mov\tr3, r4" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r1, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[1,4-9\]|r10|fp|ip), ){9}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[1,4-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler-not "vmov" } } */ -+/* { dg-final { scan-assembler-not "vmsr" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-7a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-7a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-7a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-7a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,28 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=soft -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ -+ -+#include "../../../cmse-7.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[0-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[0-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r0, )?(r1, )?(r2, )?(r3, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[0-9\]|r10|fp|ip), ){12}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[0-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler-not "vmov" } } */ -+/* { dg-final { scan-assembler-not "vmsr" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-8a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-8a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-8a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/soft/cmse-8a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,30 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=soft -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ -+ -+#include "../../../cmse-8.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[2-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[2-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler-not "mov\tr0, r4" } } */ -+/* { dg-final { scan-assembler-not "mov\tr1, r4" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r2, )?(r3, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[2-9\]|r10|fp|ip), ){10}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[2-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler-not "vmov" } } */ -+/* { dg-final { scan-assembler-not "vmsr" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-13a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-13a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-13a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-13a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,30 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16 -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=softfp" } } */ -+/* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */ -+ -+#include "../../../cmse-13.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[1,4-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[1,4-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler-not "mov\tr0, r4" } } */ -+/* { dg-final { scan-assembler-not "mov\tr2, r4" } } */ -+/* { dg-final { scan-assembler-not "mov\tr3, r4" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r1, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[1,4-9\]|r10|fp|ip), ){9}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[1,4-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-7a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-7a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-7a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-7a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,27 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16 -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=softfp" } } */ -+/* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */ -+ -+#include "../../../cmse-7.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[0-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[0-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r0, )?(r1, )?(r2, )?(r3, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[0-9\]|r10|fp|ip), ){12}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[0-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-8a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-8a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-8a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp/cmse-8a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,29 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16 -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=softfp" } } */ -+/* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */ -+ -+#include "../../../cmse-8.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[2-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[2-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler-not "mov\tr0, r4" } } */ -+/* { dg-final { scan-assembler-not "mov\tr1, r4" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r2, )?(r3, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[2-9\]|r10|fp|ip), ){10}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[2-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-7a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-7a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-7a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-7a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,27 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=softfp" } } */ -+/* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */ -+ -+#include "../../../cmse-7.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[0-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[0-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r0, )?(r1, )?(r2, )?(r3, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[0-9\]|r10|fp|ip), ){12}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[0-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ -diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-8a.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-8a.c ---- a/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-8a.c 1969-12-31 16:00:00.000000000 -0800 -+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/8_1m/softfp-sp/cmse-8a.c 2021-11-15 02:30:37.210637445 -0800 -@@ -0,0 +1,29 @@ -+/* { dg-do compile } */ -+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -mfix-cmse-cve-2021-35465" } */ -+/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=softfp" } } */ -+/* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */ -+ -+#include "../../../cmse-8.x" -+ -+/* Checks for saving and clearing prior to function call. */ -+/* Shift on the same register as blxns. */ -+/* { dg-final { scan-assembler "lsrs\t(r\[2-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler "lsls\t(r\[2-9\]|r10|fp|ip), \\1, #1.*blxns\t\\1" } } */ -+/* { dg-final { scan-assembler-not "mov\tr0, r4" } } */ -+/* { dg-final { scan-assembler-not "mov\tr1, r4" } } */ -+/* { dg-final { scan-assembler "push\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+/* { dg-final { scan-assembler "vlstm\tsp" } } */ -+/* Check the right registers are cleared and none appears twice. */ -+/* { dg-final { scan-assembler "clrm\t\{(r2, )?(r3, )?(r4, )?(r5, )?(r6, )?(r7, )?(r8, )?(r9, )?(r10, )?(fp, )?(ip, )?APSR\}" } } */ -+/* Check that the right number of registers is cleared and thus only one -+ register is missing. */ -+/* { dg-final { scan-assembler "clrm\t\{((r\[2-9\]|r10|fp|ip), ){10}APSR\}" } } */ -+/* Check that no cleared register is used for blxns. */ -+/* { dg-final { scan-assembler-not "clrm\t\{\[^\}\]\+(r\[2-9\]|r10|fp|ip),\[^\}\]\+\}.*blxns\t\\1" } } */ -+/* Check for v8.1-m variant of erratum work-around. */ -+/* { dg-final { scan-assembler "vscclrm\t\{vpr\}" } } */ -+/* { dg-final { scan-assembler "vlldm\tsp" } } */ -+/* { dg-final { scan-assembler "pop\t\{r4, r5, r6, r7, r8, r9, r10, fp\}" } } */ -+ -+/* Now we check that we use the correct intrinsic to call. */ -+/* { dg-final { scan-assembler "blxns" } } */ diff --git a/meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc/0004-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch rename to meta/recipes-devtools/gcc/gcc/0004-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch index 9844c2ae8a..55a58851dc 100644 --- a/meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch +++ b/meta/recipes-devtools/gcc/gcc/0004-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch @@ -1,4 +1,4 @@ -From e64342df647829d3e1c52fd480a5be7c1281ced0 Mon Sep 17 00:00:00 2001 +From 1766cf28fd7d917df510b1c262c47211b9ea70fa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:17:25 +0400 Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} @@ -26,7 +26,7 @@ Signed-off-by: Hongxu Jia 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 8a5fb3fd99c..7da6f439fff 100644 +index 7bfd6ce653f..95962ae37b6 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -552,7 +552,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ @@ -39,10 +39,10 @@ index 8a5fb3fd99c..7da6f439fff 100644 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ diff --git a/gcc/configure b/gcc/configure -index 3f0734bff11..c5d3bc4ee2d 100755 +index d7445339f9a..f5b99d1cf7d 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -13090,8 +13090,8 @@ for f in $tm_file; do +@@ -13131,8 +13131,8 @@ for f in $tm_file; do tm_include_list="${tm_include_list} $f" ;; defaults.h ) @@ -54,10 +54,10 @@ index 3f0734bff11..c5d3bc4ee2d 100755 * ) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" diff --git a/gcc/configure.ac b/gcc/configure.ac -index 54e21764b3e..f83420326d6 100644 +index fe488f2232b..29005f6d18f 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -2263,8 +2263,8 @@ for f in $tm_file; do +@@ -2294,8 +2294,8 @@ for f in $tm_file; do tm_include_list="${tm_include_list} $f" ;; defaults.h ) diff --git a/meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc/0005-cpp-honor-sysroot.patch similarity index 41% rename from meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch rename to meta/recipes-devtools/gcc/gcc/0005-cpp-honor-sysroot.patch index 37f26f0728..f2883fe074 100644 --- a/meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch +++ b/meta/recipes-devtools/gcc/gcc/0005-cpp-honor-sysroot.patch @@ -1,29 +1,23 @@ -From: Richard Purdie -Subject: [PATCH 5/5] gcc: Pass sysroot options to cpp for preprocessed source +From e6a820a19c4cd115d8af7c235c5f9700c7a24730 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 29 Mar 2013 09:22:00 +0400 +Subject: [PATCH] cpp: honor sysroot. -OpenEmbedded/Yocto Project extensively uses the --sysroot support within gcc. -We discovered that when compiling preprocessed source (.i or .ii files), the -compiler will try and access the builtin sysroot location rather than the ---sysroot option specified on the commandline. If access to that directory is -permission denied (unreadable), gcc will error. This is particularly problematic -when ccache is involved. +Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile +preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location +rather than the --sysroot option specified on the commandline. If access to that directory is +permission denied (unreadable), gcc will error. -This patch adds %I to the cpp-output spec macro so the default substitutions for --iprefix, -isystem, -isysroot happen and the correct sysroot is used. +This happens when ccache is in use due to the fact it uses preprocessed source files. -2021-10-27 Richard Purdie +The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix, +-isystem, -isysroot happen and the correct sysroot is used. -gcc/cp/ChangeLog: - - * lang-specs.h: Pass sysroot options to cpp for preprocessed source - -gcc/ChangeLog: - - * gcc.c: Pass sysroot options to cpp for preprocessed source +[YOCTO #2074] -Signed-off-by: Richard Purdie +RP 2012/04/13 -[YOCTO #2074] +Signed-off-by: Khem Raj Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582725.html] --- @@ -31,11 +25,11 @@ Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-Octob gcc/gcc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: gcc-11.2.0/gcc/cp/lang-specs.h -=================================================================== ---- gcc-11.2.0.orig/gcc/cp/lang-specs.h -+++ gcc-11.2.0/gcc/cp/lang-specs.h -@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. +diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h +index 8902ae1d2ed..e99e2fcd6ad 100644 +--- a/gcc/cp/lang-specs.h ++++ b/gcc/cp/lang-specs.h +@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see {".ii", "@c++-cpp-output", 0, 0, 0}, {"@c++-cpp-output", "%{!E:%{!M:%{!MM:" @@ -44,11 +38,11 @@ Index: gcc-11.2.0/gcc/cp/lang-specs.h " %{!fsyntax-only:" " %{fmodule-only:%{!S:-o %g.s%V}}" " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}" -Index: gcc-11.2.0/gcc/gcc.c -=================================================================== ---- gcc-11.2.0.orig/gcc/gcc.c -+++ gcc-11.2.0/gcc/gcc.c -@@ -1470,7 +1470,7 @@ static const struct compiler default_com +diff --git a/gcc/gcc.c b/gcc/gcc.c +index b047fc31c2f..bdee2671532 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -1469,7 +1469,7 @@ static const struct compiler default_compilers[] = %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0}, {".i", "@cpp-output", 0, 0, 0}, {"@cpp-output", diff --git a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0006-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch similarity index 81% rename from meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch rename to meta/recipes-devtools/gcc/gcc/0006-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 0884730786..ef19eef822 100644 --- a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc/0006-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -1,4 +1,4 @@ -From 8e9d6efecdc8c42f47e3a012dee764b13c3dad59 Mon Sep 17 00:00:00 2001 +From 84dd8ea4c982fc2c82af642293d29e9c1880de5b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:24:50 +0400 Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER @@ -12,25 +12,43 @@ SH, sparc, alpha for possible future support (if any) Removes the do_headerfix task in metadata -Signed-off-by: Khem Raj - Upstream-Status: Inappropriate [OE configuration] +Signed-off-by: Khem Raj --- - gcc/config/alpha/linux-elf.h | 4 ++-- - gcc/config/arm/linux-eabi.h | 4 ++-- - gcc/config/arm/linux-elf.h | 2 +- - gcc/config/i386/linux.h | 2 +- - gcc/config/i386/linux64.h | 6 +++--- - gcc/config/linux.h | 8 ++++---- - gcc/config/mips/linux.h | 12 ++++++------ - gcc/config/riscv/linux.h | 2 +- - gcc/config/rs6000/linux64.h | 15 +++++---------- - gcc/config/sh/linux.h | 2 +- - gcc/config/sparc/linux.h | 2 +- - gcc/config/sparc/linux64.h | 4 ++-- - 12 files changed, 29 insertions(+), 34 deletions(-) + gcc/config/aarch64/aarch64-linux.h | 4 ++-- + gcc/config/alpha/linux-elf.h | 4 ++-- + gcc/config/arm/linux-eabi.h | 4 ++-- + gcc/config/arm/linux-elf.h | 2 +- + gcc/config/i386/linux.h | 2 +- + gcc/config/i386/linux64.h | 6 +++--- + gcc/config/linux.h | 8 ++++---- + gcc/config/mips/linux.h | 12 ++++++------ + gcc/config/riscv/linux.h | 2 +- + gcc/config/rs6000/linux64.h | 15 +++++---------- + gcc/config/sh/linux.h | 2 +- + gcc/config/sparc/linux.h | 2 +- + gcc/config/sparc/linux64.h | 4 ++-- + 13 files changed, 31 insertions(+), 36 deletions(-) -unchanged: +diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h +index 7f2529a2a1d..4bcae7f3110 100644 +--- a/gcc/config/aarch64/aarch64-linux.h ++++ b/gcc/config/aarch64/aarch64-linux.h +@@ -21,10 +21,10 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" + + #undef MUSL_DYNAMIC_LINKER +-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" ++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" + + #undef ASAN_CC1_SPEC + #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" +diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h +index c1dae8ca2cf..3ce2b76c1a4 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see @@ -44,7 +62,8 @@ unchanged: #if DEFAULT_LIBC == LIBC_UCLIBC #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC -unchanged: +diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h +index 85d0136e76e..6bd95855827 100644 --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h @@ -65,8 +65,8 @@ @@ -58,7 +77,8 @@ unchanged: #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT #define GLIBC_DYNAMIC_LINKER \ -unchanged: +diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h +index 0c1c4e70b6b..6bd643ade11 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -60,7 +60,7 @@ @@ -70,7 +90,8 @@ unchanged: #define LINUX_TARGET_LINK_SPEC "%{h*} \ %{static:-Bstatic} \ -unchanged: +diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h +index 04b274f1654..7aafcf3ac2d 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see @@ -82,7 +103,8 @@ unchanged: #undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -unchanged: +diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h +index b3822ced528..92d303e80d6 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h @@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -98,7 +120,8 @@ unchanged: #undef MUSL_DYNAMIC_LINKER32 #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -unchanged: +diff --git a/gcc/config/linux.h b/gcc/config/linux.h +index 4e1db60fced..87efc5f69fe 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h @@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -116,7 +139,8 @@ unchanged: #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" -unchanged: +diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h +index 44a85e410d9..8d41b5574f6 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h @@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see @@ -146,7 +170,8 @@ unchanged: #undef MUSL_DYNAMIC_LINKER32 #define MUSL_DYNAMIC_LINKER32 \ -unchanged: +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h +index fce5b896e6e..03aa55cb5ab 100644 --- a/gcc/config/riscv/linux.h +++ b/gcc/config/riscv/linux.h @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see @@ -158,7 +183,8 @@ unchanged: #define MUSL_ABI_SUFFIX \ "%{mabi=ilp32:-sf}" \ -unchanged: +diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h +index e3f2cd254f6..a11e01faa3d 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -336,24 +336,19 @@ extern int dot_symbols; @@ -191,7 +217,8 @@ unchanged: #undef DEFAULT_ASM_ENDIAN #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) -unchanged: +diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h +index 7558d2f7195..3aaa6c3a078 100644 --- a/gcc/config/sh/linux.h +++ b/gcc/config/sh/linux.h @@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see @@ -203,7 +230,8 @@ unchanged: #undef SUBTARGET_LINK_EMUL_SUFFIX #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" -unchanged: +diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h +index 2550d7ee8f0..a94f4cd8ba2 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); @@ -215,7 +243,8 @@ unchanged: #undef LINK_SPEC #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ -unchanged: +diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h +index 95af8afa9b5..63127afb074 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see @@ -229,19 +258,3 @@ unchanged: #ifdef SPARC_BI_ARCH -diff -u b/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h ---- b/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -21,10 +21,10 @@ - #ifndef GCC_AARCH64_LINUX_H - #define GCC_AARCH64_LINUX_H - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - - #undef MUSL_DYNAMIC_LINKER --#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - - #undef ASAN_CC1_SPEC - #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" diff --git a/meta/recipes-devtools/gcc/gcc/0007-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc/0007-gcc-Fix-argument-list-too-long-error.patch new file mode 100644 index 0000000000..9f9f8cc856 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0007-gcc-Fix-argument-list-too-long-error.patch @@ -0,0 +1,42 @@ +From 768e9075e88d811b00207d991123438bb996e4ea Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 29 Mar 2013 09:26:37 +0400 +Subject: [PATCH] gcc: Fix argument list too long error. + +There would be an "Argument list too long" error when the +build directory is longer than 200, this is caused by: + +headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u` + +The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle +it, use the $(sort list) of GNU make which can handle the too long list +would fix the problem, the header would be short enough after sorted. +The "tr ' ' '\012'" was used for translating the space to "\n", the +$(sort list) doesn't need this. + +Signed-off-by: Robert Yang +Signed-off-by: Khem Raj + +RP: gcc then added *.h and *.def additions to this list, breaking the original +fix. Add the sort to the original gcc code, leaving the tr+sort to fix the original +issue but include the new files too as reported by Zhuang + +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=66e157188bd2f789809e17e85f917534c9381599] +Signed-off-by: Khem Raj +--- + gcc/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 95962ae37b6..d1d4512bba3 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3671,7 +3671,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype + # We keep the directory structure for files in config, common/config or + # c-family and .def files. All other files are flattened to a single directory. + $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) +- headers=`echo $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ ++ headers=`echo $(sort $(PLUGIN_HEADERS)) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ + for file in $$headers; do \ + if [ -f $$file ] ; then \ diff --git a/meta/recipes-devtools/gcc/gcc/0014-libtool.patch b/meta/recipes-devtools/gcc/gcc/0008-libtool.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc/0014-libtool.patch rename to meta/recipes-devtools/gcc/gcc/0008-libtool.patch index f2b8924ebf..358e1d7b3c 100644 --- a/meta/recipes-devtools/gcc/gcc/0014-libtool.patch +++ b/meta/recipes-devtools/gcc/gcc/0008-libtool.patch @@ -1,4 +1,4 @@ -From a5b984db9669cf38a7bd76c3fcdb41c086f740db Mon Sep 17 00:00:00 2001 +From b19700ef0103f9414416b9a779a64d6138c58b1f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:29:11 +0400 Subject: [PATCH] libtool diff --git a/meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch rename to meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch index 1ccf39ceba..ac139542f1 100644 --- a/meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch +++ b/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch @@ -1,4 +1,4 @@ -From 0ae7090dec149cb2ff0c87eef87c043d4000ece1 Mon Sep 17 00:00:00 2001 +From 10d23d93697167396e223711bf6210e1642ee926 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:30:32 +0400 Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. diff --git a/meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch rename to meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch index bde7ec6609..4912fa9dce 100644 --- a/meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch +++ b/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch @@ -1,4 +1,4 @@ -From 5ce8aa4615a3816d12c43752323154744517ae9f Mon Sep 17 00:00:00 2001 +From 5970fb3fadccd8c43f7f7030e6ff51e0295731ef Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:33:04 +0400 Subject: [PATCH] Use the multilib config files from ${B} instead of using the @@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration] 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/gcc/configure b/gcc/configure -index 5160917d73e..e663052cad2 100755 +index f5b99d1cf7d..ec3c24482df 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -13070,10 +13070,20 @@ done +@@ -13111,10 +13111,20 @@ done tmake_file_= for f in ${tmake_file} do @@ -46,7 +46,7 @@ index 5160917d73e..e663052cad2 100755 done tmake_file="${tmake_file_}${omp_device_property_tmake_file}" -@@ -13084,6 +13094,10 @@ tm_file_list="options.h" +@@ -13125,6 +13135,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in $tm_file; do case $f in @@ -58,10 +58,10 @@ index 5160917d73e..e663052cad2 100755 f=`echo $f | sed 's/^..//'` tm_file_list="${tm_file_list} $f" diff --git a/gcc/configure.ac b/gcc/configure.ac -index 50f78308e8a..2b84875b028 100644 +index 29005f6d18f..ea794cd1763 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -2243,10 +2243,20 @@ done +@@ -2274,10 +2274,20 @@ done tmake_file_= for f in ${tmake_file} do @@ -86,7 +86,7 @@ index 50f78308e8a..2b84875b028 100644 done tmake_file="${tmake_file_}${omp_device_property_tmake_file}" -@@ -2257,6 +2267,10 @@ tm_file_list="options.h" +@@ -2288,6 +2298,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in $tm_file; do case $f in diff --git a/meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch rename to meta/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch index 3e0a1b4136..e3e35942e6 100644 --- a/meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch +++ b/meta/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch @@ -1,4 +1,4 @@ -From 75a1ce0265ca123f74f17a40ad8bd8f26d9c2ab3 Mon Sep 17 00:00:00 2001 +From 2af537b9ff0018945a27a7f89efad736a0f647d4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 09:39:38 +0000 Subject: [PATCH] Avoid using libdir from .la which usually points to a host diff --git a/meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc/0012-Ensure-target-gcc-headers-can-be-included.patch similarity index 96% rename from meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch rename to meta/recipes-devtools/gcc/gcc/0012-Ensure-target-gcc-headers-can-be-included.patch index 120d5a29b2..d33925eb40 100644 --- a/meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch +++ b/meta/recipes-devtools/gcc/gcc/0012-Ensure-target-gcc-headers-can-be-included.patch @@ -1,4 +1,4 @@ -From 6f410ed8fb7eee11ba7a25634c2257666b98ef52 Mon Sep 17 00:00:00 2001 +From 9427c6cedf88e15f747c48cb4fcf9eda6f5c4555 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 10:25:11 +0000 Subject: [PATCH] Ensure target gcc headers can be included @@ -25,7 +25,7 @@ Signed-off-by: Khem Raj 4 files changed, 22 insertions(+) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 59c45c81393..9b17d120aa1 100644 +index d1d4512bba3..06eb0d27a28 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -630,6 +630,7 @@ libexecdir = @libexecdir@ @@ -36,7 +36,7 @@ index 59c45c81393..9b17d120aa1 100644 # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) # Directory in which all plugin resources are installed -@@ -3016,6 +3017,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" +@@ -3009,6 +3010,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ diff --git a/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch deleted file mode 100644 index ebee30bbd6..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Richard Purdie -Subject: [PATCH 2/5] gcc: Fix "argument list too long" from install-plugins - -When building in longer build paths (200+ characters), the -"echo $(PLUGIN_HEADERS)" from the install-plugins target would cause an -"argument list too long error" on some systems. - -Avoid this by calling make's sort function on the list which removes -duplicates and stops the overflow from reaching the echo command. -The original sort is left to handle the the .h and .def files. - -2021-10-26 Richard Purdie - -gcc/ChangeLog: - - * Makefile.in: Fix "argument list too long" from install-plugins - -Signed-off-by: Richard Purdie - -Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582722.html] -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=66e157188bd2f789809e17e85f917534c9381599] ---- - gcc/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gcc-11.2.0/gcc/Makefile.in -=================================================================== ---- gcc-11.2.0.orig/gcc/Makefile.in -+++ gcc-11.2.0/gcc/Makefile.in -@@ -3678,7 +3678,7 @@ install-plugin: installdirs lang.install - # We keep the directory structure for files in config, common/config or - # c-family and .def files. All other files are flattened to a single directory. - $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) -- headers=`echo $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ -+ headers=`echo $(sort $(PLUGIN_HEADERS)) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ - for file in $$headers; do \ - if [ -f $$file ] ; then \ diff --git a/meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc/0013-Don-t-search-host-directory-during-relink-if-inst_pr.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch rename to meta/recipes-devtools/gcc/gcc/0013-Don-t-search-host-directory-during-relink-if-inst_pr.patch index bb2a3671f0..5b5d229eff 100644 --- a/meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch +++ b/meta/recipes-devtools/gcc/gcc/0013-Don-t-search-host-directory-during-relink-if-inst_pr.patch @@ -1,4 +1,4 @@ -From cd09adb1e7f2a7e81a9f595a17c36f24911b90ac Mon Sep 17 00:00:00 2001 +From ab6e6af5deca6f4b35b089a6b197776df38780e6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 3 Mar 2015 08:21:19 +0000 Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix diff --git a/meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc/0014-libcc1-fix-libcc1-s-install-path-and-rpath.patch similarity index 90% rename from meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch rename to meta/recipes-devtools/gcc/gcc/0014-libcc1-fix-libcc1-s-install-path-and-rpath.patch index fb4511cc1a..b82277cc4b 100644 --- a/meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch +++ b/meta/recipes-devtools/gcc/gcc/0014-libcc1-fix-libcc1-s-install-path-and-rpath.patch @@ -1,4 +1,4 @@ -From 2cfc5ee38b3f5ec1d7965aae0991bcd48b5dc2e6 Mon Sep 17 00:00:00 2001 +From fd862c8c112067d8613d921ae89c99056aca54a1 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 5 Jul 2015 20:25:18 -0700 Subject: [PATCH] libcc1: fix libcc1's install path and rpath @@ -20,10 +20,10 @@ Signed-off-by: Robert Yang 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am -index f148fdd7aa2..0b6eb8f2855 100644 +index 3b75e7d9290..d3a4c4f9ddf 100644 --- a/libcc1/Makefile.am +++ b/libcc1/Makefile.am -@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ +@@ -41,8 +41,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ $(Wc)$(libiberty_normal))) libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) @@ -35,7 +35,7 @@ index f148fdd7aa2..0b6eb8f2855 100644 if ENABLE_PLUGIN plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in -index 753d435c9cb..455627b0a3b 100644 +index 07fa9d94c83..a9f737d78f2 100644 --- a/libcc1/Makefile.in +++ b/libcc1/Makefile.in @@ -398,8 +398,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ diff --git a/meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch b/meta/recipes-devtools/gcc/gcc/0015-Makefile.in-Ensure-build-CPP-CPPFLAGS-is-used-for-bu.patch similarity index 79% rename from meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch rename to meta/recipes-devtools/gcc/gcc/0015-Makefile.in-Ensure-build-CPP-CPPFLAGS-is-used-for-bu.patch index 86ab6574c7..45953f861d 100644 --- a/meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch +++ b/meta/recipes-devtools/gcc/gcc/0015-Makefile.in-Ensure-build-CPP-CPPFLAGS-is-used-for-bu.patch @@ -1,5 +1,8 @@ +From 667b302f637be0a4b6ef714b5eb0026c54425386 Mon Sep 17 00:00:00 2001 From: Richard Purdie -Subject: [PATCH 1/5] Makefile.in: Ensure build CPP/CPPFLAGS is used for build targets +Date: Sun, 31 Oct 2021 17:40:12 -0700 +Subject: [PATCH] Makefile.in: Ensure build CPP/CPPFLAGS is used for build + targets During cross compiling, CPP is being set to the target compiler even for build targets. As an example, when building a cross compiler targetting @@ -42,6 +45,8 @@ Signed-off-by: Richard Purdie Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582727.html] Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=84401ce5fb4ecab55decb472b168100e7593e01f] + +Signed-off-by: Khem Raj --- Makefile.in | 6 ++++++ Makefile.tpl | 6 ++++++ @@ -51,11 +56,11 @@ Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=844 gcc/configure.ac | 2 +- 6 files changed, 22 insertions(+), 2 deletions(-) -Index: gcc-11.2.0/Makefile.in -=================================================================== ---- gcc-11.2.0.orig/Makefile.in -+++ gcc-11.2.0/Makefile.in -@@ -151,6 +151,8 @@ BUILD_EXPORTS = \ +diff --git a/Makefile.in b/Makefile.in +index 20cbbe2906d..33476d53327 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -154,6 +154,8 @@ BUILD_EXPORTS = \ CC="$(CC_FOR_BUILD)"; export CC; \ CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ @@ -64,7 +69,7 @@ Index: gcc-11.2.0/Makefile.in CXX="$(CXX_FOR_BUILD)"; export CXX; \ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ -@@ -198,6 +200,8 @@ HOST_EXPORTS = \ +@@ -202,6 +204,8 @@ HOST_EXPORTS = \ AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ @@ -72,8 +77,8 @@ Index: gcc-11.2.0/Makefile.in + CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ - LD="$(LD)"; export LD; \ -@@ -353,6 +357,8 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ + DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ +@@ -360,6 +364,8 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ AS_FOR_BUILD = @AS_FOR_BUILD@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @@ -82,11 +87,11 @@ Index: gcc-11.2.0/Makefile.in CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ -Index: gcc-11.2.0/Makefile.tpl -=================================================================== ---- gcc-11.2.0.orig/Makefile.tpl -+++ gcc-11.2.0/Makefile.tpl -@@ -154,6 +154,8 @@ BUILD_EXPORTS = \ +diff --git a/Makefile.tpl b/Makefile.tpl +index 9adf4f94728..e39d85d1109 100644 +--- a/Makefile.tpl ++++ b/Makefile.tpl +@@ -157,6 +157,8 @@ BUILD_EXPORTS = \ CC="$(CC_FOR_BUILD)"; export CC; \ CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ @@ -95,7 +100,7 @@ Index: gcc-11.2.0/Makefile.tpl CXX="$(CXX_FOR_BUILD)"; export CXX; \ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ -@@ -201,6 +203,8 @@ HOST_EXPORTS = \ +@@ -205,6 +207,8 @@ HOST_EXPORTS = \ AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ @@ -103,8 +108,8 @@ Index: gcc-11.2.0/Makefile.tpl + CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ - LD="$(LD)"; export LD; \ -@@ -356,6 +360,8 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ + DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ +@@ -363,6 +367,8 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ AS_FOR_BUILD = @AS_FOR_BUILD@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @@ -113,11 +118,11 @@ Index: gcc-11.2.0/Makefile.tpl CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ -Index: gcc-11.2.0/configure -=================================================================== ---- gcc-11.2.0.orig/configure -+++ gcc-11.2.0/configure -@@ -652,6 +652,8 @@ GFORTRAN_FOR_BUILD +diff --git a/configure b/configure +index 45744e6e471..ff0de8a68b4 100755 +--- a/configure ++++ b/configure +@@ -655,6 +655,8 @@ DSYMUTIL_FOR_BUILD DLLTOOL_FOR_BUILD CXX_FOR_BUILD CXXFLAGS_FOR_BUILD @@ -126,15 +131,15 @@ Index: gcc-11.2.0/configure CFLAGS_FOR_BUILD CC_FOR_BUILD AS_FOR_BUILD -@@ -4092,6 +4094,7 @@ if test "${build}" != "${host}" ; then +@@ -4100,6 +4102,7 @@ if test "${build}" != "${host}" ; then AR_FOR_BUILD=${AR_FOR_BUILD-ar} AS_FOR_BUILD=${AS_FOR_BUILD-as} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} + CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CPP)}" CXX_FOR_BUILD=${CXX_FOR_BUILD-g++} + DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil} GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran} - GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo} -@@ -9809,6 +9812,7 @@ esac +@@ -9831,6 +9834,7 @@ esac # our build compiler if desired. if test x"${build}" = x"${host}" ; then CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} @@ -142,19 +147,19 @@ Index: gcc-11.2.0/configure CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} fi -Index: gcc-11.2.0/configure.ac -=================================================================== ---- gcc-11.2.0.orig/configure.ac -+++ gcc-11.2.0/configure.ac +diff --git a/configure.ac b/configure.ac +index bf66b51373c..09fa3896dc7 100644 +--- a/configure.ac ++++ b/configure.ac @@ -1347,6 +1347,7 @@ if test "${build}" != "${host}" ; then AR_FOR_BUILD=${AR_FOR_BUILD-ar} AS_FOR_BUILD=${AS_FOR_BUILD-as} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} + CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CPP)}" CXX_FOR_BUILD=${CXX_FOR_BUILD-g++} + DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil} GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran} - GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo} -@@ -3321,6 +3322,7 @@ esac +@@ -3336,6 +3337,7 @@ esac # our build compiler if desired. if test x"${build}" = x"${host}" ; then CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} @@ -162,7 +167,7 @@ Index: gcc-11.2.0/configure.ac CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} fi -@@ -3387,6 +3389,8 @@ AC_SUBST(AR_FOR_BUILD) +@@ -3402,6 +3404,8 @@ AC_SUBST(AR_FOR_BUILD) AC_SUBST(AS_FOR_BUILD) AC_SUBST(CC_FOR_BUILD) AC_SUBST(CFLAGS_FOR_BUILD) @@ -171,11 +176,11 @@ Index: gcc-11.2.0/configure.ac AC_SUBST(CXXFLAGS_FOR_BUILD) AC_SUBST(CXX_FOR_BUILD) AC_SUBST(DLLTOOL_FOR_BUILD) -Index: gcc-11.2.0/gcc/configure -=================================================================== ---- gcc-11.2.0.orig/gcc/configure -+++ gcc-11.2.0/gcc/configure -@@ -12699,7 +12699,7 @@ else +diff --git a/gcc/configure b/gcc/configure +index ec3c24482df..31a460dc9d0 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -12740,7 +12740,7 @@ else CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ @@ -184,11 +189,11 @@ Index: gcc-11.2.0/gcc/configure ${realsrcdir}/configure \ --enable-languages=${enable_languages-all} \ ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \ -Index: gcc-11.2.0/gcc/configure.ac -=================================================================== ---- gcc-11.2.0.orig/gcc/configure.ac -+++ gcc-11.2.0/gcc/configure.ac -@@ -2023,7 +2023,7 @@ else +diff --git a/gcc/configure.ac b/gcc/configure.ac +index ea794cd1763..b965eb036bc 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -2054,7 +2054,7 @@ else CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ diff --git a/meta/recipes-devtools/gcc/gcc/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch b/meta/recipes-devtools/gcc/gcc/0016-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch similarity index 68% rename from meta/recipes-devtools/gcc/gcc/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch rename to meta/recipes-devtools/gcc/gcc/0016-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch index 98a1bb2a66..7f807a991c 100644 --- a/meta/recipes-devtools/gcc/gcc/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch +++ b/meta/recipes-devtools/gcc/gcc/0016-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch @@ -1,8 +1,8 @@ -From e700190743fa29ddaebd6ee075298a24b1688773 Mon Sep 17 00:00:00 2001 +From 2c2a92573598ddbc33c023fe5d499191491fb523 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Oct 2021 11:33:40 +0100 -Subject: [PATCH 6/6] If CXXFLAGS contains something unsupported by the build - CXX, we see build failures (e.g. using -fmacro-prefix-map for the target). +Subject: [PATCH] If CXXFLAGS contains something unsupported by the build CXX, + we see build failures (e.g. using -fmacro-prefix-map for the target). Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these errors. @@ -13,19 +13,20 @@ ChangeLog: * Makefile.in: Regenerate. * Makefile.tpl: Add missing CXXFLAGS_FOR_BUILD overrides +Upstream-Status: Pending [should be submittable] + Signed-off-by: Richard Purdie +Signed-off-by: Khem Raj --- Makefile.in | 2 ++ Makefile.tpl | 2 ++ 2 files changed, 4 insertions(+) -Upstream-Status: Pending [should be submittable] - -Index: gcc-11.2.0/Makefile.in -=================================================================== ---- gcc-11.2.0.orig/Makefile.in -+++ gcc-11.2.0/Makefile.in -@@ -172,6 +172,7 @@ BUILD_EXPORTS = \ +diff --git a/Makefile.in b/Makefile.in +index 33476d53327..b949dffee0e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -176,6 +176,7 @@ BUILD_EXPORTS = \ # built for the build system to override those in BASE_FLAGS_TO_PASS. EXTRA_BUILD_FLAGS = \ CFLAGS="$(CFLAGS_FOR_BUILD)" \ @@ -33,19 +34,19 @@ Index: gcc-11.2.0/Makefile.in LDFLAGS="$(LDFLAGS_FOR_BUILD)" # This is the list of directories to built for the host system. -@@ -203,6 +204,7 @@ HOST_EXPORTS = \ +@@ -207,6 +208,7 @@ HOST_EXPORTS = \ CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ + CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ + DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ LD="$(LD)"; export LD; \ - LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \ -Index: gcc-11.2.0/Makefile.tpl -=================================================================== ---- gcc-11.2.0.orig/Makefile.tpl -+++ gcc-11.2.0/Makefile.tpl -@@ -175,6 +175,7 @@ BUILD_EXPORTS = \ +diff --git a/Makefile.tpl b/Makefile.tpl +index e39d85d1109..d8520cbb164 100644 +--- a/Makefile.tpl ++++ b/Makefile.tpl +@@ -179,6 +179,7 @@ BUILD_EXPORTS = \ # built for the build system to override those in BASE_FLAGS_TO_PASS. EXTRA_BUILD_FLAGS = \ CFLAGS="$(CFLAGS_FOR_BUILD)" \ @@ -53,11 +54,11 @@ Index: gcc-11.2.0/Makefile.tpl LDFLAGS="$(LDFLAGS_FOR_BUILD)" # This is the list of directories to built for the host system. -@@ -206,6 +207,7 @@ HOST_EXPORTS = \ +@@ -210,6 +211,7 @@ HOST_EXPORTS = \ CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ + CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ + DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ LD="$(LD)"; export LD; \ - LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \ diff --git a/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc/0017-handle-sysroot-support-for-nativesdk-gcc.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch rename to meta/recipes-devtools/gcc/gcc/0017-handle-sysroot-support-for-nativesdk-gcc.patch index b1054fa749..5d86e4c12d 100644 --- a/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch +++ b/meta/recipes-devtools/gcc/gcc/0017-handle-sysroot-support-for-nativesdk-gcc.patch @@ -1,4 +1,4 @@ -From 354682ad8f71f62643dcd83f64b51b5979615a0c Mon Sep 17 00:00:00 2001 +From 68802ca536b01ab21cfa58e11ef332e30d9a3c5e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:39:54 +0000 Subject: [PATCH] handle sysroot support for nativesdk-gcc @@ -46,10 +46,10 @@ Signed-off-by: Mark Hatle 8 files changed, 94 insertions(+), 72 deletions(-) diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c -index 89e05a4c551..5577383665d 100644 +index 6f001e0bb6c..55ab07c278f 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c -@@ -1436,8 +1436,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) +@@ -1438,8 +1438,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) size_t prefix_len, suffix_len; suffix_len = strlen (suffix); @@ -378,7 +378,7 @@ index fd3c655db1c..20669ac427d 100644 subdirectory of the actual installation. */ extern const char *gcc_exec_prefix; diff --git a/gcc/gcc.c b/gcc/gcc.c -index 8737bae5353..aa6fbe43965 100644 +index bdee2671532..36e8af38630 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; @@ -398,7 +398,7 @@ index 8737bae5353..aa6fbe43965 100644 %S process STARTFILE_SPEC as a spec. A capital S is actually used here. %E process ENDFILE_SPEC as a spec. A capital E is actually used here. %C process CPP_SPEC as a spec. -@@ -1621,10 +1624,10 @@ static const char *gcc_libexec_prefix; +@@ -1620,10 +1623,10 @@ static const char *gcc_libexec_prefix; gcc_exec_prefix is set because, in that case, we know where the compiler has been installed, and use paths relative to that location instead. */ @@ -413,7 +413,7 @@ index 8737bae5353..aa6fbe43965 100644 /* For native compilers, these are well-known paths containing components that may be provided by the system. For cross -@@ -1632,9 +1635,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; +@@ -1631,9 +1634,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; static const char *md_exec_prefix = MD_EXEC_PREFIX; static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; @@ -425,7 +425,7 @@ index 8737bae5353..aa6fbe43965 100644 = STANDARD_STARTFILE_PREFIX_2; /* A relative path to be used in finding the location of tools -@@ -6564,6 +6567,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) +@@ -6570,6 +6573,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) } break; diff --git a/meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc/0018-Search-target-sysroot-gcc-version-specific-dirs-with.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch rename to meta/recipes-devtools/gcc/gcc/0018-Search-target-sysroot-gcc-version-specific-dirs-with.patch index ff622b1056..0f43e985cf 100644 --- a/meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch +++ b/meta/recipes-devtools/gcc/gcc/0018-Search-target-sysroot-gcc-version-specific-dirs-with.patch @@ -1,4 +1,4 @@ -From c55e24459370ad96577496ecd87475e3a9de7dad Mon Sep 17 00:00:00 2001 +From 14291076874b133e7fb67ef1714b768a2c48ea44 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:41:45 +0000 Subject: [PATCH] Search target sysroot gcc version specific dirs with @@ -51,10 +51,10 @@ Signed-off-by: Khem Raj 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gcc/gcc.c b/gcc/gcc.c -index aa6fbe43965..f8a71a13826 100644 +index 36e8af38630..d1faa788d60 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c -@@ -2811,7 +2811,7 @@ for_each_path (const struct path_prefix *paths, +@@ -2810,7 +2810,7 @@ for_each_path (const struct path_prefix *paths, if (path == NULL) { len = paths->max_len + extra_space + 1; @@ -63,7 +63,7 @@ index aa6fbe43965..f8a71a13826 100644 path = XNEWVEC (char, len); } -@@ -2823,6 +2823,33 @@ for_each_path (const struct path_prefix *paths, +@@ -2822,6 +2822,33 @@ for_each_path (const struct path_prefix *paths, /* Look first in MACHINE/VERSION subdirectory. */ if (!skip_multi_dir) { diff --git a/meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc/0019-nios2-Define-MUSL_DYNAMIC_LINKER.patch similarity index 40% rename from meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch rename to meta/recipes-devtools/gcc/gcc/0019-nios2-Define-MUSL_DYNAMIC_LINKER.patch index 97c271373b..76ebfd7f77 100644 --- a/meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch +++ b/meta/recipes-devtools/gcc/gcc/0019-nios2-Define-MUSL_DYNAMIC_LINKER.patch @@ -1,26 +1,20 @@ -From: Richard Purdie -Subject: [PATCH 4/5] gcc/nios2: Define the musl linker +From 9ec4db8e910d9a51ae43f6b20d4bf1dac2d8cca8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 2 Feb 2016 10:26:10 -0800 +Subject: [PATCH] nios2: Define MUSL_DYNAMIC_LINKER -Add a definition of the musl linker used on the nios2 platform. - -2021-10-26 Richard Purdie - -gcc/ChangeLog: - - * config/nios2/linux.h (MUSL_DYNAMIC_LINKER): Add musl linker - -Signed-off-by: Richard Purdie - -Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582723.html] Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e5ddbbf992b909d8e38851bd3179d29389e6ac97] + +Signed-off-by: Marek Vasut +Signed-off-by: Khem Raj --- gcc/config/nios2/linux.h | 1 + 1 file changed, 1 insertion(+) -Index: gcc-11.2.0/gcc/config/nios2/linux.h -=================================================================== ---- gcc-11.2.0.orig/gcc/config/nios2/linux.h -+++ gcc-11.2.0/gcc/config/nios2/linux.h +diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h +index 08edf1521f6..15696d86241 100644 +--- a/gcc/config/nios2/linux.h ++++ b/gcc/config/nios2/linux.h @@ -30,6 +30,7 @@ #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" diff --git a/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc/0020-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch similarity index 84% rename from meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch rename to meta/recipes-devtools/gcc/gcc/0020-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch index 9c616d24d0..b82fa44537 100644 --- a/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ b/meta/recipes-devtools/gcc/gcc/0020-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -1,4 +1,4 @@ -From 745a2ac7825c73102b888226c54397d21512f86b Mon Sep 17 00:00:00 2001 +From af72a47a677ce98c08cb73444bdd741ca8e28422 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Jun 2017 18:10:54 -0700 Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets @@ -22,9 +22,11 @@ Signed-off-by: Khem Raj gcc/config/rs6000/linux64.h | 10 ++++++++++ 3 files changed, 27 insertions(+) +diff --git a/gcc/config/linux.h b/gcc/config/linux.h +index ba02c013e30..8fcaa0c9faf 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h -@@ -203,6 +203,13 @@ see the files COPYING3 and COPYING.RUNTI +@@ -203,6 +203,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \ { 0, 0, 0, 0, 0, 0 } \ } @@ -38,6 +40,8 @@ Signed-off-by: Khem Raj #endif #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ +diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h +index 47c9d9ac0b6..d065f88b377 100644 --- a/gcc/config/rs6000/linux.h +++ b/gcc/config/rs6000/linux.h @@ -94,6 +94,16 @@ @@ -57,6 +61,8 @@ Signed-off-by: Khem Raj #undef LINK_OS_LINUX_SPEC #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ %{!static-pie: \ +diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h +index a11e01faa3d..ce464f3626b 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -369,6 +369,16 @@ extern int dot_symbols; diff --git a/meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc/0021-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch rename to meta/recipes-devtools/gcc/gcc/0021-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch index b74aeb8bb6..9b7c5c5642 100644 --- a/meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch +++ b/meta/recipes-devtools/gcc/gcc/0021-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch @@ -1,4 +1,4 @@ -From 695adb4dffb23c6f5cbc757e05cf4187a2bd6528 Mon Sep 17 00:00:00 2001 +From 79a568dec47baa264eb6290fed3df3244450a92e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 May 2016 21:11:34 -0700 Subject: [PATCH] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS diff --git a/meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc/0022-sync-gcc-stddef.h-with-musl.patch similarity index 97% rename from meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch rename to meta/recipes-devtools/gcc/gcc/0022-sync-gcc-stddef.h-with-musl.patch index fd7d604e98..86fb22ffd3 100644 --- a/meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch +++ b/meta/recipes-devtools/gcc/gcc/0022-sync-gcc-stddef.h-with-musl.patch @@ -1,4 +1,4 @@ -From a9173429ae256c4b4a3ab4d758a6adf42f8c4239 Mon Sep 17 00:00:00 2001 +From 07a06aa8e8285c1bb06d0bebeaa9ad04eb76f2e2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Feb 2017 12:56:00 -0800 Subject: [PATCH] sync gcc stddef.h with musl diff --git a/meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc/0023-Re-introduce-spe-commandline-options.patch similarity index 90% rename from meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch rename to meta/recipes-devtools/gcc/gcc/0023-Re-introduce-spe-commandline-options.patch index 129f555a48..23cf02a6e4 100644 --- a/meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch +++ b/meta/recipes-devtools/gcc/gcc/0023-Re-introduce-spe-commandline-options.patch @@ -1,4 +1,4 @@ -From 0b900d6410b7c1938e86eceb87b032fd538566a9 Mon Sep 17 00:00:00 2001 +From ca73043041c3c7aa86af9a3d4f316abc87eb3254 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 6 Jun 2018 12:10:22 -0700 Subject: [PATCH] Re-introduce spe commandline options @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 13 insertions(+) diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt -index 0dbdf753673..b273eb65c35 100644 +index 6b0a3e27529..1bd2e356ac9 100644 --- a/gcc/config/rs6000/rs6000.opt +++ b/gcc/config/rs6000/rs6000.opt @@ -352,6 +352,19 @@ mdebug= diff --git a/meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc/0024-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch rename to meta/recipes-devtools/gcc/gcc/0024-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch index 3f666dc7bd..f915f284ea 100644 --- a/meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ b/meta/recipes-devtools/gcc/gcc/0024-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch @@ -1,4 +1,4 @@ -From ea9154338cb3acbd75945fddde4202e73c20dd1a Mon Sep 17 00:00:00 2001 +From b3957bc1fd52ec427a1b71b10055905cab4bbc7c Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sat, 24 Oct 2015 20:09:53 +0000 Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of @@ -39,10 +39,10 @@ Signed-off-by: Khem Raj 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c -index ac69eed4d32..ffaa44a16fc 100644 +index 31eae75d277..ec7e858ec83 100644 --- a/gcc/config/i386/i386-expand.c +++ b/gcc/config/i386/i386-expand.c -@@ -11038,10 +11038,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, +@@ -11066,10 +11066,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, { case IX86_BUILTIN_CPU_INIT: { diff --git a/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta/recipes-devtools/gcc/gcc/0025-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch rename to meta/recipes-devtools/gcc/gcc/0025-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch index 874cd7798d..f33193ebcf 100644 --- a/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch +++ b/meta/recipes-devtools/gcc/gcc/0025-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch @@ -1,4 +1,4 @@ -From 520411cf364ee4b0b5a8f0857498aaabd790afb3 Mon Sep 17 00:00:00 2001 +From 5fd90d243ae14034a4699443110070dafc0d4d30 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 10 Mar 2020 08:26:53 -0700 Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gcc/gengtype.c b/gcc/gengtype.c -index 5f50242e857..cbaca9b8cd0 100644 +index 98d4626f87e..f602da8b501 100644 --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, diff --git a/meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch b/meta/recipes-devtools/gcc/gcc/0026-mingw32-Enable-operation_not_supported.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch rename to meta/recipes-devtools/gcc/gcc/0026-mingw32-Enable-operation_not_supported.patch index 3a7618c820..b46bde1eda 100644 --- a/meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch +++ b/meta/recipes-devtools/gcc/gcc/0026-mingw32-Enable-operation_not_supported.patch @@ -1,4 +1,4 @@ -From 96d895c8d5dc895d24fe37aa2b4f201a2566b4cc Mon Sep 17 00:00:00 2001 +From 7bc34769f0b055e25286576e4ba6d211e8159834 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 May 2020 10:39:09 -0700 Subject: [PATCH] mingw32: Enable operation_not_supported diff --git a/meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta/recipes-devtools/gcc/gcc/0027-libatomic-Do-not-enforce-march-on-aarch64.patch similarity index 85% rename from meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch rename to meta/recipes-devtools/gcc/gcc/0027-libatomic-Do-not-enforce-march-on-aarch64.patch index 4c9a79cb64..85b1251482 100644 --- a/meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch +++ b/meta/recipes-devtools/gcc/gcc/0027-libatomic-Do-not-enforce-march-on-aarch64.patch @@ -1,4 +1,4 @@ -From 36d4fdbc99e69f9d70a29e2bada40cc3c1534557 Mon Sep 17 00:00:00 2001 +From df1c63bbd7a520e8c6d0d0692b4d8bff56952394 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 May 2020 15:10:38 -0700 Subject: [PATCH] libatomic: Do not enforce march on aarch64 @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj 2 files changed, 2 deletions(-) diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am -index 0f3cd6f7121..c8124c1d5aa 100644 +index ab8c2da24a1..f614a46b34d 100644 --- a/libatomic/Makefile.am +++ b/libatomic/Makefile.am @@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS))) @@ -29,14 +29,14 @@ index 0f3cd6f7121..c8124c1d5aa 100644 endif if ARCH_ARM_LINUX diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in -index 0a51bd55f01..6d5b1581706 100644 +index 80d25653dc7..7377689ab34 100644 --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in -@@ -432,7 +432,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) +@@ -434,7 +434,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) -@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 - @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 + @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 -mcx16 diff --git a/meta/recipes-devtools/gcc/gcc/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch b/meta/recipes-devtools/gcc/gcc/0028-debug-101473-apply-debug-prefix-maps-before-checksum.patch similarity index 81% rename from meta/recipes-devtools/gcc/gcc/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch rename to meta/recipes-devtools/gcc/gcc/0028-debug-101473-apply-debug-prefix-maps-before-checksum.patch index c8dcd74b9d..de06793482 100644 --- a/meta/recipes-devtools/gcc/gcc/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch +++ b/meta/recipes-devtools/gcc/gcc/0028-debug-101473-apply-debug-prefix-maps-before-checksum.patch @@ -1,7 +1,8 @@ -From 7cc2df084b7977653a9b59cbc34a9ad500ae619c Mon Sep 17 00:00:00 2001 +From 49008eeedc97014f44e12afe179d3785e4438372 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 20 Jul 2021 11:00:33 +0200 -Subject: [PATCH] debug/101473 - apply debug prefix maps before checksumming DIEs +Subject: [PATCH] debug/101473 - apply debug prefix maps before checksumming + DIEs The following makes sure to apply the debug prefix maps to filenames before checksumming DIEs to create the global symbol for the CU DIE @@ -36,10 +37,15 @@ The upstream patch was modified to compensate for the definition of this version of gcc. Signed-off-by: Tony Battersby +Signed-off-by: Khem Raj --- -diff -urpN a/gcc/dwarf2out.c b/gcc/dwarf2out.c ---- a/gcc/dwarf2out.c 2021-04-27 06:00:13.000000000 -0400 -+++ b/gcc/dwarf2out.c 2021-07-23 16:40:06.141886167 -0400 + gcc/dwarf2out.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c +index e5d3ce4966d..41ac3008507 100644 +--- a/gcc/dwarf2out.c ++++ b/gcc/dwarf2out.c @@ -1283,6 +1283,7 @@ dwarf2out_switch_text_section (void) /* Data about a single source file. */ @@ -48,7 +54,7 @@ diff -urpN a/gcc/dwarf2out.c b/gcc/dwarf2out.c const char * filename; int emitted_number; }; -@@ -12334,7 +12335,7 @@ file_name_acquire (dwarf_file_data **slo +@@ -12335,7 +12336,7 @@ file_name_acquire (dwarf_file_data **slot, file_name_acquire_data *fnad) fi = fnad->files + fnad->used_files++; @@ -57,7 +63,7 @@ diff -urpN a/gcc/dwarf2out.c b/gcc/dwarf2out.c /* Skip all leading "./". */ while (f[0] == '.' && IS_DIR_SEPARATOR (f[1])) -@@ -27231,13 +27232,13 @@ dwarf2out_ignore_block (const_tree block +@@ -27259,13 +27260,13 @@ dwarf2out_ignore_block (const_tree block) bool dwarf_file_hasher::equal (dwarf_file_data *p1, const char *p2) { @@ -73,7 +79,7 @@ diff -urpN a/gcc/dwarf2out.c b/gcc/dwarf2out.c } /* Lookup FILE_NAME (in the list of filenames that we know about here in -@@ -27267,7 +27268,8 @@ lookup_filename (const char *file_name) +@@ -27295,7 +27296,8 @@ lookup_filename (const char *file_name) return *slot; created = ggc_alloc (); @@ -83,7 +89,7 @@ diff -urpN a/gcc/dwarf2out.c b/gcc/dwarf2out.c created->emitted_number = 0; *slot = created; return created; -@@ -27293,8 +27295,7 @@ maybe_emit_file (struct dwarf_file_data +@@ -27321,8 +27323,7 @@ maybe_emit_file (struct dwarf_file_data * fd) if (output_asm_line_debug_info ()) { fprintf (asm_out_file, "\t.file %u ", fd->emitted_number); diff --git a/meta/recipes-devtools/gcc/gcc/0001-Fix-install-path-of-linux64.h.patch b/meta/recipes-devtools/gcc/gcc/0029-Fix-install-path-of-linux64.h.patch similarity index 81% rename from meta/recipes-devtools/gcc/gcc/0001-Fix-install-path-of-linux64.h.patch rename to meta/recipes-devtools/gcc/gcc/0029-Fix-install-path-of-linux64.h.patch index 5bf895d6e7..d7e156e7a3 100644 --- a/meta/recipes-devtools/gcc/gcc/0001-Fix-install-path-of-linux64.h.patch +++ b/meta/recipes-devtools/gcc/gcc/0029-Fix-install-path-of-linux64.h.patch @@ -1,4 +1,4 @@ -From 58211c7ceb0510b2a11a7f1da3c7fa968c658749 Mon Sep 17 00:00:00 2001 +From 8a62cc0a64670e39f462c1dbbf82e04d2f03b89e Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Wed, 22 Dec 2021 12:49:25 +0100 Subject: [PATCH] Fix install path of linux64.h @@ -11,15 +11,16 @@ adapts the install path of linux64.h to match the include in tm.h. Signed-off-by: Andrei Gherzan Upstream-Status: Inappropriate [configuration] +Signed-off-by: Khem Raj --- gcc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 9b17d120a..d175ec4e3 100644 +index 06eb0d27a28..a8678ca24ed 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in -@@ -3693,6 +3693,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype +@@ -3686,6 +3686,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ @@ -28,6 +29,3 @@ index 9b17d120a..d175ec4e3 100644 *) base=`basename $$path` ;; \ esac; \ dest=$(plugin_includedir)/$$base; \ --- -2.25.1 - diff --git a/meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch b/meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch deleted file mode 100644 index 3fb9ee98de..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch +++ /dev/null @@ -1,23 +0,0 @@ -The patch is needed in order to support recent glibc (2.34). - -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=91f8a7a34cf29ae7c465603a801326767f1cc7e9] - -Signed-off-by: Richard Purdie - ---- ---- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp 2022-03-15 07:59:54.515325204 -0700 -+++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp 2022-03-15 08:01:45.919405931 -0700 -@@ -166,9 +166,10 @@ - #if !SANITIZER_GO - // TODO(glider): different tools may require different altstack size. - static uptr GetAltStackSize() { -- // SIGSTKSZ is not enough. -- static const uptr kAltStackSize = SIGSTKSZ * 4; -- return kAltStackSize; -+ // Note: since GLIBC_2.31, SIGSTKSZ may be a function call, so this may be -+ // more costly that you think. However GetAltStackSize is only call 2-3 times -+ // per thread so don't cache the evaluation. -+ return SIGSTKSZ * 4; - } - - void SetAlternateSignalStack() { diff --git a/meta/recipes-devtools/gcc/gcc_11.2.bb b/meta/recipes-devtools/gcc/gcc_11.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc_11.2.bb rename to meta/recipes-devtools/gcc/gcc_11.3.bb diff --git a/meta/recipes-devtools/gcc/libgcc-initial_11.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_11.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc-initial_11.2.bb rename to meta/recipes-devtools/gcc/libgcc-initial_11.3.bb diff --git a/meta/recipes-devtools/gcc/libgcc_11.2.bb b/meta/recipes-devtools/gcc/libgcc_11.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc_11.2.bb rename to meta/recipes-devtools/gcc/libgcc_11.3.bb diff --git a/meta/recipes-devtools/gcc/libgfortran_11.2.bb b/meta/recipes-devtools/gcc/libgfortran_11.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgfortran_11.2.bb rename to meta/recipes-devtools/gcc/libgfortran_11.3.bb