From patchwork Fri Apr 29 16:00:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7364 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 9241CC433EF for ; Fri, 29 Apr 2022 16:01:29 +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.web10.12116.1651248080842933956 for ; Fri, 29 Apr 2022 09:01:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TjcBpdjZ; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id w5-20020a17090aaf8500b001d74c754128so10952934pjq.0 for ; Fri, 29 Apr 2022 09:01: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=Fr2HeMfEIfxDHiDk3JtE4mjYZELIiab17NYNhlhcQVc=; b=TjcBpdjZUf9UudLuyqPxM5Fyr7UEUxd2/GQMCBiapaLmWLbwpqsxqX9zMSdTpwh/3J KULvj0gEL3TqgAgmqpiObnYYrT2qwAZjAf8/6a1MwhxqxRdpYZ24ZAU2o2dL3Lz8g0bs KZQoF0tIwAZeRjUJ9J/7ZrTfXjXnIp5Ehjw9+AQrgzl+nWa/je522u6+rs3yfCnSaUIW rWgtXsVFvq2a7HlNHpOGc953xR4K3hlIEtD22lCdYC4BOneamc6P6E7B800ILgQTDfk8 IKWN9YhufyYvAMRHmHTDcnIuejEw2VLE9VaL1/FRXVCJBBrMNceM0qMF6esoCd2iI7qt 2ToQ== 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=Fr2HeMfEIfxDHiDk3JtE4mjYZELIiab17NYNhlhcQVc=; b=fbIviBaFml17iGeXjvkS5Ulo9VmUhWRd4KNeozqzwm5EzyaR5VWbD3hgiVPGENU6WY YHc8YdY7gQetKV8pcj8Vekmp8f8W3cKSEUGEMaVushAts0MqAU67lPXrGK8smJM1pTsT PK0xTs1w4J07B0ioQ4Zrh3NTdSaQ8o6FKlewyvPO0LAt3gSCrRnHMQpE+sLJSbVI5/8e WyCp1gt1ByD+f91w94pPnucIghH8RWeh2Eoe1+Z3VUROlePV5qC3/SUY8xHrlCDUed/S KdkotMlW92wwWR6OSjhQ8tLg8l91W381ZByD5VJMTy1OXtBRCKTYRJ481qE65w8nPEaG 3i4A== X-Gm-Message-State: AOAM530iV/LdmvFWVyI/03E7kPuwtMQsLLHI9dxi2AJKD2XDVjhC6GZo v/tFyXiw1SucmU64Q3qAcrFbTFMYpNKol7lNYk4= X-Google-Smtp-Source: ABdhPJzrv0ivR0qusfT+GpoD6tsamo4abBbGrVnYYwu1jSQekalPvwWKGu7yahY+0NsMwUoKT/T1rQ== X-Received: by 2002:a17:903:4052:b0:156:229d:ffed with SMTP id n18-20020a170903405200b00156229dffedmr39215573pla.98.1651248073129; Fri, 29 Apr 2022 09:01: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/34] e2fsprogs: fix CVE-2022-1304 Date: Fri, 29 Apr 2022 06:00:20 -1000 Message-Id: <6b31ebb379369cfd9448f64fca6a664b72a7f4fa.1651246310.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 ; Fri, 29 Apr 2022 16:01:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165020 From: Ross Burton Backport a submitted patch to fix CVE-2022-1304. Signed-off-by: Ross Burton Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 31fd4ca6fa85ed1e62faf37e6d7bed5b558cb309) Signed-off-by: Steve Sakoman --- .../e2fsprogs/e2fsprogs/extents.patch | 56 +++++++++++++++++++ .../e2fsprogs/e2fsprogs_1.46.5.bb | 1 + 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/extents.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/extents.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/extents.patch new file mode 100644 index 0000000000..ffaecc622a --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/extents.patch @@ -0,0 +1,56 @@ +CVE: CVE-2022-1304 +Upstream-Status: Submitted [https://lore.kernel.org/linux-ext4/20220421173148.20193-1-lczerner@redhat.com/] +Signed-off-by: Ross Burton + +From 347084c9c1ad20f47dae16f5a3dcd8628d5fc7b0 Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Thu, 21 Apr 2022 19:31:48 +0200 +Subject: [PATCH] e2fsprogs: add sanity check to extent manipulation + +It is possible to have a corrupted extent tree in such a way that a leaf +node contains zero extents in it. Currently if that happens and we try +to traverse the tree we can end up accessing wrong data, or possibly +even uninitialized memory. Make sure we don't do that. + +Additionally make sure that we have a sane number of bytes passed to +memmove() in ext2fs_extent_delete(). + +Note that e2fsck is currently unable to spot and fix such corruption in +pass1. + +Signed-off-by: Lukas Czerner +Reported-by: Nils Bars +Addressess: https://bugzilla.redhat.com/show_bug.cgi?id=2068113 +--- + lib/ext2fs/extent.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c +index b324c7b0..1a206a16 100644 +--- a/lib/ext2fs/extent.c ++++ b/lib/ext2fs/extent.c +@@ -495,6 +495,10 @@ retry: + ext2fs_le16_to_cpu(eh->eh_entries); + newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max); + ++ /* Make sure there is at least one extent present */ ++ if (newpath->left <= 0) ++ return EXT2_ET_EXTENT_NO_DOWN; ++ + if (path->left > 0) { + ix++; + newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block); +@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags) + + cp = path->curr; + ++ /* Sanity check before memmove() */ ++ if (path->left < 0) ++ return EXT2_ET_EXTENT_LEAF_BAD; ++ + if (path->left) { + memmove(cp, cp + sizeof(struct ext3_extent_idx), + path->left * sizeof(struct ext3_extent_idx)); +-- +2.25.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb index 16c183eed3..ec48f419c7 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb @@ -4,6 +4,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ + file://extents.patch \ " SRC_URI:append:class-native = " \ file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ From patchwork Fri Apr 29 16:00:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7365 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 93058C4332F for ; Fri, 29 Apr 2022 16:01:29 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web12.12049.1651248084722509608 for ; Fri, 29 Apr 2022 09:01:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=zU2qr+/y; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 7so2972345pga.12 for ; Fri, 29 Apr 2022 09:01:24 -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=jBV2nPoHWRHU0P6oN5vbfaPgp1mjQCX015Drr7nPUdk=; b=zU2qr+/yQsOI/m+dxHBrxbK0rmIivcox0nt/qm0PlADT1GbVLAIoRdzwx0S9e4X63F gM+mnCMvHmgOKSVQcVzAaNMOpm2KOSdPz9CRIec9HiFvm4pN6W7d9sJNLzt1+ZabswFf a8xpwTD818fgZUk5ZrGp2EDDwM8hm8/z4JRxm2pZAUtWoeQ/lsPRb7KXxXHfPRUVtAyx hYKoEoJhsYZVHtjD1SZeG05YRd4PSAFJWd2bJ6KGKNacezbTh++2N9p+gg4tsxOobv1r 65y3ZbPHiQfUkaJ9wo7vCukE5/mYnX+tTvFKJRYyLjExrgoyDHeC6GcBbCjYQH34h74R Wtug== 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=jBV2nPoHWRHU0P6oN5vbfaPgp1mjQCX015Drr7nPUdk=; b=V9apFuse6X79+AaPJN/YYCRFP/+ys80V261RCVwGmo3cijpt11hNTy3qTdjGwrgrLe JV3HmBdeNQUkYyyAbFqzt6p21sAJP+pKKzlTPDMmSpw1Qd5P1KuINhBIbXt2UOgKbuz2 iyG7oHDDLAOqL9noEjiJGyb1kDSpxLeGDVgdMh5zSqoDiveaQrNSy73S2aDnivcesTSK c1KVRC3DGoExR38maNAaA+skHWq0QJKMFJI6ZIvTA4NdkCJq2iOUb3udUsoG4W3vkRsB 9G+UE16K5hx+AF8xTI/OrBi7FQDVwunLKEuF6geT17FpygZJ+gUdxSESKN2Elk84pTZP 2Gkw== X-Gm-Message-State: AOAM530/UO3F8Wr5yKXfUCy0pwA1043EVCu3mQmq4+8iReUL2FS95O4z dVZP8aDMW2iEQj8x639uHG4BUoJ9x7gepgMkk08= X-Google-Smtp-Source: ABdhPJyQdgTWQVRLvl3SxAyxIu2CY+dq0/E9kfmRBUp6NDeSml+u+9ehdOiulEG1RE02YV/pi6RgDg== X-Received: by 2002:a05:6a00:140b:b0:4e1:2cbd:30ba with SMTP id l11-20020a056a00140b00b004e12cbd30bamr28461pfu.46.1651248083378; Fri, 29 Apr 2022 09:01:23 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/34] python3: ignore CVE-2015-20107 Date: Fri, 29 Apr 2022 06:00:21 -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 ; Fri, 29 Apr 2022 16:01:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165021 From: Ross Burton CVE-2015-20107 describes an arbitrary command execution in the mailcap module, but this is by design in mailcap and needs to be worked around by the calling application. Upstream Python will be documenting this flaw in the library reference, and it is likely that the mailcap module will be deprecated and removed in the future. Signed-off-by: Ross Burton Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 85fac8408baf92d8b71946f5bfea92952b7eab01) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3_3.10.4.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/python/python3_3.10.4.bb b/meta/recipes-devtools/python/python3_3.10.4.bb index 7eaafe34ad..d678d55083 100644 --- a/meta/recipes-devtools/python/python3_3.10.4.bb +++ b/meta/recipes-devtools/python/python3_3.10.4.bb @@ -55,6 +55,9 @@ CVE_CHECK_IGNORE += "CVE-2007-4559" CVE_CHECK_IGNORE += "CVE-2019-18348" # These are specific to Microsoft Windows CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" +# The mailcap module is insecure by design, so this can't be fixed in a meaningful way. +# The module will be removed in the future and flaws documented. +CVE_CHECK_IGNORE += "CVE-2015-20107" PYTHON_MAJMIN = "3.10" From patchwork Fri Apr 29 16:00:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7363 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 8C261C433F5 for ; Fri, 29 Apr 2022 16:01:29 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web12.12052.1651248088838005509 for ; Fri, 29 Apr 2022 09:01:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qciQPQSt; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id n18so7516443plg.5 for ; Fri, 29 Apr 2022 09:01:28 -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=MgpqcwKSrLZyVARs4vgaJHphp1ToKXD1Vnmf4vP1cGg=; b=qciQPQStvgcZCDwnCwIs6uX7lUnyewpspo7Avzu2hRGaJ8yYDnAUvG0y/Yi6RbDbnI J9rmqTLq89jZUX7ZXD9wa2x74wK/8IHrvSeSRIzKd5tJ4bsgrz+QEH4aCrvu6WpSAw/L /2TS2cYs6TDJtgVaA80ZCb1dNOK4mCaFk6oDsAbBZB0CPACsjXrnlVI+eU25z4vgqnsm SNX3qa+3rywA/RE/sJ3h5YoLkb32/whhIDb4OYxFmDcGBJ7won7obdFythyrotf3jr9d GqsyKne3yqjG9Wlu3/5DNvEKYP7Xlvh9lUma4pGW1dTra3I05Jlt3wV5jqe/YbG80fiY ItYg== 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=MgpqcwKSrLZyVARs4vgaJHphp1ToKXD1Vnmf4vP1cGg=; b=GFxptk7Vs/sTubdQcAAUNsxtB0jgTVWNjjxLrqgYfYyt8zPRE7cLsaEZYct8shsvJ2 pHnyoCXe3G+XqkYfcndc1B/9g+UMUcAyOlwdx8OTAgHHn7Nt7v47MnJ0Wb3OF7rMpx9Y 1+ifvuZ4HKSUzCMFibFjEL2AQNHAA9g4vDK7kQJQCvR96CD0uhFIoccQooq9I/x2FwdV zlXwTlgXK0Rc8iuIDS9cowBy4Mw65a75ljVkPoLmSiplLj1BmXevDVYMJP4CCweg36OF ftBRJ6gJDy6C/mPGzBnzTe/iXVmFw03NvysPbz5tdrDlMxRdbOwCC2xOp2KWaANn2woH h23w== X-Gm-Message-State: AOAM531a+lSxfeIzQNP/TDq7pR59A9MLty9CPxJQODkSaGMRsgqUKNmB +TCXPQD3CARWcpUPiWkX3giWRSADimfryFRn34s= X-Google-Smtp-Source: ABdhPJzZPjLawBlaYb1KdZgc04nyYke4HpmfOSLAjuATsyRFcDIYeiLbAqHyipmcEZ4FvDnATtLiXw== X-Received: by 2002:a17:90a:bf0a:b0:1db:d98d:7ce9 with SMTP id c10-20020a17090abf0a00b001dbd98d7ce9mr4692886pjs.155.1651248087176; Fri, 29 Apr 2022 09:01:27 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/34] cve_check: skip remote patches that haven't been fetched when searching for CVE tags Date: Fri, 29 Apr 2022 06:00:22 -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 ; Fri, 29 Apr 2022 16:01:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165022 From: Ross Burton If a remote patch is compressed we need to have run the unpack task for the file to exist locally. Currently cve_check only depends on fetch so instead of erroring out, emit a warning that this file won't be scanned for CVE references. Typically, remote compressed patches won't contain our custom tags, so this is unlikely to be an issue. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit cefc8741438c91f74264da6b59dece2e31f9e5a5) Signed-off-by: Steve Sakoman --- meta/lib/oe/cve_check.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index e445b7a6ae..dc7d2e2826 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py @@ -89,9 +89,10 @@ def get_patched_cves(d): for url in oe.patch.src_patches(d): patch_file = bb.fetch.decodeurl(url)[2] + # Remote compressed patches may not be unpacked, so silently ignore them if not os.path.isfile(patch_file): - bb.error("File Not found: %s" % patch_file) - raise FileNotFoundError + bb.warn("%s does not exist, cannot extract CVE list" % patch_file) + continue # Check patch file name for CVE ID fname_match = cve_file_name_match.search(patch_file) From patchwork Fri Apr 29 16:00:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7366 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 8BD33C433EF for ; Fri, 29 Apr 2022 16:01:39 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.12122.1651248093305392512 for ; Fri, 29 Apr 2022 09:01:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=V9jA8epD; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id h1so7258721pfv.12 for ; Fri, 29 Apr 2022 09:01: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=sZrynQimcVbDU57isDkApeqyIv/o9gHAW6T1W/3bTsA=; b=V9jA8epD5bm5LDZYa3Mrma+dOcQ7Kd2C+nXT5JRWTrh2beDADr+7QiEjfwWj0jbODF RAJfX18zxPw04Yy0GpGXAojhkMPIiOeUuGUpT/WSjJfbDK9NriXpNuz6NtJjygTorzqu zSIdIVgxMBCvVwjqCFRDB6lWwBDdSlrl8hZrkt6BzGx9MeX4lWnOFhRnVXKjZQtBQ9DS T7h3xwVETbl0dFbxjMnOh6RLQY80/Sw0VXVDQ2d+0bXjZtAd5n0ikSQqhiDAwufY49Sr MPkhWf/aK0jsYQp7dcGcKXHSz+t6vXBpzYrtEmX/LkfiAp+KVzk82XLuRuLTTm3o80fp H5NA== 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=sZrynQimcVbDU57isDkApeqyIv/o9gHAW6T1W/3bTsA=; b=UOoQQtEZsoouZ3rMuEYHghbXIxzUxaJ5tM/yWQSwkBzLZ5W1Np8PK6z+EhLJeeHkpc 2IxzjnCMX4J2xMnBoo0Q/3g3af+NL505+nQ6LBiNO2Qp6K7cFgBWuqPRgJue5C16xu1t VHYR9cx5/D1TjI9P3u0zleCwxAUT4j9PtMRVhhTFa4YqCMUUwg+xiZoiHPF5Qzl5UnVZ sUiFL+lMDx0OHAMl5oiE/PT+KL4/6QS5zcqTNpumQpA28WokCt0V5dMJtVtqP+DwaHan nhhyat/ZBZxUzvUNMXHRTMzGhN0VEdnXTyFHKi19VQF2LNrOUefCpxHyvdTW8EJRcQEj qylw== X-Gm-Message-State: AOAM530UU8fLD5ORrcP+KkHtayfmn6vhT66b0Jl6YlETpTTYUjZ2Wnc7 mZ6wI9w41FEr1NpH1pWZAmAUEuWde1jw4SSoRt4= X-Google-Smtp-Source: ABdhPJzvuWa8M7Fow+s3Rib/0c04oUsVC8UGIC0w9V8v8bTrD13dy/q5SHV9BURU5UVyYnkldMSW/g== X-Received: by 2002:a05:6a00:2187:b0:50c:ef4d:ef3b with SMTP id h7-20020a056a00218700b0050cef4def3bmr37583746pfi.83.1651248089971; Fri, 29 Apr 2022 09:01:29 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/34] apt: upgrade 2.4.4 -> 2.4.5 Date: Fri, 29 Apr 2022 06:00:23 -1000 Message-Id: <76f4471a26bf457d1f0816b2b5ba92d0d6474e14.1651246310.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 ; Fri, 29 Apr 2022 16:01:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165023 From: wangmy apt (2.4.5) release notes: * Only protect two kernels, not last installed one (LP: #1968154) * Fix segfault in CacheSetHelperAPTGet::tryVirtualPackage() Signed-off-by: Wang Mingyu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6a6462fd0ab140b554f4bda260e26b938cd44dc2) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/apt/{apt_2.4.4.bb => apt_2.4.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/apt/{apt_2.4.4.bb => apt_2.4.5.bb} (97%) diff --git a/meta/recipes-devtools/apt/apt_2.4.4.bb b/meta/recipes-devtools/apt/apt_2.4.5.bb similarity index 97% rename from meta/recipes-devtools/apt/apt_2.4.4.bb rename to meta/recipes-devtools/apt/apt_2.4.5.bb index 9faf1e7ea9..95c25e3036 100644 --- a/meta/recipes-devtools/apt/apt_2.4.4.bb +++ b/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -25,7 +25,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "d6d83d122ddd7cc83b2c2f839a55940c13ab93e5cf6024a010d6a6b4110dcf0e" +SRC_URI[sha256sum] = "5552f175c3a3924f5cda0c079b821b30f68a2521959f2c30ab164d2ec7993ecf" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale From patchwork Fri Apr 29 16:00:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7367 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 9054DC433FE for ; Fri, 29 Apr 2022 16:01:39 +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.12053.1651248094148510180 for ; Fri, 29 Apr 2022 09:01:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jpVydxTD; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id cq17-20020a17090af99100b001dc0386cd8fso2294167pjb.5 for ; Fri, 29 Apr 2022 09:01:34 -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=BYeEwRyweIa27zhAoEgQmU+7EQzQosl9tz+hEYuEAJU=; b=jpVydxTDj2AwaEmoX8rpQKVizcrydJtmqLoX42fUecXo5uCJK8yENk7H0glHAiQiR7 hV8FRoSN1khjkdaX+4QoqLH1D1ZEQVanl22889+c9L8ImrCOt6izarb35e9IpQfMOrqs lI48TJLpaEQ3so+OpfpphMOFBR5A/hrOGHVGgr79CpncTxlrV1W06x9tK/P7mC/31xI4 DHFO90o9pYJcsC7erPG7gGvimCEJ8TdgjxllmUat5Cw788aIJbmrDWqGV28bvUpAVeJF 0ohAlAJmTMYC+Itn/PoEAj+gQ/pNyB6CnkKzldtoGVUeKjWf5FuIU5NX0dAMilNPWpxM tr3w== 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=BYeEwRyweIa27zhAoEgQmU+7EQzQosl9tz+hEYuEAJU=; b=xagm4Wo4HkonfLDwkNCB1bCLqO2r45UdKf6OIhyVfbbo6Owmf9LFe3UVBlWJITG4Oj JCEJ+QYLhhRVgmoC+69wW3HexXJ3NC7tgzQcFnWlLW2wvFwye9/RDj1FR3qZZolqQM/d 5PFnv36XCbR9bkTDwgDkswFG71h3jxkbVgXVHDInxRwgEQNXKgYJSBM6T8oNQx53hZGQ fHd9VjE/TKnOSiorKltnAdehOrmyUydXsxsTPD4m2bMzHDy6z6pIjyUbIhewz+K6PrMX 4aLP/tpGsKvRnjDzNjp0LEr8CfK5q9JFXRP2keMwL8Qic93T9BbPQacS0MbFAQ7X5zmU QRJw== X-Gm-Message-State: AOAM533RuJRWrryedvJ5cBxyaAAPViw48r54uK/cbxadhlO47IpDPvtN Mi7Ifqw/yuh7z+XdkoTwQ07+QqiuXpLHtnKhx5U= X-Google-Smtp-Source: ABdhPJygGjlipQVGxPP1v5du/MiMZSHGa/+OEQxNVqCuxO5vwwLEsP3LoFdmqw354/OmInaaQ4sUHQ== X-Received: by 2002:a17:90a:f3c7:b0:1d9:6832:7be0 with SMTP id ha7-20020a17090af3c700b001d968327be0mr4671628pjb.209.1651248092427; Fri, 29 Apr 2022 09:01: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/34] subversion: upgrade to 1.14.2 Date: Fri, 29 Apr 2022 06:00:24 -1000 Message-Id: <76a74a8f22021e60326c001ccdd9b6ca200cd28e.1651246310.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 ; Fri, 29 Apr 2022 16:01:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165024 From: Ross Burton This release is primarily to fix two CVEs: - CVE-2021-28544 - CVE-2022-24070 It also rewrites the macOS autoconf macros to be cross-compile friendly, so we don't need to delete them anymore. Signed-off-by: Ross Burton Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit ecfbc2ef45a76ab96d215954ca0a109545e6ff02) Signed-off-by: Steve Sakoman --- .../subversion/subversion/disable_macos.patch | 71 ------------------- ...version_1.14.1.bb => subversion_1.14.2.bb} | 3 +- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 meta/recipes-devtools/subversion/subversion/disable_macos.patch rename meta/recipes-devtools/subversion/{subversion_1.14.1.bb => subversion_1.14.2.bb} (96%) diff --git a/meta/recipes-devtools/subversion/subversion/disable_macos.patch b/meta/recipes-devtools/subversion/subversion/disable_macos.patch deleted file mode 100644 index 8d2d635992..0000000000 --- a/meta/recipes-devtools/subversion/subversion/disable_macos.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 9c350c037ca3489dbeece6ecc2d7e2e5dbb177e9 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Sat, 11 May 2019 15:21:46 +0800 -Subject: [PATCH] These tests don't work in cross compiling, just disable them - for now, we don't build subversion on OS-X at this time. - -RP 1014/7/16 - -Upstream-Status: Pending [needs a rewrite to support a cache value] - -Rebase to 1.12.0 - -Signed-off-by: Hongxu Jia ---- - build/ac-macros/macosx.m4 | 31 +------------------------------ - 1 file changed, 1 insertion(+), 30 deletions(-) - -diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4 -index 92fa58e..a568e1c 100644 ---- a/build/ac-macros/macosx.m4 -+++ b/build/ac-macros/macosx.m4 -@@ -24,21 +24,7 @@ dnl Check for _dyld_image_name and _dyld_image_header availability - AC_DEFUN(SVN_LIB_MACHO_ITERATE, - [ - AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -- #include -- #include -- ]],[[ -- const struct mach_header *header = _dyld_get_image_header(0); -- const char *name = _dyld_get_image_name(0); -- if (name && header) return 0; -- return 1; -- ]])],[ -- AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], -- [Is Mach-O low-level _dyld API available?]) -- AC_MSG_RESULT([yes]) -- ],[ - AC_MSG_RESULT([no]) -- ]) - ]) - - dnl SVN_LIB_MACOS_PLIST -@@ -46,23 +32,8 @@ dnl Assign variables for Mac OS property list support - AC_DEFUN(SVN_LIB_MACOS_PLIST, - [ - AC_MSG_CHECKING([for Mac OS property list utilities]) -- -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -- #include -- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ -- || !defined(MAC_OS_X_VERSION_10_0) \ -- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0) -- #error ProperyList API unavailable. -- #endif -- ]],[[]])],[ -- SVN_MACOS_PLIST_LIBS="-framework CoreFoundation" -- AC_SUBST(SVN_MACOS_PLIST_LIBS) -- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], -- [Is Mac OS property list API available?]) -- AC_MSG_RESULT([yes]) -- ],[ -+ AC_SUBST([SVN_MACOS_PLIST_LIBS], [""]) - AC_MSG_RESULT([no]) -- ]) - ]) - - dnl SVN_LIB_MACOS_KEYCHAIN --- -2.7.4 - diff --git a/meta/recipes-devtools/subversion/subversion_1.14.1.bb b/meta/recipes-devtools/subversion/subversion_1.14.2.bb similarity index 96% rename from meta/recipes-devtools/subversion/subversion_1.14.1.bb rename to meta/recipes-devtools/subversion/subversion_1.14.2.bb index 71183ac7ce..ba208d922f 100644 --- a/meta/recipes-devtools/subversion/subversion_1.14.1.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.2.bb @@ -9,11 +9,10 @@ DEPENDS = "apr-util serf sqlite3 file lz4" DEPENDS:append:class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://disable_macos.patch \ file://serfmacro.patch \ " -SRC_URI[sha256sum] = "2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9" +SRC_URI[sha256sum] = "c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28" inherit autotools pkgconfig gettext python3native From patchwork Fri Apr 29 16:00:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14205 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/34] glib: upgrade 2.72.0 -> 2.72.1 Date: Fri, 29 Apr 2022 06:00:25 -1000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Alexander Kanavin Bug fix release Overview of changes in GLib 2.72.1 Fix building projects which use g_warning_once() with clang++ (#2625) Fix g_file_trash() not deleting directories via the portals backend (work by Matthias Clasen) (#2629) A number more compiler warnings fixed for MSVC (work by Loïc Le Page) (!2495) Fix detection of broken poll() function on macOS (work by Haruka Ma) (!2571) Fix spawning subprocesses from GUI programs on Windows (work by Marc-André Lureau) (!2582) Bugs fixed: 2312 gdbus-test-codegen tests leak GWeakRef objects 2625 g_warning_once fails to build with clang++ 2629 g_file_trash() does not work on directories inside a sandbox 2495 Cleanup warnings split 6 2499 Various contenttype-related test fixes on win32 2534 gpowerprofilemonitor: Tweak wording of documentation to make more sense 2540 Various win32 tests skip & fixes 2541 meson: simplify lookup of python command 2543 ci: Update the Fedora CI image to Fedora 34 2556 gdbusconnection: Use g_strv_contains() rather than a home-grown version 2557 gdbusmethodinvocation: Fix a leak on an early return path 2558 Move unit test on g_basename() function to glib/tests/fileutils.c 2559 Move tests/relation-test.c to glib/tests/relation.c 2560 ci: Update Coverity, mingw and Android CI images to Fedora 34 2563 glib: Format GDateTime ISO8601 years as %C%y 2564 Move test files on slices from tests/ to glib/tests/ 2566 tests: Add more tests for GResolver response parsing 2573 Backport translation fixes and !2571 “meson: Set BROKEN_POLL in macOS builds” to glib-2-72 2574 Backport !2565 “Revert "meson: simplify lookup of python command"” to glib-2-72 2587 Backport !2583 “Fix trashing sandboxed directories” to glib-2-72 2588 Backport !2582 “glib/win32: fix spawn from GUI regression” to glib-2-72 2590 Backport !2589 “tests: Don’t exit gdbus-method-invocation test early on connection close” to glib-2-72 2593 Backport !2578 “gatomic: Add a C++ variant of g_atomic_int_compare_and_exchange()” to glib-2-72 Translation updates: Bulgarian Catalan Indonesian Italian Lithuanian Polish Portuguese Russian Slovenian Swedish Turkish Ukrainian Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit e167060bfb105799e0931c06a6aa1275163bf261) Signed-off-by: Steve Sakoman --- ...s-for-typechecking-with-atomic-compa.patch | 64 ----------------- ...variant-of-g_atomic_int_compare_and_.patch | 70 ------------------- ...ble-more-tests-while-cross-compiling.patch | 32 ++++----- .../glib-2.0/glib-2.0/relocate-modules.patch | 8 +-- ...{glib-2.0_2.72.0.bb => glib-2.0_2.72.1.bb} | 4 +- 5 files changed, 20 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.72.0.bb => glib-2.0_2.72.1.bb} (90%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch deleted file mode 100644 index 4842f462e1..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 44b4bcd56d7ac2bd8ebf00e9fa433ad897d68216 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Fri, 1 Apr 2022 13:44:45 +0100 -Subject: [PATCH 1/2] tests: Add C++ tests for typechecking with atomic compare - and exchanges - -Signed-off-by: Philip Withnall - -Helps: #2625 -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2578] -Signed-off-by: Khem Raj ---- - glib/tests/cxx.cpp | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp -index be0a6bfa1..7d7f27c91 100644 ---- a/glib/tests/cxx.cpp -+++ b/glib/tests/cxx.cpp -@@ -53,6 +53,32 @@ test_typeof (void) - #endif - } - -+static void -+test_atomic_pointer_compare_and_exchange (void) -+{ -+ const gchar *str1 = "str1"; -+ const gchar *str2 = "str2"; -+ const gchar *atomic_string = str1; -+ -+ g_test_message ("Test that g_atomic_pointer_compare_and_exchange() with a " -+ "non-void* pointer doesn’t have any compiler warnings in C++ mode"); -+ -+ g_assert_true (g_atomic_pointer_compare_and_exchange (&atomic_string, str1, str2)); -+ g_assert_true (atomic_string == str2); -+} -+ -+static void -+test_atomic_int_compare_and_exchange (void) -+{ -+ gint atomic_int = 5; -+ -+ g_test_message ("Test that g_atomic_int_compare_and_exchange() doesn’t have " -+ "any compiler warnings in C++ mode"); -+ -+ g_assert_true (g_atomic_int_compare_and_exchange (&atomic_int, 5, 50)); -+ g_assert_cmpint (atomic_int, ==, 50); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -63,6 +89,8 @@ main (int argc, char *argv[]) - #endif - - g_test_add_func ("/C++/typeof", test_typeof); -+ g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); -+ g_test_add_func ("/C++/atomic-int-compare-and-exchange", test_atomic_int_compare_and_exchange); - - return g_test_run (); - } --- -2.35.1 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch b/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch deleted file mode 100644 index a07f94672f..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 2668390454bc0efe52a262eb2faa4a2bd5a062e2 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Fri, 1 Apr 2022 13:47:19 +0100 -Subject: [PATCH 2/2] gatomic: Add a C++ variant of - g_atomic_int_compare_and_exchange() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The C++ variant implements type safety differently, to avoid warnings -from C++ compilers about: -``` -../../../gnome-commander-1.14.2/src/intviewer/searcher.cc:303:5: error: cannot initialize a parameter of type 'gint *' (aka 'int *') with an rvalue of type 'void *' - g_atomic_int_compare_and_exchange ((gint*)&src->priv->progress_value, oldval, (gint)d); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/gnome-commander/1.14.2-r0/recipe-sysroot/usr/include/glib-2.0/glib/gatomic.h:160:44: note: expanded from macro 'g_atomic_int_compare_and_exchange' - __atomic_compare_exchange_n ((atomic), (void *) (&(gaicae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~ -``` - -This complements the existing C++ variant for -`g_atomic_pointer_compare_and_exchange()`, and fixes a regression on C++ -from https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2114. - -With the addition of the unit tests in the previous commit, this is -effectively tested by the FreeBSD and macOS CI jobs, as they use -`clang++` in C++ mode. `g++` doesn’t seem to emit a warning about this. - -Signed-off-by: Philip Withnall - -Fixes: #2625 -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2578] -Signed-off-by: Khem Raj ---- - glib/gatomic.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/glib/gatomic.h b/glib/gatomic.h -index 5eba1dbc7..8b2b880c8 100644 ---- a/glib/gatomic.h -+++ b/glib/gatomic.h -@@ -152,6 +152,17 @@ G_END_DECLS - (void) (0 ? *(atomic) ^ *(atomic) : 1); \ - __atomic_fetch_sub ((atomic), 1, __ATOMIC_SEQ_CST) == 1; \ - })) -+#if defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L -+/* See comments below about equivalent g_atomic_pointer_compare_and_exchange() -+ * shenanigans for type-safety when compiling in C++ mode. */ -+#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ -+ (G_GNUC_EXTENSION ({ \ -+ glib_typeof (*(atomic)) gaicae_oldval = (oldval); \ -+ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ -+ (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1); \ -+ __atomic_compare_exchange_n ((atomic), &gaicae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ -+ })) -+#else /* if !(defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L) */ - #define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ - (G_GNUC_EXTENSION ({ \ - gint gaicae_oldval = (oldval); \ -@@ -159,6 +170,7 @@ G_END_DECLS - (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1); \ - __atomic_compare_exchange_n ((atomic), (void *) (&(gaicae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ - })) -+#endif /* defined(glib_typeof) */ - #define g_atomic_int_add(atomic, val) \ - (G_GNUC_EXTENSION ({ \ - G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ --- -2.35.1 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index 6147bdae46..f5c161fe04 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -1,4 +1,4 @@ -From d2d7af496b4f4a13779179dbcbb98de56b09783f Mon Sep 17 00:00:00 2001 +From 1f3c05529c0c9032ae0a289fb1f088b7541fc9b0 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 9 Nov 2015 11:07:27 +0200 Subject: [PATCH] Enable more tests while cross-compiling @@ -9,24 +9,25 @@ case we can depend on glib-2.0-native. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jussi Kukkonen + --- gio/tests/meson.build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index e8d10a0f11f2..abe676767c60 100644 +index 3ed23a5..5df932a 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -250,7 +250,7 @@ if host_machine.system() != 'windows' +@@ -253,7 +253,7 @@ if host_machine.system() != 'windows' + } + endif - # Test programs that need to bring up a session bus (requires dbus-daemon) - have_dbus_daemon = find_program('dbus-daemon', required : false).found() - if have_dbus_daemon + if true annotate_args = [ '--annotate', 'org.project.Bar', 'Key1', 'Value1', '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -601,14 +601,14 @@ if installed_tests_enabled +@@ -603,14 +603,14 @@ if installed_tests_enabled endforeach endif @@ -43,7 +44,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -634,7 +634,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -636,7 +636,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_gresource = custom_target('test.gresource', input : 'test.gresource.xml', output : 'test.gresource', @@ -52,7 +53,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -647,7 +647,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -649,7 +649,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_c = custom_target('test_resources2.c', input : 'test3.gresource.xml', output : 'test_resources2.c', @@ -61,7 +62,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -660,7 +660,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -662,7 +662,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_h = custom_target('test_resources2.h', input : 'test3.gresource.xml', output : 'test_resources2.h', @@ -70,7 +71,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -674,7 +674,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -676,7 +676,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() input : 'test2.gresource.xml', depends : big_test_resource, output : 'test_resources.c', @@ -79,7 +80,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -687,7 +687,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -689,7 +689,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_c = custom_target('digit_test_resources.c', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.c', @@ -88,7 +89,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -700,7 +700,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -702,7 +702,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_h = custom_target('digit_test_resources.h', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.h', @@ -97,7 +98,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -742,11 +742,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -744,11 +744,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() ld = find_program('ld', required : false) @@ -111,7 +112,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -760,7 +760,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -762,7 +762,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources_binary_c = custom_target('test_resources_binary.c', input : 'test5.gresource.xml', output : 'test_resources_binary.c', @@ -120,6 +121,3 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), --- -2.34.1 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index d3bb05e669..816b790ce7 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From d4e95568151cb7a62b6a29a4d2c3f532fd55c98c Mon Sep 17 00:00:00 2001 +From d52b1b530c5d8a1e70ae45d6e2139e9d3f25207f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index d34037a..7442df6 100644 +index 2a043cc..e2d2310 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -54,6 +54,8 @@ +@@ -56,6 +56,8 @@ #ifdef G_OS_WIN32 #include "gregistrysettingsbackend.h" #include "giowin32-priv.h" @@ -31,7 +31,7 @@ index d34037a..7442df6 100644 #endif #include -@@ -1224,7 +1226,15 @@ get_gio_module_dir (void) +@@ -1267,7 +1269,15 @@ get_gio_module_dir (void) NULL); g_free (install_dir); #else diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb similarity index 90% rename from meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb index 62479e3c3f..c9ccedd81f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb @@ -16,12 +16,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch \ - file://0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d" +SRC_URI[sha256sum] = "c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. From patchwork Fri Apr 29 16:00:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7371 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 93EB8C433FE for ; Fri, 29 Apr 2022 16:01:49 +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.web12.12054.1651248105471858588 for ; Fri, 29 Apr 2022 09:01:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=w5Os2cyi; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id p6so7502599plf.9 for ; Fri, 29 Apr 2022 09:01: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=89nBWpKYPR6oqXErtfkjViaZR8BpPG9C69C0HAvya5I=; b=w5Os2cyiTv0PeUVJgcs6X/UN7aZstEMysK6lU5kj95ghkmkAVuZ+YHEoNXJ1o53uKW mO8O0EMwivbKKwwH2YpbFxAThOZfPCnHY4XYxhW/CtJC/C8UCsaeGwRljSEqKwLrLm7N w3j8sgPN6GE8rmDDdrkIvq+PljX5xMPdeg0HHl7YEy4J+rmlej6cINZsNYdDDmiDvncS VOolWNhLhFbhATVzjaxNZIN5yukzLsXMJKJQwmdiXXMxGiJt9lGwa1XL6X/qpcEH0Haj +xBNYoflvrk3PTDhNi9zfzEPbXk4WSXYwh5Ut085HHX2YFuWcd3+0+OD7IDXKa23C5FW gaBw== 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=89nBWpKYPR6oqXErtfkjViaZR8BpPG9C69C0HAvya5I=; b=JePx9upnjwpVL0oc9faL2wo7VQw5IfT/IK7pU3NGsmFVvDsrycclRu1h3glQFbUS7+ WBujK6TUggtMO12guQ+m8UpeniRnhW3penKQ04SAprb+j5qSbHgk+oDVGoGA1rQ8Tbu2 ZvVxtS0S6tdL2ixEdxY/XaMGiKuorVxLlkEwRxcNOPbuuB5823Xq83q9H8Kpmm9XN0t8 jzAon+UR3kOZ9WknRXseMS5qDGrWmTUk5MbT9Lwsgq/hGdZeejSocBv2ptDjkAlMoo71 SL7Efmrxdv13XnjDmYc43ISAqcPXVLR6iHTCND4oxKd3caz8MVRdyH2PyiPYnjige5k3 lp3g== X-Gm-Message-State: AOAM532A50QF6S2v+cxi1DXtDkJaSQKzu7ShF2KLvvrednZIt1xjShzy thAHm08ZncjWrD95YYTb/TXtpoQjF4AFQT323BE= X-Google-Smtp-Source: ABdhPJxiXzAXGEh1fvFIJIHh9URNaDA7mWxN8jdqRwoeC5fKHBMhm/fJ6rSB8jjpg9EqMadfXhPfQg== X-Received: by 2002:a17:903:4052:b0:156:229d:ffed with SMTP id n18-20020a170903405200b00156229dffedmr39217454pla.98.1651248097991; Fri, 29 Apr 2022 09:01: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/34] glibc: ptest: Fix glibc-tests package issue Date: Fri, 29 Apr 2022 06:00:26 -1000 Message-Id: <2447c5abd7629af24bab5fccec8669f9ca676873.1651246310.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 ; Fri, 29 Apr 2022 16:01:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165028 From: Pgowda Run glibc-tests only when its enabled in the DISTRO_FEATURES. Signed-off-by: pgowda Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 5555e7cf935b047a3dc3228d26bf0fd52eb425e5) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-tests_2.35.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-tests_2.35.bb b/meta/recipes-core/glibc/glibc-tests_2.35.bb index 8c7ecf89ba..414f8660de 100644 --- a/meta/recipes-core/glibc/glibc-tests_2.35.bb +++ b/meta/recipes-core/glibc/glibc-tests_2.35.bb @@ -1,7 +1,8 @@ require glibc_${PV}.bb require glibc-tests.inc -inherit ptest +inherit ptest features_check +REQUIRED_DISTRO_FEATURES = "ptest" SRC_URI:append = " \ file://run-ptest \ From patchwork Fri Apr 29 16:00:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7369 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 92745C4332F for ; Fri, 29 Apr 2022 16:01:49 +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.11928.1651248101884084408 for ; Fri, 29 Apr 2022 09:01:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RV8Z+q9i; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id z5-20020a17090a468500b001d2bc2743c4so7713563pjf.0 for ; Fri, 29 Apr 2022 09:01:41 -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=cdjWXUU/7qrwH6H1DV2+sJtUyWjJUKnaLuAPXTD9mKM=; b=RV8Z+q9i1FQzIcQMuR6H0IOjyQtP+9sHUEg88J9Se8iBRU69WnwKnZ4THnVeE68mC9 kFsh1NwGBxI0fRRGaV6JP9htb7km6ULWRu5+gmWBwXWZowzkE8+BeazoGf3xNHqEm4bX hlF95y+We19zgBOUHO35q3Y85rtMRhkOjNAxIuubtwsxQ2mR3sIaRiZGO3ncZyZA99hy XnSoFYF7vgeoVE9B0njOahp4f/Jk4wyB1R3MhgdrfAFLrZn1MaSus5otcY1gwsH31dTI aVEXY09CgC6wwh3ASzYBK6zXvm7dW3cI8Ryxmiym4vRTL+6+1KwmOqxbvcXOmkgcBv9U lPCA== 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=cdjWXUU/7qrwH6H1DV2+sJtUyWjJUKnaLuAPXTD9mKM=; b=ToREY9Y2O19rGrx0F3iRxW785rUcsMWq0LWj9WuSWdEsobuOm/P3Z/iUmaMpVJ1csf 04YOOVE2IQwNndc+H98lRkDvsFWDRNKuWlpGZmS45SwEpc/CiDISTGBe3pgM4wUaIBV5 5JFfw1ZpDgm6jOJZ0xbbG5t5z3z5v0gsP+YbZmoIbklyKQ57/J8SrAAE2VBY/3eTWohX Kv+6L55oJM7Y9TuA+9xNlISJANcANawsCHItbtWgz/rdEvbvKu25Tvk0Qssx3uWJwxJs PXNwiBSMlJ4Wv/jesIicm4iXRPX3GEoKt21Qwa83WHJEmrmvNkVyqCEvnXOeD3CXmb1y 18Cw== X-Gm-Message-State: AOAM533qi+hMxG+7+m/j62D6bF/1Aq5mZ0Ry4DHLuZJwL1MmRcDZna98 LMlxj7zpjT6F9akJrG8lZj3p83SFEvvjhOPYhmA= X-Google-Smtp-Source: ABdhPJxG2Nl1lfi4RhTktsMil9hlHsoXhOggN3Iolxwrvec6L7HbTPq7rApl8wE+BHWJDfexBH7n1w== X-Received: by 2002:a17:90b:1e47:b0:1da:31f9:e5d1 with SMTP id pi7-20020a17090b1e4700b001da31f9e5d1mr4734938pjb.226.1651248100753; Fri, 29 Apr 2022 09:01:40 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/34] seatd: Disable overflow warning as error on ppc64/musl Date: Fri, 29 Apr 2022 06:00:27 -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 ; Fri, 29 Apr 2022 16:01:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165026 From: Khem Raj Disabling the warning is easier fix then trying to fix it in musl which results in ABI breakage and disabling the Werror gets us along by doing minimal change, also see [1] [1] https://todo.sr.ht/~kennylevinsen/seatd/10 Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 381cf11b994d2bf40ac8781e18b5eac17b3b6cb0) Signed-off-by: Steve Sakoman --- meta/recipes-core/seatd/seatd_0.6.4.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/seatd/seatd_0.6.4.bb b/meta/recipes-core/seatd/seatd_0.6.4.bb index a38f8c2152..601736adef 100644 --- a/meta/recipes-core/seatd/seatd_0.6.4.bb +++ b/meta/recipes-core/seatd/seatd_0.6.4.bb @@ -13,6 +13,9 @@ S = "${WORKDIR}/git" inherit meson pkgconfig update-rc.d +# https://www.openwall.com/lists/musl/2020/01/20/3 +CFLAGS:append:libc-musl:powerpc64le = " -Wno-error=overflow" + PACKAGECONFIG ?= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ libseat-builtin \ From patchwork Fri Apr 29 16:00:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7368 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 911E2C433F5 for ; Fri, 29 Apr 2022 16:01:49 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.12124.1651248104245974346 for ; Fri, 29 Apr 2022 09:01:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=laAeEdw2; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id z16so7282987pfh.3 for ; Fri, 29 Apr 2022 09:01:44 -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=eP1OA+LukvA7gd1XW7I4AZ3sov9R+s+GHbKg2rzgPtw=; b=laAeEdw2TP5V+mIzOthDR6ee5+5YYmlUD0ILizibqyS8bBCbtrvfAAX+jHkvUU3V/W hKERQbgSi5usytrKO2etFqGXokniqyw9QRbRYwz4/Fx55z+oT3eMDOZB4TxgHx7aoXi0 7NV9GBoS/yFoCyDjAOER36KThOqkbsjALMDCiBaY3iiCXGIOmxPCRilTstWKXIKxo49f C7bk6GMrKlVgzRyO6UtIDYvMzmVTm+TAQ3qt55j6mJqV/9ct1Bc+7bQES5yyxrXBHVhV lxuiGSJ+AmH8twFpUTgmCBxFVijQ663U1AAE4sM75iE+mJwOHwEYkTk3MKVq9p++VO6f SXnA== 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=eP1OA+LukvA7gd1XW7I4AZ3sov9R+s+GHbKg2rzgPtw=; b=nevelqbfHA9s6rqsi9PuJeYVls4FIFPkZgfUz9YdfzKg8ozcaTl9+xtPz7BqNHrQt/ qc7KqLlhbic+Aw+wtVepbx0QhOw9eSRtSNti3MNVlbfQx0uxbh7/N6fKQqIGPi3NrhIR bzOA7KsnO25JEGKpVq/x9/7kBMJk5pwEoBvnmJdHwYW0Jbtw6nXkTPQPJGMO9M5jwxcw YUGx71Zwkd8GAIiEbnN7UKd8EZYCCttNIH7rBKfUy/4xtmmqEQ1t+awlQyjDMnYLJJTh oewPvfDBSONQXSNB7lI0TJqu4eLiiiUfMYXpCyLL2qcwTL6K7VleNRh0iSNlvW6slvwo sm8Q== X-Gm-Message-State: AOAM5315wrbN/qNUKdoodI1XZnni+ZPzJuEZ3NB/S84xbRhgyN0DTJDt zWgh9TWG8KOzha88j1fDuHlkGg9aNflE/S5GwwU= X-Google-Smtp-Source: ABdhPJwIgg90IqQYqSr3RqVAbkgEi29bWOLJCJGZRLJPGtkFdJZDkvsxpUU81tyOukHtyrjbMWEgfw== X-Received: by 2002:a63:7e4b:0:b0:3a5:6636:5b94 with SMTP id o11-20020a637e4b000000b003a566365b94mr60120pgn.173.1651248103022; Fri, 29 Apr 2022 09:01:43 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/34] package.bbclass: Prevent perform_packagecopy from removing /sysroot-only Date: Fri, 29 Apr 2022 06:00:28 -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 ; Fri, 29 Apr 2022 16:01:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165027 From: Russ Dill The files in /sysroot-only are intended to make it into the recipes sysroot output, but not into the package. However, if do_package is run before do_populate_sysroot, the files are removed. Use a smaller hammer to avoid copying the files into the package so they are still around when do_populate_sysroot runs. Signed-off-by: Russ Dill Signed-off-by: Luca Ceresoli (cherry picked from commit 493145c6f1bc92ab2b7a23e181641b09df87c9ff) Signed-off-by: Steve Sakoman --- meta/classes/package.bbclass | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index e71daafe94..44fbc32df6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -422,7 +422,6 @@ def splitstaticdebuginfo(file, dvar, dv, d): # return a mapping of files:debugsources import stat - import shutil src = file[len(dvar):] dest = dv["staticlibdir"] + os.path.dirname(src) + dv["staticdir"] + "/" + os.path.basename(src) + dv["staticappend"] @@ -807,15 +806,10 @@ python perform_packagecopy () { dest = d.getVar('D') dvar = d.getVar('PKGD') - # Remove ${D}/sysroot-only if present - sysroot_only = os.path.join(dest, 'sysroot-only') - if cpath.exists(sysroot_only) and cpath.isdir(sysroot_only): - shutil.rmtree(sysroot_only) - # Start by package population by taking a copy of the installed # files to operate on # Preserve sparse files and hard links - cmd = 'tar -cf - -C %s -p -S . | tar -xf - -C %s' % (dest, dvar) + cmd = 'tar --exclude=./sysroot-only -cf - -C %s -p -S . | tar -xf - -C %s' % (dest, dvar) subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) # replace RPATHs for the nativesdk binaries, to make them relocatable From patchwork Fri Apr 29 16:00:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7370 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 9B01BC43217 for ; Fri, 29 Apr 2022 16:01:49 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.12125.1651248106993339315 for ; Fri, 29 Apr 2022 09:01:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=WfE+LTEx; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id i24so7271390pfa.7 for ; Fri, 29 Apr 2022 09:01:46 -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=lcp+FjqsfpM5lyHQU0zmtNWeTmGqf1Oyjf6OLVY3HiM=; b=WfE+LTExhyvL2xyY4d3L8V0WqAFxcFTeCSP1dh0lqS8PPoiRd58JZtUOY7n9xCE/xq YBuu4SzUuEq09nmHx8mIvUNFzcAu1slWwRDiMcWfsNpBOjkLZLuWQMgBhwndVSu70y/O kuJSfEsxnyexB5DnAVIvpDT/kWcePReHBHSl4JpCLTSOWRHCcui8Ii7aXg1o25tL4YIg S7rSngOhOaRN6qoiGApJqPz3h7BybtQ6eMjp/CwPDUL1Q0JRZuDFWimrBTtOI4c944zO DdKXrgHkWZZBwQTv45tdyAr3Ap5/+pmBqByhO15bGRm/h7Lr01OqwfNPcMGItdim6WE+ jLuw== 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=lcp+FjqsfpM5lyHQU0zmtNWeTmGqf1Oyjf6OLVY3HiM=; b=e1Pc5mG+CGIIlIXXoOihrU4AprN6uyxKC4fyndD0QlGB3j7UDwBOgzY+NxMowmKEpi h8TISG7Kc9YkuzpaJvXMci4q6srmtDcqa8PMoWRj2+E3v0yQU49wtnJVq5tx/hMDmc9/ iPCJKvn+a+gphPyTtL2BGWoPpTXB5QOmz3gi4OhtIXdAL0tHZA0b/P9+63J922v1LT+8 zmW/139TpQMhz8JIUbm5uCsA+2Q6rmQlIs56dJnj1QvuUR2FdRShLM+IPhM0ZKrOjGRH j95QvmcJtJskv7NDaLaDur85STAsQrDqwuXQCGB4cPCgXy8UwLlMafVYd6MwFBti4LMo DyXw== X-Gm-Message-State: AOAM5308VErPUGOjqfNbFvXLKNCaJn9ozBEY1Q+MOgmHn5fiW/6IhWlM B4h9macbYIQGuSXzfASoRRHMlbd3nbXMw5p3NdE= X-Google-Smtp-Source: ABdhPJzz2Kjov3p/bJpKQ/69vbSCKvDAPJsInChkNOuxvakwdQqYoYmFTvUYVssnJIDVtrwiTWJNUQ== X-Received: by 2002:a05:6a00:190f:b0:50d:8b82:cb90 with SMTP id y15-20020a056a00190f00b0050d8b82cb90mr68829pfi.65.1651248105844; Fri, 29 Apr 2022 09:01:45 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/34] kernel-yocto.bbclass: Fixup do_kernel_configcheck usage of KMETA Date: Fri, 29 Apr 2022 06:00:29 -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 ; Fri, 29 Apr 2022 16:01:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165029 From: Russ Dill The do_kernel_configcheck task requires a meta directory, normally set by ${KMETA}. The meta directory is taken as a relative path from ${S}: outfile = "{}/{}/cfg/mismatch.txt".format( s, kmeta ) However, when checking for the presence of ${KMETA} the current working directory is searched. This will almost always fail and "kgit --meta" is used instead. If the user does have a path in their current working directory that matches the ${KMETA} variable but the path is not present within the kernel source directory, the build will fail if it tries to write config errors/ warnings to that path. If ${KMETA} is not set, the same problem exists with the hard-coded "meta" directory. Fix these issues by checking for ${KMETA} within ${S} rather than the current working directory. Additionally, drop the hardcoded backup directory "meta" as it hasn't been functioning and probably has no users Signed-off-by: Russ Dill Signed-off-by: Luca Ceresoli (cherry picked from commit f4a3e80a4a6f4f709d09940dcaf45b2b00654496) Signed-off-by: Steve Sakoman --- meta/classes/kernel-yocto.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 1d5a8cdf29..4cb638864c 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -521,15 +521,15 @@ python do_config_analysis() { python do_kernel_configcheck() { import re, string, sys, subprocess - # if KMETA isn't set globally by a recipe using this routine, we need to - # set the default to 'meta'. Otherwise, kconf_check is not passed a valid - # meta-series for processing - kmeta = d.getVar("KMETA") or "meta" - if not os.path.exists(kmeta): - kmeta = subprocess.check_output(['kgit', '--meta'], cwd=d.getVar('S')).decode('utf-8').rstrip() - s = d.getVar('S') + # if KMETA isn't set globally by a recipe using this routine, use kgit to + # locate or create the meta directory. Otherwise, kconf_check is not + # passed a valid meta-series for processing + kmeta = d.getVar("KMETA") + if not kmeta or not os.path.exists('{}/{}'.format(s,kmeta)): + kmeta = subprocess.check_output(['kgit', '--meta'], cwd=d.getVar('S')).decode('utf-8').rstrip() + env = os.environ.copy() env['PATH'] = "%s:%s%s" % (d.getVar('PATH'), s, "/scripts/util/") env['LD'] = d.getVar('KERNEL_LD') From patchwork Fri Apr 29 16:00:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7376 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 90E63C433FE for ; Fri, 29 Apr 2022 16:01:59 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.11920.1651248109648001605 for ; Fri, 29 Apr 2022 09:01:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=S21ow7AX; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id b12so7522632plg.4 for ; Fri, 29 Apr 2022 09:01:49 -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=xHCiOoQejwG5yKXAihXsz06AuHuAqLLjL4xQV4ve8ZA=; b=S21ow7AXUUAjCfQgqPa9xGnPC/BBBZMVPsoUeiWBw64ARazTlWrPHyDVpyh/ofAJ8Y xXQczL0gqKAiX9vzogjFc+Y6QYxz4y+bOYXxqhGHlYffYQEfj6pmUqHUlcSiQe++rEl+ r3gjae+ViV2LA7/YRmfr2i2EU79Fv1YhpGjAqQ8CgTr31q6Y83BE7YtNoAVADDbigVDr ZEjXjVFERIZVdh38s1yotCzfP0gp697QOiVDCoK+8+L1cNTF1R5XSSCeJ73fUghGXZry GpV/OwoPSH+jw52lfBuG/3LxjWXRqz6Igr7+caUXSJKAWzBpjGX6DYLpgBmjPTxvOzJj P0WQ== 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=xHCiOoQejwG5yKXAihXsz06AuHuAqLLjL4xQV4ve8ZA=; b=tJ4+DHdurd9aaO+8JUeRUEtiIWU1XsMTqvmIBkAIy5oCdHRHFJvpzPtfFnaouAulk6 xZnLw9PaeOOrLoP5e8hRKg0dHHz1VcCq6h+4+mm4PR+zX1n+4kp5GrJCGNIIWfodENpH JuJEkDZ6hOR/iVSves7qtZqeDoe5L7+yrLLNzCTwM08YhWSsfi0tuYhz1Zx0YyAo+84d YPwpEp2gllqJ/jrCE7mV5Hkg8fnc4rGL6Ggv6RpuV83+eX7z8hoiek+SJhWGqQqbBqgO iQDkZvU7lq3rZmWklD8Kua/rl1cjQKuu33KivICn5Ep0tdA90hcyqgmVZLOMBcDIAexi jXKA== X-Gm-Message-State: AOAM5317j7QNrF0FewQ8BMSg1AyWtgrrLD4IS4GDGi0IUw058d49Bpxz Gd3aLaU9PqG2u90qvLhe2eqC/qdZho+YwTSUpmo= X-Google-Smtp-Source: ABdhPJzsX1ZFW+hlif0+YUJBpvreqB7obghDBZY1YUcZ2msG5JA4AlL91CaJG6OFwSyEio3oqxLaXg== X-Received: by 2002:a17:90b:4c0a:b0:1d5:2e1d:ec6 with SMTP id na10-20020a17090b4c0a00b001d52e1d0ec6mr4773997pjb.64.1651248108441; Fri, 29 Apr 2022 09:01:48 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/34] linux-firmware: correct license for ar3k firmware Date: Fri, 29 Apr 2022 06:00:30 -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 ; Fri, 29 Apr 2022 16:01:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165030 From: Dmitry Baryshkov According to the WHENCE file, some a3k firmware files are licensed under the special ar3k license, while others are licensed under the more generic Atheros license. Document this by adding extending the LICENSE:${PN}-ar3k and depending on both of them. Signed-off-by: Dmitry Baryshkov Signed-off-by: Luca Ceresoli (cherry picked from commit 8e651814af706285d64b532095fcd6f5f02629ba) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb index c7d9e1126e..4a443d14d1 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb @@ -352,7 +352,7 @@ FILES:${PN}-carl9170 = " \ RDEPENDS:${PN}-carl9170 += "${PN}-gplv2-license" # For QualCommAthos -LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k" +LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k & Firmware-atheros_firmware" LICENSE:${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" LICENSE:${PN}-ath10k = "Firmware-qualcommAthos_ath10k" LICENSE:${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" @@ -376,7 +376,7 @@ FILES:${PN}-qca = " \ ${nonarch_base_libdir}/firmware/qca \ " -RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license" +RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" RDEPENDS:${PN}-qca += "${PN}-ath10k-license" From patchwork Fri Apr 29 16:00:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7373 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 90F1FC4332F for ; Fri, 29 Apr 2022 16:01:59 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web09.11935.1651248111896515725 for ; Fri, 29 Apr 2022 09:01:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=shL65o/Z; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id iq2-20020a17090afb4200b001d93cf33ae9so10892186pjb.5 for ; Fri, 29 Apr 2022 09:01: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=/KrXy9vYfRwzdRcQgglSE6K0Qfu/I13jHNVE6FqMP1k=; b=shL65o/ZfP1fop/fm0EfGw+bHDodcgRsIKEMceYNWH/SPzReQiEyMpWRmBgx8BfgPZ Dtv27wbjoUYU/cVamYT8xKVPJ/1/MBxuxxHqZjqkcNOPjwcq0sQ/bG3Dv+2N3iEA5VCj 5I7F/8p9a16XTp82C6tyEppGWcAkcAPGAvhLWTu/rFd3U1Y1RIlnwoSOLcgP2Qqer1vW D5/ov4A4U0CZWmQAcT8qgJ0Z/soY1seI4aHlbo9JSvEmIabozFyxWfo+ODTBbRAdYhTt 0sFXBNDg/6vxWpGIg3YiPWO+7vgQ8UoXOzQ/XVOoUJLTXkZy5tyc0jQjO7SQWK2D3JVx qjVw== 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=/KrXy9vYfRwzdRcQgglSE6K0Qfu/I13jHNVE6FqMP1k=; b=P9bjgtf0x77+f826LV5YA3mU2ZD92nTJskX3DoRWem26HJ66EYigOGd5Je/yWO6AUD /Pirv5y4NGs/v3dLoEmZ7J/ty7Bgz4xbLMLRC01b3O1Hg2kgaHF0KZkQm8d0fHEwU5+l lJLAoXJVLelvy1eRBSFEZ+VLxvAMU1ifMWZ2Sg7obA+CPWh6Xq44inRGJeDuLmEyHeaC SDQfttOH4t6Tb7FEiioCDGHvgCh1Rsz9GLMCW3FhNOzskf/3HW9HvfjbkZeFD9ylRISy OG3DNwuglzdt+TP6+KqG9Ij6/PpcGv1eHyfL/XfnJWcsjQAgBfG1f7/6qq3VovedNQ2S +D6w== X-Gm-Message-State: AOAM532aOlx3DHPNee6yAPDoGbMxgyXPSdwD34Z8z8myngUJ0iKbLf3b xXy7VGd1vSNP2kDIQ+VAxDdiPkPq75/+9EIrNwg= X-Google-Smtp-Source: ABdhPJwLRRnbg7YQk9LTmgLFBN8bC/mu4n4bMO673+3KOwgIzovZ00DHjxvA4FoK6wfuTgiL3stKtQ== X-Received: by 2002:a17:902:9f96:b0:15d:1ee7:4231 with SMTP id g22-20020a1709029f9600b0015d1ee74231mr23693257plq.131.1651248110618; Fri, 29 Apr 2022 09:01: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/34] arch-armv8-2a.inc: fix a typo in TUNEVALID variable Date: Fri, 29 Apr 2022 06:00:31 -1000 Message-Id: <92e52e0bb7497a701a0a26305a1a1bed0f4a60ce.1651246310.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 ; Fri, 29 Apr 2022 16:01:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165031 From: Dmitry Baryshkov Fix a typo in the TUNEVALID[armv8-2a]: It enables instructions for ARMv8.2-a, not just ARMv8-a. Signed-off-by: Dmitry Baryshkov Signed-off-by: Luca Ceresoli (cherry picked from commit 0a4404c117ef8733713962767c1d2c9f87c2c990) Signed-off-by: Steve Sakoman --- meta/conf/machine/include/arm/arch-armv8-2a.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/include/arm/arch-armv8-2a.inc b/meta/conf/machine/include/arm/arch-armv8-2a.inc index 30f2870811..95368b0af7 100644 --- a/meta/conf/machine/include/arm/arch-armv8-2a.inc +++ b/meta/conf/machine/include/arm/arch-armv8-2a.inc @@ -1,6 +1,6 @@ DEFAULTTUNE ?= "armv8-2a" -TUNEVALID[armv8-2a] = "Enable instructions for ARMv8-a" +TUNEVALID[armv8-2a] = "Enable instructions for ARMv8.2-a" TUNE_CCARGS_MARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'armv8-2a', ' -march=armv8.2-a', '', d)}" # TUNE crypto will be handled by arch-armv8a.inc below MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8-2a', 'armv8-2a:', '', d)}" From patchwork Fri Apr 29 16:00:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7375 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 8C86CC433F5 for ; Fri, 29 Apr 2022 16:01:59 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web12.12057.1651248114054172636 for ; Fri, 29 Apr 2022 09:01:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=SQ7aAtaU; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id b12so7522830plg.4 for ; Fri, 29 Apr 2022 09:01:54 -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=rWmP+WQw464rSDQdyO0k/+gnHGGSmWWefxb23+aSadA=; b=SQ7aAtaU5JG/8ewfrR1yM8Lv+rCFZ8znL6p4bwA34tQPpivPHiXvyhl0+NUNp/G2YV c6q71kKzFUww7Rk90ChYbG2hC60tzR9S9dLijKsgO5AGNTSSNu5mC+6wTI52/cEiQ0ch O3I9GyzojucnL3wY2xhq7dGI0U7eDRHQd1eZdbjk9sWB2qc9oaHvlL2pvRareGj+aAzR j407/4I4J2frzpgGPq7y7mCj0dkkMFFXfaeq6SZWtbwMEJjG4aSZFwCe30vY5qdbUYxR PNKpsf67RpTcIuhKBP0qa3MMWGFRcB2ca0xln0bNlv3aDTcMHnvwUuHUbALQmosthISu vufA== 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=rWmP+WQw464rSDQdyO0k/+gnHGGSmWWefxb23+aSadA=; b=MnHooZYIRO7qhwkDAvYTUu0cPI4XegakTbfSEhEr6Aq90JFBKR+AW+1g3QOb5NszfQ aogNhnU/6B2p8rniaiapxaw0UD8WHuzMcb1ceVzGP0+09hrsJD9si98ZQjImAKfU3uoM eFZ5oSmgyRdC5FGHrJRF36MbH+mZgdCFnubaUbk2+opzRuRcgVSr4CYKcw6ktFRCqdWq xfLjcAnWz5kEjq07v17DjdyNfmEUUyFTNOyaL9XbA1Vwx/7i1VODsRX3XLGeZE0VqJyF wzt4hxxqPt9qkFAar6xgKJdyQABv4tl5VRHHw9bZ+ZiAtmgs08JtlaBeNpaKVuPqklyC Cxgg== X-Gm-Message-State: AOAM531HLIHCI6Nte11RpOfSCX5Vwe9JTN35MUhXz78ehkFwCb6XFSZi RgGQa4V/QPX5Tca7+jnImbhnVUVKln/mHEXogGg= X-Google-Smtp-Source: ABdhPJwfDtw10604VXyuyJsMniL8uFzKb7AvUnugCuqamKhV1C8VFXr1FLh/Kajz7MzUi8NUb7HYLQ== X-Received: by 2002:a17:902:edc7:b0:15b:4196:1957 with SMTP id q7-20020a170902edc700b0015b41961957mr60445plk.161.1651248112821; Fri, 29 Apr 2022 09:01: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/34] musl: Fix build when usrmerge distro feature is enabled Date: Fri, 29 Apr 2022 06:00:32 -1000 Message-Id: <8a9f1d5a11b01de3145b16c19d98c3f030473326.1651246310.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 ; Fri, 29 Apr 2022 16:01:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165032 From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 02fd8e760cac1d2e0e25a4e3dbea3f2844b9fd01) Signed-off-by: Steve Sakoman --- meta/recipes-core/musl/musl_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 044ed9c064..4b85401360 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -49,7 +49,7 @@ CONFIGUREOPTS = " \ --bindir=${bindir} \ --libdir=${libdir} \ --includedir=${includedir} \ - --syslibdir=/lib \ + --syslibdir=${nonarch_base_libdir} \ " do_configure() { @@ -62,14 +62,14 @@ do_compile() { do_install() { oe_runmake install DESTDIR='${D}' - install -d ${D}${bindir} ${D}/lib ${D}${sysconfdir} + install -d ${D}${bindir} ${D}${sysconfdir} echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd } -FILES:${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" +FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" FILES:${PN}-staticdev = "${libdir}/libc.a" FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ ${libdir}/libpthread.a ${libdir}/libresolv.a \ From patchwork Fri Apr 29 16:00: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: 7372 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 97E5DC43217 for ; Fri, 29 Apr 2022 16:01:59 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web08.11878.1651248116273944240 for ; Fri, 29 Apr 2022 09:01:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=owaALsfq; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id e24so7503034pjt.2 for ; Fri, 29 Apr 2022 09:01: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=zlSAYchHOwNmfpM4swGhbtR3rrEmx8GnlGqH8kRNkSs=; b=owaALsfqG1q5IwTjWtXVqER7E2kkcyt3XzimyUlGpbUPYwz1Wsu5bL3jc6FNraQlmK d7HA+3xBBWBeDVJidkAo/rC0DlgcnfO3MPWvU9O4RSrKm4o/edSaxHo2pebmPtVoZzdO v03glv+KezhQaLJVEOAKFDTj2EHT+w9cuYhxxZmjzSUa6vt4L776N6fsz2wzIE8WkOQ1 fFtpZwL/RjhnjBr7H1p74ct3xgVkVHRg+4GwzJAN381nH3nCuo1daq7QiSBT3bEE8odt q1u/mFdgMKCFzBphILKVrHjQBUl8E2PUELQDDk70WOMcJPmgx4NfG6/u5FniDSFqhW6c EFCQ== 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=zlSAYchHOwNmfpM4swGhbtR3rrEmx8GnlGqH8kRNkSs=; b=JeJtylpTuX/AI47ZQB4qEJMNgUisn8y09V/4iBZhvG8umtvAjgKQ2R+O38K+O+fR46 w2gFBrnqcV/Bs3AlV2P8mnF4AYjIZP1hVxNoyQK6Y6l9NPH2EPPMkYGKkQh+uxypQ266 npHhNFU7cu18wEjgkpbcNhUEkBjWEugLB1AkgGLU5oYQXfWoOamlSK90jrlq1qLZrZJt TVIDkQ0u1ytpWb89u9hUdoaWUPCBy3md+Fj8IcpihUJET4/mkxGNkjA+PVDrzvPzfP0r cbfrlT9APGE9r4AkX9sKUodptrhsrsYXhyf3Ya5h9P0R7AG/gNwmZNwsVY866soYWvam jAGw== X-Gm-Message-State: AOAM531hoYOUPuUtKtqqBRSBgZ5K0Pbz94ApOdUkqUUoQuZRI831NJbL U8bZjIvsirksZ/M/KyyHuJVL2stsooucUBKj6mA= X-Google-Smtp-Source: ABdhPJwFWBevASPABy3XrAcdk4lZ05rLFidg/MC0zJ9LGaXsRHRLprphYLhr2Z4Ytb/Ki2L0BZSQHg== X-Received: by 2002:a17:902:f54e:b0:15e:6c3f:5b5 with SMTP id h14-20020a170902f54e00b0015e6c3f05b5mr73027plf.99.1651248115129; Fri, 29 Apr 2022 09:01:55 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/34] gcompat: Fix build when usrmerge distro feature is enabled Date: Fri, 29 Apr 2022 06:00:33 -1000 Message-Id: <34a710cc8ebb18bb8443d635e06fefb7f6a003c2.1651246310.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 ; Fri, 29 Apr 2022 16:01:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165033 From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit b1154d5fe7e75bb46132165b13ed76ce95413b25) Signed-off-by: Steve Sakoman --- meta/recipes-core/musl/gcompat_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb index 962bcd8c75..b051e43b6c 100644 --- a/meta/recipes-core/musl/gcompat_git.bb +++ b/meta/recipes-core/musl/gcompat_git.bb @@ -37,14 +37,14 @@ do_compile () { } do_install () { - oe_runmake install 'DESTDIR=${D}' + oe_runmake install 'DESTDIR=${D}${root_prefix}' if [ "${SITEINFO_BITS}" = "64" ]; then - install -d ${D}/lib64 - ln -rs ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}` + install -d ${D}${nonarch_base_libdir}${SITEINFO_BITS} + ln -rs ${D}${GLIBC_LDSO} ${D}${nonarch_base_libdir}${SITEINFO_BITS}/`basename ${GLIBC_LDSO}` fi } -FILES:${PN} += "/lib64" +FILES:${PN} += "${nonarch_base_libdir}${SITEINFO_BITS}" INSANE_SKIP:${PN} = "libdir" From patchwork Fri Apr 29 16:00: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: 7374 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 9B104C43219 for ; Fri, 29 Apr 2022 16:01:59 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web08.11879.1651248118716885593 for ; Fri, 29 Apr 2022 09:01:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=eW00xzOA; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id p12so7326078pfn.0 for ; Fri, 29 Apr 2022 09:01: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=ZIxLbtbmuf03v0EfSRsnQBtxuKVxskyRfSU/pSicxjY=; b=eW00xzOAWO5JoGATTOWUAy4xgTpzMtXjrcrGQ0T9nw41I4uw71gGKH1sFPi8iCmQ9F 7gffQ+k0TmvivUHIolWzaVUnC50hgZ91Nr5rHn2n8vmo3BW1Erq5ZJTnx12Yq73tjJAc SVX1KjdhCKjOCgBbWirKveOlPY3AauEzDXyYV7rtpywWQ+0zlLDOsIbTEyNPmOC4eRn2 kPQAz2dSv1On0fRPMgLvO1lgWO8SZEKvrHPOExzGOj33i01QRXAkS+vUQjA2zxHVkmoY KmxOtqTD3B1buTtwQKTpelUICoY2/vVHtRQltZWWDECoKhzCQO/68RCJVxMQHy7fQCUN LbOw== 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=ZIxLbtbmuf03v0EfSRsnQBtxuKVxskyRfSU/pSicxjY=; b=HuKrQ8H+l1ZgjUbOCYoxNIoGnKDI1c1b+AqF/QqjN92smswacb9TYWDI6Yq3wec8Jp HlyIlZAHxGiIYf50IfRA1r7JV2c6WECudNWmkEMOaNk+sy/Ul+cw76v+du7bhMJxmrq4 XlfZ3Goz1C9WpKj7vkiYW6blhF/CGqStI+22QJUeGqC0A4CvKpyM5I9khJSTdSA01w9z tW/QvKf34x97Y3JbrUxhX+JP0Gp+oBLNl6MrJMtaQ4N9DEbERZyVNKOoyM/0E8suXXoJ xjw1ZwuMP9bwWlLN7MjOBIO84yJ3um9VKzw73UU4pInnarXP2gYhH524iZP16k184upF 0IJA== X-Gm-Message-State: AOAM532hKH5Ovxz4hkXYkGkwVNf0bxDZGDHlLi47W0MMOdYPaAmkDH4u tXVl5tCPNtAIuISAIT+l47jm8ZTYxKc5g3mpJsI= X-Google-Smtp-Source: ABdhPJxbPPNZg1KZ02zdO5CEyDYFzXi2x2+q3cLhB2D0XsdlD5WRbzFAuCBkMIbBZg5FJgL1a6HrXw== X-Received: by 2002:a63:5163:0:b0:3a9:4e90:6d3d with SMTP id r35-20020a635163000000b003a94e906d3dmr102281pgl.48.1651248117466; Fri, 29 Apr 2022 09:01: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/34] wic: do not use PARTLABEL for msdos partition tables Date: Fri, 29 Apr 2022 06:00:34 -1000 Message-Id: <354ef6b723f50b5f0b46a2bf5797e5b982c6ea73.1651246310.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 ; Fri, 29 Apr 2022 16:01:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165034 From: Henning Schild When using "msdos" partition tables and "--label" but not "--use-uuid" one can generate images which will not find their root, because PARTLABEL does not work for "msdos". Fix that by simply not going the PARTLABEL path in case of "msdos". Fixes: 2fb247c5ecf0 ("wic: support rootdev identified by partition label") Signed-off-by: Henning Schild Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 9ea1a838b946020e026edc032039552b723fcaa4) Signed-off-by: Steve Sakoman --- scripts/lib/wic/plugins/imager/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 35fff7c102..4d0b836ef6 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -259,7 +259,7 @@ class DirectPlugin(ImagerPlugin): if part.mountpoint == "/": if part.uuid: return "PARTUUID=%s" % part.uuid - elif part.label: + elif part.label and self.ptable_format != 'msdos': return "PARTLABEL=%s" % part.label else: suffix = 'p' if part.disk.startswith('mmcblk') else '' From patchwork Fri Apr 29 16:00: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: 7377 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 98E3DC4332F for ; Fri, 29 Apr 2022 16:02:09 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web08.11882.1651248121486996509 for ; Fri, 29 Apr 2022 09:02:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1J9UalMs; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id c23so7559559plo.0 for ; Fri, 29 Apr 2022 09:02: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=NTlHYOw0VFArTK+VLbh36WOwkbeMOFqD36OxMGLiSP0=; b=1J9UalMswsljCI6LfSqBSlGCnzsafJGQbOCYGdZoS6SeaFBps0zPewGqG9cODPN6p1 Tyv4CX/mZhV7GLpz0WH7W5QEiPmxArbTjbg4tVl2Jkw3w4eLneQwcr813Lh7YgfRBd0X vby3SCOPp6z2wsiZaxyopzPXiUNSxco10HpYHHCvq2IgFYiPa/uIxV3PWQxb+n+Pnix2 /oDpdtut8/Ifb5HB9CxNit0UIiqlRxn0yzH9fsxVB4JbvkfHyfRu1UNFltqGjmDQCpI2 Qcp3HTPqGWZMU4CheLZTK5ezhTBw4+dKi0mby+GatT8xXvpoolLV5li50WklnpAqahAC kSFg== 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=NTlHYOw0VFArTK+VLbh36WOwkbeMOFqD36OxMGLiSP0=; b=74+8d2W28gidjyjllrcFwBQTh82IUdAs5/4j7BcFt56gq9PGyoeftS1Oy1xN5wAOcw ZpZKzAQ3lVNVyc5gd3DXu1YMxQhEU1zFSUq2nETDsuCJIsiJk9YDCFZGTYzb3YFd8UU+ PmzxNY5n2Ye/+2MitkEqpVhYZo5ifHFqINczS6pf9jG0BFD6/neHrR3q70AEOrtMSirN PCqNhTxJZ2jaJcy/WB28BPrX0BFYFCpCb9d1tTdG54FEm+7HFEheawQQebX23KMHKyp2 RAHoB7tA+9rct6bUsJipJqJejDaJHgpfdYthlRF9CSrW06OL+6Qcg5pUUAoR9V4SC5wD NVXg== X-Gm-Message-State: AOAM530nGUniAy7iQPqVYFsgFAeJTJZ/oHwPOZU+T7Owo4SzG3hSDBe/ mr0Zkx0FAyLg82E70NuZWZ7JXMMSMUZL8Pk9yDA= X-Google-Smtp-Source: ABdhPJyn3u5L2LogiFc/i6ut/yywoR/plpwz0IfrzOb2CuhIyzNzJW69J121/XVCXZ+91rWmiZH3IA== X-Received: by 2002:a17:902:ce86:b0:15c:3807:e66 with SMTP id f6-20020a170902ce8600b0015c38070e66mr66060plg.125.1651248120275; Fri, 29 Apr 2022 09:02:00 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.01.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/34] libc-glibc: Use libxcrypt to provide virtual/crypt Date: Fri, 29 Apr 2022 06:00:35 -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 ; Fri, 29 Apr 2022 16:02:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165035 From: Khem Raj Fixes NOTE: Multiple providers are available for virtual/crypt (libxcrypt, musl) Consider defining a PREFERRED_PROVIDER entry to match virtual/crypt Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 4417dbf6fcb1f067705c8bd2220f4093ba899cc1) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/tclibc-glibc.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index f4855dce11..f48d16939e 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -13,6 +13,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-glibc" PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale" +PREFERRED_PROVIDER_virtual/crypt ?= "libxcrypt" CXXFLAGS += "-fvisibility-inlines-hidden" From patchwork Fri Apr 29 16:00: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: 7379 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 9DF60C43217 for ; Fri, 29 Apr 2022 16:02:09 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web08.11884.1651248124408488434 for ; Fri, 29 Apr 2022 09:02:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Inr+pKwG; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id b12so7523274plg.4 for ; Fri, 29 Apr 2022 09:02:04 -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=BioE3USUGxMcoG8mNvDs7EYRnMkvdj/nwkijiMGo7gU=; b=Inr+pKwGY8j0N3Eoax72FYjaJVsxh2vLKI4pYaAOnSA5ql+93zOJg+GVNf5CgJ+Fly /AF78mbDegSb0WWW6v7tEuAm/vf+84wRMKhgT68CaE/Qrk3TT5HiVUDTiOdeIbUTli4k 1YhoasmamlMjRg62MmIPvuOGSgkjew0n37MvYZ1dYkmYbhxnrGzB66yb2qYFKSx0X9IN FM907uLee+x6s5tWwB8ar+Q4otBDm4/enDfvhWV7sGj/wVaoVQ6iqx49zlNFcB0Vxe/g Ubgp6IwmPk/9CyDj6+2MMjP8ey0+PnrlJdcRXPdicLqtNJjxa0vGAgKb37cPMKtJkZE3 rrfQ== 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=BioE3USUGxMcoG8mNvDs7EYRnMkvdj/nwkijiMGo7gU=; b=kcmmFm41GnPOfAxoRqJD1UprnXuwEsFUyYNs2NceDAdgnA+Azj1mM0OaxaK2zUP8mR tgYimCOz9QoVWFYWH5koSyx+XEBx/RwQPiIRU0Xn7aMdbMbTd4ZzH19FBVLwBXZcRkj/ s14aAiAQpfnfw/EFYEF6VSL8F1e76cMALcuA2Rh6dMxbgwkzyTW4Rb3cIQwVgi4f2Ie7 rYbodLS0xEGBRdlFBpfnL++XP4fNVrpKsuT6Q7OMJyEoDJ0coRYob1i/yFD44mPBlu3b /+49N1rWoQcX7LgjTTz7w8oo5iVWPpwmy2U3vJQB7CouBXKPisJP6LtU1hSbHAuR+MVC v3pA== X-Gm-Message-State: AOAM531B4WmsbJf+jvf8r+fhgFiLdradd6I9ci6t1k0+5AgmhMrwIWag RZhByCsHwkmjkSdxzGAiTlWae9Vt7+Mt1QnrlP8= X-Google-Smtp-Source: ABdhPJy2HyuG4lracpoNXsLDq/TDmBSK1em4vblPRZSqN6qUahxyYEw+BB18e+mdyTnkph6y7UX+Ow== X-Received: by 2002:a17:902:ce02:b0:151:a86d:dc2b with SMTP id k2-20020a170902ce0200b00151a86ddc2bmr82388plg.57.1651248123224; Fri, 29 Apr 2022 09:02:03 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/34] qemu.bbclass: Extend ppc/ppc64 extra options Date: Fri, 29 Apr 2022 06:00:36 -1000 Message-Id: <05caadbfb940e236dcdc41620cf20de5809e8f40.1651246310.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 ; Fri, 29 Apr 2022 16:02:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165036 From: Khem Raj Some recipes are marked machine specific which need qemu usermode during build eg. if they use meson build system, which means they wont get right -cpu settings to run qemu-ppc/qemu-ppc64 and build fails, this ensures that we set the right options when PACKAGE_ARCH is set to MACHINE_ARCH on ppc/ppc64 qemu Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 9f71bbe65a458f08cd8ede6522c8b988603202a0) Signed-off-by: Steve Sakoman --- meta/classes/qemu.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass index 01a7b86ae1..7493ac34d4 100644 --- a/meta/classes/qemu.bbclass +++ b/meta/classes/qemu.bbclass @@ -64,4 +64,8 @@ QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e500mc" QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e500mc" QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e500mc" QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400" -QEMU_EXTRAOPTIONS:powerpc64le = " -cpu POWER8" +QEMU_EXTRAOPTIONS_powerpc64le = " -cpu POWER9" +# Some packages e.g. fwupd sets PACKAGE_ARCH = MACHINE_ARCH and uses meson which +# needs right options to usermode qemu +QEMU_EXTRAOPTIONS_qemuppc = " -cpu 7400" +QEMU_EXTRAOPTIONS_qemuppc64 = " -cpu POWER9" From patchwork Fri Apr 29 16:00:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7378 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 9E306C4321E for ; Fri, 29 Apr 2022 16:02:09 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web12.12065.1651248126868929833 for ; Fri, 29 Apr 2022 09:02:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MCHebqpO; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id k14so6892915pga.0 for ; Fri, 29 Apr 2022 09:02:06 -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=UY7nHmPrIehh0f1MGNkpCbyaFtjFZlob5BgS7C/dtbs=; b=MCHebqpOSpZRRKtbXovSNUIYIVHNWMjlxteF5OoM8ul7wy7axCW8PRs61lQk2JryPm HTWmTk+EDVlqkH24Uq7FYFNHgerd7gO73Us7ulcmNkL9qw0ql8OqSx9qnNOx97r8LeTd JkRkMSsXPZBv2ynXQE+qxs5Vzj5kCeP/yH5JPL8D4QQAqUDxMlsFjX+ni2ysUHrwX0Gv lTYxwKjqRzvObBhRdJllUV3uZ05clUVxMjR4eZpQ7pI0VYzeAFpfHZpwDqF5CC9whI+n b+xElYhSVUKPPW4EbSASyHq+E/0lgynkBr37SgCKFm2J+93XmqzAr53ZX8wyIVkiJt82 sy5g== 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=UY7nHmPrIehh0f1MGNkpCbyaFtjFZlob5BgS7C/dtbs=; b=c85PZNoSvREeVkiFvlYYHD9mbeyiwqWv0QQ/eTscjmAVBRcMG/QUAfsYETicqIjitx SUQdbY0LBO6kC0XmzLvqYYCaWI/cSY49SSt0Eowm27A2Owp9lkn16FkddtXzrpxEIwzz wJLd1sIlTeJJoDBC//VBlnAZZNm4BsixJGJrJJ4Ss7ixJk0AxifrUJIkacF6ZYkZx0AQ E+6yy0+GX49XDafaXsAJds86hEgxNuwrNP2lO+fb3aExnEvrfUSsdV+jF0+h8ZHb8QYY nTDitB8M3b7wASh/aqlrqo+HhdCZuIfn28DIQSFlusMBgdsKiZXGeO41iSKUprQdpG2I xY7w== X-Gm-Message-State: AOAM531USvhM4ivY/ZC5s7tC1DzGiHPjTmI9IbQFmo9tv5g5EWxJGvdk vcDv6gJ5r8Qe5g9uQuc+46dmq7YyatgoENYW4VU= X-Google-Smtp-Source: ABdhPJzZPpPLC+3ujNU0qBkCAVTFyCZs2fD4g5gNqChxjJ6HLhVcU4NshyKgCTUPGzpCtTLBZtvkAQ== X-Received: by 2002:a63:2b97:0:b0:3aa:ffe8:b2da with SMTP id r145-20020a632b97000000b003aaffe8b2damr95403pgr.194.1651248125669; Fri, 29 Apr 2022 09:02:05 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/34] busybox: Use base_bindir instead of hardcoding /bin path Date: Fri, 29 Apr 2022 06:00:37 -1000 Message-Id: <592464cb64a8eedf2ee1537934ba714059c2e0ce.1651246310.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 ; Fri, 29 Apr 2022 16:02:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165037 From: Khem Raj This symlink is not valid when using usrmerge and ptest packaging would fail Exception: FileExistsError: [Errno 17] File exists: '/usr/bin/busybox.suid' -> '/mnt/b/yoe/master/build/tmp/work/ppc64p9le-yoe-linux-musl/busybox/1.35.0-r0/package/usr/lib/busybox/ptest/bin/login' Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 238fd30689054c7b44176dce7180fb6dac4e1b6f) Signed-off-by: Steve Sakoman --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 69fa499737..5f1c473d5e 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -347,7 +347,7 @@ do_install_ptest () { # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget sort ${B}/.config > ${D}${PTEST_PATH}/.config - ln -s /bin/busybox ${D}${PTEST_PATH}/busybox + ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/busybox } inherit update-alternatives From patchwork Fri Apr 29 16:00:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7381 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 9C665C433FE for ; Fri, 29 Apr 2022 16:02:19 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web08.11886.1651248129935820777 for ; Fri, 29 Apr 2022 09:02:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CyIfQbOl; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 15so6857670pgf.4 for ; Fri, 29 Apr 2022 09:02:09 -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=gANJRnufMD2gWYq2LFH2Plb67gpHF4TGvFd4vFsOEws=; b=CyIfQbOlPmmnU4Z2CGfDXnQAs6dNMHxJFlRPVYU8+w5FcnvFGHwycIa0PbCCxZBIA9 wsGTVE0hnajjSRnM4BEfGAU2DjbluydiHy4DmSYUkiqs3dOErS3y9zi/Z6MVFTTWGefu XPOJAtBLbD9vR7KeYZhtPugBmlwrIoduIHPftr/iCbR5NX53i1nsDrK7qg2+VM7yg4MA wXf7zCldzrUPEeagmMoLobOISGJHtmmS7cdr9LQDhTlWoon06nLOkxDt+h901OlVRTQc eiQUh26xzgL1dm/1faLUicRqlB7zsL2IyNzdE115HBPmBz3ubuF04Mra3U3nv6E+UIow awLA== 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=gANJRnufMD2gWYq2LFH2Plb67gpHF4TGvFd4vFsOEws=; b=ersgU3REhBRNgfUC1V79Ia07YF3BaGlGYALO1aHvDUg+dSGQef9PgzlWiM39nck/IS c0IjmcBennya77r2cIB/kvfyPxWAUuvTj487ip6DwOqUi+G0jRa9FHo8K+vgbCNL4zgo Vhy1nOFPsSEJNWTqZv+WZQxFuhVIKP50S06yDVWPcHaDTX1A2TXrUoupDBhdSvPnkK9v QCgyO+wTxxhSHaZvLX24zQli6y6SyQkkbso4EXe5Vs/OVS3fagLrf2KgiUv5cpyJ5A0d DQkfqQzy45OTFNTH70NCfi9pmodynIuYmQDCt9cy37sI8clf59R9jiS5uDzOBtb0mPFg 9oEw== X-Gm-Message-State: AOAM530QJyHUGgJBVd4c9LrBMEuCghIseDMAoG0PylBCbds+s0cF11WB qP7mP8PrDBWjhgtwocLhF0EVh2jveEyRZuQzpVQ= X-Google-Smtp-Source: ABdhPJxG64ydNpN3vdzx2nu905KDzSCMDEFw34B/AVpUZlwCVw3KOgnQFm+q80ib5i1yYE6yBSenXg== X-Received: by 2002:a65:4789:0:b0:3a2:4866:dc48 with SMTP id e9-20020a654789000000b003a24866dc48mr64420pgs.87.1651248128563; Fri, 29 Apr 2022 09:02: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/34] gstreamer1.0-plugins-good: Fix libsoup dependency Date: Fri, 29 Apr 2022 06:00:38 -1000 Message-Id: <5820e01f5b1f9ac5f1a803820258e92e7214ad31.1651246310.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 ; Fri, 29 Apr 2022 16:02:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165038 From: Carlos Rafael Giani Signed-off-by: Carlos Rafael Giani Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 7f66a3123c9ce77e9af538009fc51bf190703433) Signed-off-by: Steve Sakoman --- .../gstreamer/gstreamer1.0-plugins-good_1.20.1.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.1.bb index 08ff5a0bb5..1f61d9a10e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.1.bb @@ -49,7 +49,12 @@ PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l- PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}" -PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4" +# Starting with version 1.20, the GStreamer soup plugin loads libsoup with dlopen() +# instead of linking to it. And instead of using the default libsoup C headers, it +# uses its own stub header. Consequently, objdump will not show the libsoup .so as +# a dependency, and libsoup won't be added to an image. Fix this by setting libsoup +# as RDEPEND instead of DEPEND. +PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,,libsoup-2.4" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" From patchwork Fri Apr 29 16:00: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: 7380 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 9C636C433EF for ; Fri, 29 Apr 2022 16:02:19 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web12.12067.1651248132644033054 for ; Fri, 29 Apr 2022 09:02:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=u3EEDibW; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id bg9so6846140pgb.9 for ; Fri, 29 Apr 2022 09:02: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=HzDiREC4IEDuW1fGcjcJZTq1hOxA/pVvoK7f4Qq/J7w=; b=u3EEDibWnNqZDHgbOzhQWyUiVDmNRlpsLTBZsIYR2ZYKEZ6pKU1G+Y7Rg9xk/DdBAL nENl658KWP5Rtzxrw9dEnaGI4+A1eerJT2Fh8PuCgIpb0EB9kVc/N81sZDdXFKFIwzLw 3cZJ0M88yhKNS7hAzqiopacSbeQd9vHrrYQsICTgcrAR3tgO374YomssNSvA3vln1ee/ 19m8Wity9e3Pjyv4BhgGvuaaTtPV30FyvS5RSulG94Kc7oryfpVw0HadAzvMZOObYaVm lP7PL+smBzgkcpKw30IAMv9YhRUm1F7FdSqLrPmwVh3P7wPwQKq5qcai/DcIpPVtGOuc aKgw== 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=HzDiREC4IEDuW1fGcjcJZTq1hOxA/pVvoK7f4Qq/J7w=; b=wLlTR08tYoC3ofjfdXGoh6GThgTKbLSxB4SN2F14t2yKqgnv0lqf1gEQ/allR8bQXX RGyE/8ek2HhTM8J0fKqQiuSOFwb3LWdNuGpQ7TVyXn+TM65FQViNv0mvTpPMnPXQzyLi kNSIXz2Fmt5120snOpnUF8Pr204lCMGHfs6quuhfydPdjBXqOxe0JhRMjS68tUBhAe7j enqO7XEoabCvMevaA/5Pit3KtdqzsyMgCbk7CW7OtiI19oyH5fsq+asdRgEPcDt9apXd H3oEOgSPUOafn5xuqPlswbfWKcrvD+bx/wpSIfLx92eiV5ZJS8DbUGWxNlKph1dmPV6/ NQCg== X-Gm-Message-State: AOAM53244PrDMQnc2XJnpIvbInXq4O6//2K3zV1xBYKAPsZw8jHf8BE/ WNNmNkLoHp59J5LjxOSzXPNq/hQR676cny7UZlQ= X-Google-Smtp-Source: ABdhPJyauNDXhIBuyAjmDJFnRkPpZzYHyNiad+HR/ue3TOYELiTTefcDGDaT44c1hy6tdbF4aF3yOA== X-Received: by 2002:a63:8148:0:b0:3ab:6859:ae61 with SMTP id t69-20020a638148000000b003ab6859ae61mr71506pgd.556.1651248131417; Fri, 29 Apr 2022 09:02:11 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/34] gstreamer1.0: Minor documentation addition Date: Fri, 29 Apr 2022 06:00:39 -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 ; Fri, 29 Apr 2022 16:02:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165039 From: Carlos Rafael Giani This clears up some confusing packageconfigs. Signed-off-by: Carlos Rafael Giani Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit b5b682f80fba4a62cb1ff7050c97f5b1e204d5a9) Signed-off-by: Steve Sakoman --- .../gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb | 2 ++ .../gstreamer/gstreamer1.0-plugins-base_1.20.1.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb index 78e8f35025..f139281149 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb @@ -83,6 +83,8 @@ PACKAGECONFIG[srtp] = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp" PACKAGECONFIG[tinyalsa] = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa" PACKAGECONFIG[ttml] = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo" PACKAGECONFIG[uvch264] = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev" +# this enables support for stateless V4L2 mem2mem codecs, which is a newer form of +# V4L2 codec; the V4L2 code in -base supports the older stateful V4L2 mem2mem codecs PACKAGECONFIG[v4l2codecs] = "-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev" PACKAGECONFIG[va] = "-Dva=enabled,-Dva=disabled,libva" PACKAGECONFIG[voaacenc] = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.1.bb index 9b9be0d326..0953261a98 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.1.bb @@ -46,6 +46,8 @@ PACKAGECONFIG[ogg] = "-Dogg=enabled,-Dogg=disabled,libogg" PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus" PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango" PACKAGECONFIG[png] = "-Dgl-png=enabled,-Dgl-png=disabled,libpng" +# This enables Qt5 QML examples in -base. The Qt5 GStreamer +# qmlglsink and qmlglsrc plugins still exist in -good. PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native" PACKAGECONFIG[theora] = "-Dtheora=enabled,-Dtheora=disabled,libtheora" PACKAGECONFIG[tremor] = "-Dtremor=enabled,-Dtremor=disabled,tremor" From patchwork Fri Apr 29 16:00: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: 7383 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 A1517C4332F for ; Fri, 29 Apr 2022 16:02:19 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web12.12069.1651248135043212142 for ; Fri, 29 Apr 2022 09:02:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PYz9Klp1; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 15so6857857pgf.4 for ; Fri, 29 Apr 2022 09:02:15 -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=qXg8GmoCwRcXoa7fd8Oz9Z6NDMZaz3XUMfyXudTclVE=; b=PYz9Klp1xD1MpvR2fYbSfRi7PCxcKeAJuVZF/1dafQM+hJ0NQPE+d+vCSaqBXXrs9g bWzBee8mkWX8G8bU5jaARVJta7Nq5L5oo3fG4dy3CJhS6lcjy4ntFQleKNS9wC3shRib g1y3o4o4X0hS11ZbC7qt+xZJXh5nGc8ZXNCKHfWHzgS3/rVoy6nvYj2mqcEB0AIg1ki+ KIz/gwSBKK1nAFpQOdDlOfC9a4l6Uia51CO+AP7tDPETZbXyDUxkWHDmIsvkKVLcbOd2 0wxyE5dE21yuppuREJfq/sLHgGH5w+mIS8l+xKywx4FXQKZGsv2TtERIYYeHzLpwEsIZ X8nw== 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=qXg8GmoCwRcXoa7fd8Oz9Z6NDMZaz3XUMfyXudTclVE=; b=MpLcWEPsqxMyHBUQTTH8JWlPtYg8l6NcFGgbaBAKEX1A+DzDj0Uz1Ni9MBU4hByjH3 zwz8FjkGVuyaWm46w3D6Vb9hPYqOaoBA8yVZ7YUQeRuNx+NxbnnFwlr/PWMXHSur8DcM xSkGdoRigRZmuF8BqTPlp5WmlhO+2SRgkIrwpuasHcVHvAd2yZrUv/pO/jQ6OTTh6GdO 6MAvdcZ9vxPZYiTU9aq+yOsN2AG2rcTCQO806c0QstGx/ePBPcLL98C15PtMSXmGGjIW T9q55K20HTvOb5/jGCksSN+zTFX0jVeA12xmQJ+HFX8yquxceqJoDlDLPwQy5Be4npSn KqfA== X-Gm-Message-State: AOAM533EaE9ZLsr2pwi4FlIcsgpiXv4p6P/So1l/QcZHeylb15EkY5AM Zqo0XWGC6ohjDvQRdlqdOAll+W/TEXaSGjM5eso= X-Google-Smtp-Source: ABdhPJwmaL8IQ7JClrT/7yStoEHg6rAfUkv0l9e9H+vwIv9AWOaEmjunTkSBruwEHxWc3jfptoyzTQ== X-Received: by 2002:a63:c54:0:b0:3c1:9510:8b9a with SMTP id 20-20020a630c54000000b003c195108b9amr43867pgm.513.1651248133735; Fri, 29 Apr 2022 09:02: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/34] gstreamer1.0-plugins-bad: drop patch Date: Fri, 29 Apr 2022 06:00:40 -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 ; Fri, 29 Apr 2022 16:02:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165040 From: Naveen Saini With latest gstreamer version pkg-config able to find header path with msdk enabled. Drop this patch as its not require anymore. Signed-off-by: Naveen Saini Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit eaa3b31247b4d3cc47428f4d80ae31f232e344d4) Signed-off-by: Steve Sakoman --- .../0005-msdk-fix-includedir-path.patch | 40 ------------------- .../gstreamer1.0-plugins-bad_1.20.1.bb | 1 - 2 files changed, 41 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch deleted file mode 100644 index 273b45bd49..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e31f68c46ff0c29fa3c22755f18d5dde87b23bf2 Mon Sep 17 00:00:00 2001 -From: Naveen Saini -Date: Wed, 30 Dec 2020 16:37:47 +0800 -Subject: [PATCH] msdk: fix includedir path - -In cross compilation, need to prepend PKG_CONFIG_SYSROOT_DIR to the dir path. - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Naveen Saini -Signed-off-by: Jose Quaresma - ---- - sys/msdk/meson.build | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build -index 24aabc7..6003bb7 100644 ---- a/sys/msdk/meson.build -+++ b/sys/msdk/meson.build -@@ -46,7 +46,9 @@ if mfx_api != 'oneVPL' - mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) - - if mfx_dep.found() -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() - mfx_incdir = mfx_dep.get_variable('includedir') -+ mfx_incdir = pkgconf_sysroot + mfx_incdir - mfx_inc = [] - use_msdk = true - else -@@ -75,7 +77,9 @@ if not use_msdk and mfx_api != 'MSDK' - mfx_dep = dependency('vpl', version: '>= 2.2', required: false) - - if mfx_dep.found() -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() - mfx_incdir = mfx_dep.get_variable('includedir') -+ mfx_incdir = pkgconf_sysroot + mfx_incdir - mfx_inc = [] - use_onevpl = true - endif diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb index f139281149..7c4665ae80 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb @@ -10,7 +10,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0002-avoid-including-sys-poll.h-directly.patch \ file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ - file://0005-msdk-fix-includedir-path.patch \ " SRC_URI[sha256sum] = "09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848" From patchwork Fri Apr 29 16:00: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: 7382 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 AB389C433F5 for ; Fri, 29 Apr 2022 16:02:19 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web08.11889.1651248137989494994 for ; Fri, 29 Apr 2022 09:02:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=laNyuxDh; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id q12so6831436pgj.13 for ; Fri, 29 Apr 2022 09:02: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=lDr4wrKCLaSuFcf/yjvUJsvf8fMdBbBDGAqfU08FWO0=; b=laNyuxDhlVMV+PovTXvelwGctazpRCF3SSHVEpe6r4NsRPpuTv7qw7zAiPak6YgFQa mCFdr9G68MlwK0ImyQ/+uYV9TcrLcj9WXWX/9Yob1jZ0EEOsqNZEjTt7HERBNgXqEvd2 +05ZACDaznX6fbF/F6cSEpbc7bls+0mbJYtDvKxFmQ8Yn5vqU945/W4p9HYLJ1Di6pBG j3iLGaVn/NG1MxNQDlR7qRpfHzbH1BdLVHacVax7HG1e9q3Jt9xejqW80TIKY6U8YBaZ EN5Z8Ct6jcr+CJo1rfsmh/n6RMqHQrOhCQDNqWE9Tu10afmOKpVVAW39jjQsB8Iib7JS kmwA== 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=lDr4wrKCLaSuFcf/yjvUJsvf8fMdBbBDGAqfU08FWO0=; b=DWdpJmry54k8nmF1hTh7iv4BQd3GypHBW3irFwQDv9mjvfJ1e/NC5EN9mOAUlySC9d x4HYkFJJQ4Luy79kALLlYnYuKvTVXhVuotaaTMHBNcNupbQyvk5xSDcgmwJQtXjwG0vQ VdmQHcq7JgtlLE2GTHLBvoZ64pADEe5aSULprmr7Mn7loemrDBBXPqxMOXjlJORMxNke ClrMr25QgtwQVscJt24sxcXJh8UOG5UpUPUZFyKGLIOfHriRYAAhfc+IZS4NIOJBVH03 gUiXn/x0BGGTWZuWuh794z96km1qc/FL9d86S/XsHCoIx+7oF6e21jjiSDwkiD4eJdeP MyQQ== X-Gm-Message-State: AOAM532FCHJ5BgwtjXz2ANnd6m/P1RDgRtumBA85ofoo3Q4xTahctZri LbQBbD+0lbvMLJNTsYS1II4rhd+CcNkRV3tTpqk= X-Google-Smtp-Source: ABdhPJxySOzneeEmZPV/YuClEyuMUD5LDsVhEhIj3E8sisXwpw5jTxMryMiOEs7Gt3abN5/LDS7IBg== X-Received: by 2002:a63:8548:0:b0:3aa:fc6b:a36c with SMTP id u69-20020a638548000000b003aafc6ba36cmr56432pgd.267.1651248136623; Fri, 29 Apr 2022 09:02: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/34] terminal.py: Restore error output from Terminal Date: Fri, 29 Apr 2022 06:00:41 -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 ; Fri, 29 Apr 2022 16:02:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165041 From: Peter Kjellerstedt In bitbake commit 1ecc1d94 (process: Do not mix stderr with stdout), bb.process.Popen() was changed to no longer combine stdout and stderr by default. However, the Terminal class was not updated to reflect this and subsequently only output stdout in case of failures. Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 116d0bb07ba044cf8847bf3d5c3996ad7e58b7ae) Signed-off-by: Steve Sakoman --- meta/lib/oe/terminal.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 53186c4a3e..de8dcebf94 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -30,9 +30,10 @@ class Registry(oe.classutils.ClassRegistry): class Terminal(Popen, metaclass=Registry): def __init__(self, sh_cmd, title=None, env=None, d=None): + from subprocess import STDOUT fmt_sh_cmd = self.format_command(sh_cmd, title) try: - Popen.__init__(self, fmt_sh_cmd, env=env) + Popen.__init__(self, fmt_sh_cmd, env=env, stderr=STDOUT) except OSError as exc: import errno if exc.errno == errno.ENOENT: From patchwork Fri Apr 29 16:00: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: 7385 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 9DCF5C4332F for ; Fri, 29 Apr 2022 16:02:29 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web08.11892.1651248139968059936 for ; Fri, 29 Apr 2022 09:02:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1zIwTW86; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id s137so6851495pgs.5 for ; Fri, 29 Apr 2022 09:02:19 -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=Suw84zhzMiIqINqFrjO7T7s+UuIMhp2hnZGmM856tIU=; b=1zIwTW86+oHTVxi88bPpIFf2TQB8eMhS0mJ2+eH1UAmy/cGOI9+JxeSyUr49DiYIrB mZ5dsc+fv0fARI0vdNsFbMIloBVDWJviujWDURQbT/GDZN0lFDSaPU+UyIuz1Ul31yqG iE8nVGYQnlOBmMblRoprFf5z9fWmnPY6k3FWt8y0aQirJ27V7ahV94r2R7od8PRE2XEj tpEw2YNYzaTOCny3Trc01KMbBfBMq0X9y5DyqqroOP1wPCrBYgyabPNe3X38TgQOabzY 3BmU1JwJmMhdZX1hwDo15Y171NYJXzqBaIDUvWx6thhvmf3Q+7yRyeuiO70Xu+5w1xN1 6IEw== 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=Suw84zhzMiIqINqFrjO7T7s+UuIMhp2hnZGmM856tIU=; b=LJXWqRNl4NhBIkk4cNX572J+eq/nlsQvDaNzmG2x/+yvLZePt/N044BhvFaaPV1KBF b+CfqGxl00MgqZcr//QbzEjUm5K+KIGl6nbLL4HBrpeJT92T0H1tS15p/AC68Rl1BlHq WVIHh75e2GJqLw3PBeborjmeY00Vy2XKlTV8+KwY4URsK4ZLs2h1dM3JjvkiNCgCKnQy szY/em7GLOP1zSFXn/6ltE0Ow2DNJhxWkMk+/eMhklkS3EJSLTRZP8dgpvichmMRukHn CRJRKhnkWe16CZjZn/9hSum3RHGGxojDdaMwXfdu44C9t8k4/3zQAG5djOGyvRpbPXty i4rw== X-Gm-Message-State: AOAM530JXo1BSM6Z83H3PZwTo+OOKVqYDnmzgOzaKY5cAbT0GMyXis4w EcwP6kg9wpN0Q/jHIplwnrVcbrok2vm2HNbG+ME= X-Google-Smtp-Source: ABdhPJwXW45dumLXFY4blbbi62dL1YcN6FCLe2rdEUDZVq68qCUHg6ztcQrD/w886qNWCROp3FusMQ== X-Received: by 2002:a05:6a00:140b:b0:4e1:2cbd:30ba with SMTP id l11-20020a056a00140b00b004e12cbd30bamr33065pfu.46.1651248138787; Fri, 29 Apr 2022 09:02:18 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/34] devshell.bbclass: Allow devshell & pydevshell to use the network Date: Fri, 29 Apr 2022 06:00:42 -1000 Message-Id: <147d4cc12cd0ac2680bffa4112cef2d2447d34e1.1651246310.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 ; Fri, 29 Apr 2022 16:02:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165042 From: Peter Kjellerstedt Otherwise it will fail if using OE_TERMINAL = "xterm" with the not so helpful error: xterm: Xt error: Can't open display: localhost:0.0 Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit ba53fc3bcecfe32401471dc1008c7ead96504150) Signed-off-by: Steve Sakoman --- meta/classes/devshell.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index 62dc958d9a..26c01c080a 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -21,6 +21,7 @@ addtask devshell after do_patch do_prepare_recipe_sysroot DEVSHELL_STARTDIR ?= "${S}" do_devshell[dirs] = "${DEVSHELL_STARTDIR}" do_devshell[nostamp] = "1" +do_devshell[network] = "1" # devshell and fakeroot/pseudo need careful handling since only the final # command should run under fakeroot emulation, any X connection should @@ -154,3 +155,4 @@ python do_pydevshell() { addtask pydevshell after do_patch do_pydevshell[nostamp] = "1" +do_pydevshell[network] = "1" From patchwork Fri Apr 29 16:00: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: 7387 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 9DA9DC433EF for ; Fri, 29 Apr 2022 16:02:29 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.12137.1651248142365576803 for ; Fri, 29 Apr 2022 09:02:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QoLNs56k; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id j8so7497304pll.11 for ; Fri, 29 Apr 2022 09:02: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=altBkWQWccBuFJ9UBI+xQTpSpnpdHHrlpJA3NDFWCGU=; b=QoLNs56kFha/qHyBYce1FSZqTxS1EQpUtKJlYhLw3BoneBiJbzNlml//PVvgQQuEvc +OoiWkGGdujPzCB4/ITabiwTGKBeX0jfBvrDSGh4RxbrVt4tXS1BSvCLlPWfk/cEJDo1 bjLkerk42Q+QpoQOxzb4UbegB9HJE7K3ZSp6e8yPI9ktkj3HSsPWAq1XjfWhSKS2aTdL REiqyXjbZvbmaajWv0nr2fJbe4E81a/M7j6CpClmdLR0rHeTrrsGHQn/I9+m+ozG/RTJ 6guo0FcjAJO1zAp+zBHr+gVS2lXF/Idf47mHk0qUkFyYorlPBuo1IfeG+nqFP7asF8iW 28XA== 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=altBkWQWccBuFJ9UBI+xQTpSpnpdHHrlpJA3NDFWCGU=; b=afCOVl/IphQILnQJ7gxIBu2twHkQ2b/WEG0w2WYLDwhrWSu6ox/qu92vcDRBzquB5G CUE4DMDEuu0xRcNGzGyuPQcug6Xx+6LcXrLCC4Qxa1p336Lw7Ylyz2Djjf622+as/obj p8J+n2h3v/DxZUS6jXXUaamh3o8SLKBcdA9nGMErwamUaCbhiIgducfQF4NXE6IJzk6N 6YOyH2IONI4MWxFHtk6ZGOdXjhEEHS+XcXS4KC4PfU2RsdtAHDuwCyJMSsa2LUuk5SRr wTh2Q4z8br8acfcr3VPpmNOcrAh3S1z6HwOjFE+Cco+3D1Igs/m4foI4cQ8OundCmbXB U2Dg== X-Gm-Message-State: AOAM532qwb6YO+3quEEx1iXUI8Q2uwcomk/+AWg3f9ko5YviJ6ly+RVM ijowW+zYlyqlQzwI+h+YAKjH4Spo1BhQ/NwFIyw= X-Google-Smtp-Source: ABdhPJzgxxA2OBLViq/ioEDK+FQLZmLFDpVUxYZ5lhbF8KOrkUw4Htle8y9rqDojICq2PKN7Pbl5rw== X-Received: by 2002:a17:90a:7acb:b0:1d9:85a5:e1e3 with SMTP id b11-20020a17090a7acb00b001d985a5e1e3mr4677848pjl.172.1651248141132; Fri, 29 Apr 2022 09:02: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/34] cases/buildepoxy.py: fix typo Date: Fri, 29 Apr 2022 06:00:43 -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 ; Fri, 29 Apr 2022 16:02:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165043 From: Chen Qi Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 3a9b6e71d1e7e8e2ebc0ed047841e36f09300387) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdk/cases/buildepoxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/sdk/cases/buildepoxy.py b/meta/lib/oeqa/sdk/cases/buildepoxy.py index 385f8ccca8..f69f720cd6 100644 --- a/meta/lib/oeqa/sdk/cases/buildepoxy.py +++ b/meta/lib/oeqa/sdk/cases/buildepoxy.py @@ -17,7 +17,7 @@ class EpoxyTest(OESDKTestCase): """ def setUp(self): if not (self.tc.hasHostPackage("nativesdk-meson")): - raise unittest.SkipTest("GalculatorTest class: SDK doesn't contain Meson") + raise unittest.SkipTest("EpoxyTest class: SDK doesn't contain Meson") def test_epoxy(self): with tempfile.TemporaryDirectory(prefix="epoxy", dir=self.tc.sdk_dir) as testdir: From patchwork Fri Apr 29 16:00: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: 7386 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 99832C433F5 for ; Fri, 29 Apr 2022 16:02:29 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.12139.1651248144604683756 for ; Fri, 29 Apr 2022 09:02:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=piXrMdG9; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id y14so7267576pfe.10 for ; Fri, 29 Apr 2022 09:02:24 -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=SVgzC4CQJOWJsNutQLQvztG4d4dh1oricPyxNZl82C0=; b=piXrMdG9vPZWLbsqeAG+tiU9aPAZGLi2lTWN9eGWzNtb4bbKn3CdyIKpi1FZwCRj0B nDWJC2eLKMb3ovPSWr01ZeldbvFdxX9bdtozWqjh4oOJcZWBELoDAqXcRbD+BEmKggb/ dmCB7WauoLwdRzLKopNW94iP7D4mmGheSBFEffiCviFS3EUlZgRpVGiwq2VVBbV4zz5t 89YMSQxclIqm4LVMqdaO+78CDvrrbrGqSbhVHkndgLV5a/RKPZf5K9dYtcF7XKBCAbzf uyJte3AJV3pGw/CHKtgWXA02hl5pILjIgFW8TeJQaGSmYkV9vOlYqxSxPsThBCAb+en+ Wp5Q== 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=SVgzC4CQJOWJsNutQLQvztG4d4dh1oricPyxNZl82C0=; b=5wRVIAVqqNsRNrdEU0bEQyy7RayhtMkPmE4/VyoTloTF03AlQe2xmS1HkZsHjuYl30 WQePf6Tc9xAERxcj8wl6fxYoWe7qYPGhn/IsMVTWXGyujCTXlPeSVP7udooSyyHEKxZv D2PaehnM512t1eWnR+holl4FFkv6i4hvX7g1CE60HaX8gS16UO45FiYbX1XM/3ApS4St JuOq9lfQwof1NSNxY9FGK2UlF/YVynbkS0kbkfFV74ZqOKqTeC7lQTEqlp5WQjLsPlZF yM4xjRoRQ8dHgAzJgjwU7aSzyfAbtc06xMu1rbO0hQACLHUPx3Wc+rieXyRPlGcTL6gf FLbg== X-Gm-Message-State: AOAM53020hlSxr+drfI/8FKPgq13OGFeuPS8Dz6tKjzcEccUjWdD4sAc MK911XkB5+hE459yLgm/cHZ8UxcfnltOsPgcRMU= X-Google-Smtp-Source: ABdhPJzVvoDmvlHeSDzlOt1Xf+VYQZp59hDcQ09pQA52E7g7SHiK2uTybHn887UuTIgJL5gG4/gb6g== X-Received: by 2002:a05:6a00:190f:b0:50d:8b82:cb90 with SMTP id y15-20020a056a00190f00b0050d8b82cb90mr71949pfi.65.1651248143255; Fri, 29 Apr 2022 09:02:23 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/34] create-spdx: delete virtual/kernel dependency to fix FreeRTOS build Date: Fri, 29 Apr 2022 06:00:44 -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 ; Fri, 29 Apr 2022 16:02:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165044 From: Davide Gardenal When building FreeRTOS this dependency generates an error because bitbake cannot find any provider for "virtual/kernel". >From a dependency analysis the task is executed independently from this so it can be safely removed. This patch has been discussed in this ML thread: https://lists.openembedded.org/g/openembedded-core/topic/90602531 Signed-off-by: Davide Gardenal Signed-off-by: Richard Purdie (cherry picked from commit 1c02b768a71ec88bfe1cc0c4443683de8b66056e) Signed-off-by: Steve Sakoman --- meta/classes/create-spdx.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 47a8764bf0..37b6b569a1 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -35,8 +35,6 @@ SPDX_SUPPLIER[doc] = "The SPDX PackageSupplier field for SPDX packages created f is the contact information for the person or organization who is doing the \ build." -do_image_complete[depends] = "virtual/kernel:do_create_spdx" - def extract_licenses(filename): import re From patchwork Fri Apr 29 16:00: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: 7384 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 A4F0FC433FE for ; Fri, 29 Apr 2022 16:02:29 +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.11942.1651248147735595353 for ; Fri, 29 Apr 2022 09:02:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=x7o1UrFU; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id p12so7327240pfn.0 for ; Fri, 29 Apr 2022 09:02:27 -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=x3szWdipc1bStASWqURdhKMNuBWSMuYdUxIfQB1RhFM=; b=x7o1UrFUXdKLainuzncEY2wAFhIJSt6VuXvczfcLxxx5bRGjwefqjW4hXwUAALVuGF Ijd1lm/6R8PJ7id+rASe3TppoqyuwPeNrnUZ8VNFZ/lrXVQqqRjUU5pt5s+RTOJ3ufqk 3pyAgma5eQk20PpOW5XtVT0LvFTjw7jpSDMTDhxnIPyuFcwqQeH2+JcDub+R8GGTXaa7 oHJji6HSIzttayUIRPRfB5ex7F5+Ne23yqSgBu1uDYoCD+DfozPRVZ8htnmgLZpOwOLV W85oLG7aFo4Xzrlj3RKPZ1wjWevm/+0vdo5ZYSPaBsRA8Lrw0IArTs35SXQL237xengz QxCA== 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=x3szWdipc1bStASWqURdhKMNuBWSMuYdUxIfQB1RhFM=; b=OiaL2B6gHjoyZpjLqqCvZlJ29mkaBeD+I0IYWsnYSrxRBkBWZZUcyoRbewRVZNk847 sb9asTPFze6AEXxwnaesTnkl8yVTORKFi1cMCO261VFrBhCBkmC5jzEQlXAbryZlVGgT 7ZJQ8YJIUIp3IALnuUx+0AtaLsu49+UJys3AX2ATJE7g2k1vZlqzlDOXK3RAwJi+11Jt 563jUH2notjicb0a89sX/+BRA3CLz0uvmGSFmrpLb7RZ4IOwNNyZKDnyPTWYu1eN8dmt ixma8efeVWtbc+ZbNNCm9pSsEEnSDyeVUxbpxBDLl+Yef2E2Jcq5VKYFPDb1sobhZtkq Cnng== X-Gm-Message-State: AOAM532+7Ug1MAw4+GxtJoF2HoKek0eA2+WtVVD4fWQibs6Yj6MkXs4j +LiQHEbXeIAAefypMTHbaiD3DnR0Za4F7CC/igQ= X-Google-Smtp-Source: ABdhPJwSnu7hJpGXNhYQZo25TCZhj0JXpjcue97SBo4Sj/tm9T+Zf34BJRHTUCvcY1SWVy72a/ZjUA== X-Received: by 2002:a63:6e0b:0:b0:397:f965:64a7 with SMTP id j11-20020a636e0b000000b00397f96564a7mr41688pgc.581.1651248146517; Fri, 29 Apr 2022 09:02:26 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/34] go.bbclass: disable the use of the default configuration file Date: Fri, 29 Apr 2022 06:00:45 -1000 Message-Id: <00f794aeaaa660851f3a8464ee89c553195dd3dd.1651246310.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 ; Fri, 29 Apr 2022 16:02:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165045 From: Chen Qi We need to disable the use the default configuration file. This is to ensure that user settings do not mess things up when building go recipes. For example, if I set 'GOBIN=./relative/path' in $HOME/.config/go/env, then go-runtime fails to build with error like below: cannot install, GOBIN must be an absolute path According to `go help environment', """ Setting GOENV=off in the environment disables the use of the default configuration file. """ We can explicitly disable the configuration file by setting GOENV to off. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 711b41744ab08ee62c71cdccca335a7828ec0ba1) Signed-off-by: Steve Sakoman --- meta/classes/go.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 9c4c92bffd..f3d83febbf 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -67,6 +67,7 @@ GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/" B = "${WORKDIR}/build" export GOPATH = "${B}" +export GOENV = "off" export GOTMPDIR ?= "${WORKDIR}/build-tmp" GOTMPDIR[vardepvalue] = "" From patchwork Fri Apr 29 16:00: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: 7389 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 9E83CC433EF for ; Fri, 29 Apr 2022 16:02:39 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.12144.1651248150144123805 for ; Fri, 29 Apr 2022 09:02:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=sR45Snk0; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id bd19-20020a17090b0b9300b001d98af6dcd1so10894228pjb.4 for ; Fri, 29 Apr 2022 09:02:30 -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=qCR2uVod6YZAXV6nKwh8X9F9vwYhOz5CfERZcIaGABY=; b=sR45Snk0iM334tb4VGJzl/qsjkWJ3QOvINS2yKS8qSOBUKPdmLKRCpPNrUQDhFyfvZ HykPCN/0gzWP/R8icxB9vz5z7AUYhmVL+HYgCV6t1FEI1R0fiSWoVWd8l/ACV3JHGb++ BuN/lyCYIInnk/NrHyLSz4sROwWa8Qx0iWQdD5oDxJ69IjarxzMTzAdTCAGRWYoGOytz CDU9uvSsOFu1L665+/WYk5vhi8QiPcABevpa/hhXTxbWSayU5D9kLQAvjmn2+w/p/eI+ KiCML/Ef4ti8t1plq5IJKdmERDbCnBoFnXyRgGK9YNZIwZAMspC71K9tAl7K7pIsNU5+ YkAg== 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=qCR2uVod6YZAXV6nKwh8X9F9vwYhOz5CfERZcIaGABY=; b=ko69x9ktjE7f1pH3uiKWQ7XPzLADr6U+949myosiMyJPIlJaqO9xuifnHpjndCJQWs iGj6xvYz9bUKk0sEbsoUL/XKmhNVpfB8uLdODf9y/eQw9ESM9G7az8sw4nCJsp2aLb0h IF6WZBcllqzvia0u8gWZqhBUD3vtOnK2LyX2JNHN7/4sSyMAf7+MdUKNEl04q9dYZZ/M PzWWDNnI8PNzSDNcbsf7EVGgHH0AEpe25bN0VV/9IM7DGFbD1S0ugAbk5+gFcBSJNdqq 8E2ztbWlacC1GZoSS7yRICcoNlcM7mMquhTfjrSTwmAgt2pmJLRYak5S0IY+F+RqGozl kgNw== X-Gm-Message-State: AOAM533UlHQaq5OPf4ePFK14lp1y0mFK4ry8LyZE3VROGDroIovfkYBO Nk86f4oWd/+UU9sSocva3koz3GQ1S1MNY+uztlw= X-Google-Smtp-Source: ABdhPJyGaf+8Cm1BTVTCjaOSWqQXO96YushFdQwxv+vqUPa6WcSGc94s0Gq0ILHSihLqcY0qsthMCw== X-Received: by 2002:a17:90a:bf0a:b0:1db:d98d:7ce9 with SMTP id c10-20020a17090abf0a00b001dbd98d7ce9mr4698504pjs.155.1651248148953; Fri, 29 Apr 2022 09:02: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/34] install/devshell: Introduce git intercept script due to fakeroot issues Date: Fri, 29 Apr 2022 06:00:46 -1000 Message-Id: <3a320c1555bf39b2d3c218ffc36827d9dda60fe1.1651246310.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 ; Fri, 29 Apr 2022 16:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165046 From: Paul Gortmaker In a devshell, recent versions of git will complain if the repo is owned by someone other than the current UID - consider this example: ------ bitbake -c devshell linux-yocto [...] kernel-source#git branch fatal: unsafe repository ('/home/paul/poky/build-qemuarm64/tmp/work-shared/qemuarm64/kernel-source' is owned by someone else) To add an exception for this directory, call: git config --global --add safe.directory /home/paul/poky/build-qemuarm64/tmp/work-shared/qemuarm64/kernel-source kernel-source# ------ Of course the devshell has UID zero and the "real" UID is for "paul" in this case. And so recent git versions complain. As the whole purpose of the devshell is to invoke a shell where development can take place, having a non-functional git is clearly unacceptable. Richard suggested we could use PSEUDO_UNLOAD=1 to evade this issue, and I suggested we probably will see other similar instances like this and should make use of PATH to intercept via devshell wrappers - conveniently we already have examples of this. Here, we copy the existing "ar" example and tune it to the needs of git to combine Richard's suggestion and mine. As such we now also can store commit logs and use send-email with our user specific settings, instead of "root", so in additon to fixing basic commands like "git branch" it should also increase general usefulness. RP: Tweaked the patch so the PATH change only applies to the devshell task and is a generic git intercept rather than devshell specific. RP: Also apply the PATH change to do_install tasks since that also runs under fakeroot and several software projects inject "git describe" output into their binaries (systemd, iputils, llvm, ipt-gpu-tools at least) causing reproducibility issues from systems with different git versions. Signed-off-by: Paul Gortmaker Signed-off-by: Richard Purdie (cherry picked from commit 3266c327dfa186791e0f1e2ad63c6f5d39714814) Signed-off-by: Steve Sakoman --- meta/classes/base.bbclass | 1 + meta/classes/devshell.bbclass | 2 ++ scripts/git-intercept/git | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100755 scripts/git-intercept/git diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 3515720bf9..b54b56d624 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -367,6 +367,7 @@ addtask install after do_compile do_install[dirs] = "${B}" # Remove and re-create ${D} so that is it guaranteed to be empty do_install[cleandirs] = "${D}" +PATH:prepend:task-install = "${COREBASE}/scripts/git-intercept:" base_do_install() { : diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index 26c01c080a..247d04478c 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -2,6 +2,8 @@ inherit terminal DEVSHELL = "${SHELL}" +PATH:prepend:task-devshell = "${COREBASE}/scripts/git-intercept:" + python do_devshell () { if d.getVarFlag("do_devshell", "manualfakeroot"): d.prependVar("DEVSHELL", "pseudo ") diff --git a/scripts/git-intercept/git b/scripts/git-intercept/git new file mode 100755 index 0000000000..8adf5c9ecb --- /dev/null +++ b/scripts/git-intercept/git @@ -0,0 +1,19 @@ +#!/usr/bin/env python3 +# +# Wrapper around 'git' that doesn't think we are root + +import os +import shutil +import sys + +os.environ['PSEUDO_UNLOAD'] = '1' + +# calculate path to the real 'git' +path = os.environ['PATH'] +path = path.replace(os.path.dirname(sys.argv[0]), '') +real_git = shutil.which('git', path=path) + +if len(sys.argv) == 1: + os.execl(real_git, 'git') + +os.execv(real_git, sys.argv) From patchwork Fri Apr 29 16:00: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: 7390 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 9C3C8C433F5 for ; Fri, 29 Apr 2022 16:02:39 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.11931.1651248152644793805 for ; Fri, 29 Apr 2022 09:02:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=AAV5mNaC; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id a11so7292673pff.1 for ; Fri, 29 Apr 2022 09:02:32 -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=BQ/cM1HFGI7JNVX0/+wWGBQCAEKgX0dQEI83N2C8OK8=; b=AAV5mNaCImt7N2e9WifEGNAHpPFcG5/3OWV6VA4LIaHDg6/RWinRPQSB/QSspi5Fc2 f/RfVgYDX5yAik6mjcbjCk22TQM7Fwi0TP6tlhydt99kW6PtSpA5VTHVtkI/DhusZGTc BCvodRW40fH/drabKax/yuIRIjsu5jQ734w3hdMuteEpDstNu+Ad14H2bCsn/DR0fRYy fjlztccoBXzBkw+Y6bc/utmnO+Yo8q4mRi+cSh4xW54h9Y9MBAaSsG7GJ1wCCds0iysO 12AO+ELxyhWwQ/+nSpa3m/llQTdmuY4iDZcgP4Tz8e0zNZaxNYIE7sUjkvBZgAE9VLqG d9WQ== 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=BQ/cM1HFGI7JNVX0/+wWGBQCAEKgX0dQEI83N2C8OK8=; b=x/Cn/bLbiQNnEeuVLZ+IqJhR5YpZHiUhbnhFnwrDAfs/ySi7UEwnQqV2ufTsnQW7Pl sqcGIXOacn4CEj3FELQRdpamkHNSiloGro9NL+1znViPUv40eNyf5uRYWBXGTn5n7DO8 tZkxOf8QEf/YeiQKJL2McpPnnZYm4fgCtMclM2W5QlaJij9Y3L9DL7aYIxP/Dq15kZK9 oiNWJ1sCH309Nx2L0l3xgNAPmTBHYA4rIbDmwqpZ2+nvrzNuqY+MNGZCIvaVObHYv7tP nhhCWu7oLzTAzzbrwXqx5tUng5X2kbQWBpqOHlalHGjrikR3Ko8RTXJMNXYXm8iuObg9 9QNw== X-Gm-Message-State: AOAM533ksYWg22FtY5+gMJgtcUo0Ls3qsHCV4ME60YlOukF1jGUN53kn YozEB4n/AnJRO/7DS0KA6HPAbpu7C7eJ6tQ8joE= X-Google-Smtp-Source: ABdhPJy/qzNTUQtaX8uQtOj23MqHVrU8WLmvVZ+gdMrjwimh2GMpOaK64XvTjkWffwp+RCL7O/RI1w== X-Received: by 2002:a63:dd54:0:b0:3a8:f358:5b3f with SMTP id g20-20020a63dd54000000b003a8f3585b3fmr65585pgj.97.1651248151127; Fri, 29 Apr 2022 09:02:31 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 28/34] base: Drop git intercept Date: Fri, 29 Apr 2022 06:00:47 -1000 Message-Id: <1b807a0ad9cf5acdbe7fce588544f7eb8cbbd80d.1651246310.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 ; Fri, 29 Apr 2022 16:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165047 From: Richard Purdie We're going to use the environment approach for solving this issue. Signed-off-by: Richard Purdie (cherry picked from commit 0982977dc052ad4e65608f6853f930121d08837a) Signed-off-by: Steve Sakoman --- meta/classes/base.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index b54b56d624..3515720bf9 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -367,7 +367,6 @@ addtask install after do_compile do_install[dirs] = "${B}" # Remove and re-create ${D} so that is it guaranteed to be empty do_install[cleandirs] = "${D}" -PATH:prepend:task-install = "${COREBASE}/scripts/git-intercept:" base_do_install() { : From patchwork Fri Apr 29 16:00: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: 7388 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 9C3F6C433FE for ; Fri, 29 Apr 2022 16:02:39 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web12.12076.1651248154608851539 for ; Fri, 29 Apr 2022 09:02:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1q1Tw4Tr; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id s14so7512521plk.8 for ; Fri, 29 Apr 2022 09:02:34 -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=ImgRqEdWIE+hk5SE1NRcTf1O7a2mQk1YxM+tcDLMcBo=; b=1q1Tw4TranI9kPn2yIHGpb/tHAdiyCE9hqsTbXIWM+fcM7J4QASKTeaqGFVqhnrwyD rluXj5cCU2snXmqa0aO0omlr9T+FhoD+uBL3+QQJdXdqJ4++w5qNBRHNC6153cn5dX03 qbb1iRlZLCsAPZbSXSEHvpsqBtvhFNQqX+m/LcDwMFLEkuAxGbdgHBFn0zK+33cSt5DS A3+myZyUXu5gm1jcmJ+QB63DLu9tER66VdJJMYkPGI2Ji5RuQb8f2tvQSI6gwxHYzMPM RhhoNkjZCTa4Vm8PQAGrtq8PKCrRFz51VrNrTmPtGr6oK0dacJia9O7fzFSC9khdhPtb XQwg== 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=ImgRqEdWIE+hk5SE1NRcTf1O7a2mQk1YxM+tcDLMcBo=; b=dmzFbv7V6Vis/G3OgMdK5YYeFobjk0LbXAoVEY2Xgb5BFE0rYgCo15kk3uZpopqlLE GyQDfhAmGbFHfUUR9xR9NR9g+hYMg1RUowa3bFVI7eHBrIMzNVPVrUVi64njXakNEuTm ObkAojUeUwZr76w0xWheaK57X4fcWKS4Ve+P8k8w8qVvLjImxNav/yre71eZuQ83Hhhv f1CxNZD0qF6X3N/foun4CWwmYM/XL1+bgwc7xHSdQtpUaMTk8OQhrlTOtyd0gYhgLSb2 K/e3tyz7TwwOcOJsVFk220UWIp0OlhC8gFFE2j+J9rLaKS1vs9XvkZonuZQ53U4KKc8C m2Ug== X-Gm-Message-State: AOAM5335PUtAr5GE5wHMNaty2jSADIsgo/zlZcvm3mwGFB58t242DZfa H9txXWHDBCCU04KzEQ/fjPaU+hS3ztfRgpx2faM= X-Google-Smtp-Source: ABdhPJzn39PgVFOHIpevCoHwX8fRBEx9u3aiJHsY2tqlTCbsdBdWvBbKXiNkfmiKCem3nnVd69/Yuw== X-Received: by 2002:a17:903:2352:b0:15d:5c2f:85ab with SMTP id c18-20020a170903235200b0015d5c2f85abmr85225plh.47.1651248153325; Fri, 29 Apr 2022 09:02:33 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 29/34] bitbake.conf: mark all directories as safe for git to read Date: Fri, 29 Apr 2022 06:00:48 -1000 Message-Id: <204cc2fdd75631ab0a84a3a090f5cd7dcfc13856.1651246310.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 ; Fri, 29 Apr 2022 16:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165048 From: Ross Burton Recent git releases containing [1] have an ownership check when opening repositories, and refuse to open a repository if it is owned by a different user. This breaks any use of git in do_install, as that is executed by the (fake) root user. Whilst not common, this does happen. Setting the git configuration safe.directories=* disables this check, so that git is usable in fakeroot tasks. This can be set globally via the internal environment variable GIT_CONFIG_PARAMETERS, we can't use GIT_CONFIG_*_KEY/VALUE as that isn't present in all the releases which have the ownership check. We already set GIT_CEILING_DIRECTORIES to ensure that git doesn't recurse up out of the work directory, so this isn't a security issue. [1] https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 8bed8e6993e7297bdcd68940aa0d47ef47120117) Signed-off-by: Steve Sakoman --- meta/conf/bitbake.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 0e939aca4f..1deba8d910 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -776,10 +776,18 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" +# Git configuration + # Don't allow git to chdir up past WORKDIR so that it doesn't detect the OE # repository when building a recipe export GIT_CEILING_DIRECTORIES = "${WORKDIR}" +# Treat all directories are safe, as during fakeroot tasks git will run as +# root so recent git releases (eg 2.30.3) will refuse to work on repositories. See +# https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 for +# further details. +export GIT_CONFIG_PARAMETERS="'safe.directory=*'" + ### ### Config file processing ### From patchwork Fri Apr 29 16:00: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: 7391 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 A8AA2C4332F for ; Fri, 29 Apr 2022 16:02:39 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web12.12078.1651248156661569769 for ; Fri, 29 Apr 2022 09:02:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XixL4kgH; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id iq2-20020a17090afb4200b001d93cf33ae9so10894093pjb.5 for ; Fri, 29 Apr 2022 09:02: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=epOm6QRiZhVnONVrBL9YJ2qUEo8DFwcGMEk5pldKzG0=; b=XixL4kgHiHuxgAamKid05u9x29COw5FbiaVMy0LQ8vNFtWSGnrz+XWir9oGdfIgPuU 9P0ocakSTKeELJV4vdQmo8E8osFm4dXCs/K3928Qu9gUf1fNJBuXett2mAQ2JO5+6M/N VjGFwU0qL+/uIciR8Wy/ZNZq4QAL9DuuCKP2sp0ckZZh8YA78yiXHc7YvnyTSzg3n4pO S/uU3mJ7wgXC/UKqtQGVOUtMaVzWUolnufjv161WuzC3qmbz3FF1NMaItg2Krlh/MprY wJscSUHoUXAgXxb5tMmXig2M/eEs+5fHL9c3oZCKFiXCc65Fo+cYjEq4KhsMYoThh0lB 5R1g== 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=epOm6QRiZhVnONVrBL9YJ2qUEo8DFwcGMEk5pldKzG0=; b=TKX6psa/zp8fX7EZrVN33v6oqDbWmdPzofEYYROZiw0H1eNxfE7EFb6kk3uf7v6y2+ W+NJLkX8zmLo/92+IBY0Xt3Abczzx7E+PvsgmPXkAW27ATjmp4xhQA+UKubhNbdKjuJy Dp1dgjyYT1Dbj1qSfbnKTJ1I0dxOXVBu/qY5c3bhN8pGATs1rbAWu+J5c24NWu10Vm6b +XELzKlFaPkKCuHwVIUm1uCEJbdj+QQAjmyqtcvEHSYnYQkWbu2SpU/HW7HCpSr2hKf0 YWMQyUMIADqeo0+uWQ5BqaIjiy4Jqzv0ih4u1lPJNIBCZZPE0n1FZbjMctcMahryhnx5 hn7Q== X-Gm-Message-State: AOAM530023zi+FR44+AoCmIiILVUYHJqs7ufWF7d64v6+HF2tGRWZqe0 U9CRdkZYuwmhUE308tjRJvJVD/hCs9rUbg8K7gM= X-Google-Smtp-Source: ABdhPJwEyFmMV/3fzrWON021KIvIfCny/1OVdVw3c/v3C1MgxGs50Z0qpZ5hmefCtvT63TrliUwSZg== X-Received: by 2002:a17:90b:4b04:b0:1d9:a2c5:36d1 with SMTP id lx4-20020a17090b4b0400b001d9a2c536d1mr4714431pjb.86.1651248155492; Fri, 29 Apr 2022 09:02:35 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 30/34] neard: Switch SRC_URI to git repo Date: Fri, 29 Apr 2022 06:00: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 ; Fri, 29 Apr 2022 16:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165049 From: Rahul Kumar The tarball (neard-0.16.tar.xz) fetched by the recipe is incomplete. Few plugins (e.g. tizen) and tests scripts (e.g. Test-channel, test-see, neard-ui.py, ndef-agent etc) are missing. Since neard did not release latest tarballs, so as per community recommendation switching the recipe SRC_URI to git repo. Community Discussion: https://lists.openembedded.org/g/openembedded-core/topic/90058043#163681 Signed-off-by: Rahul Kumar Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit b563f40ebf4461d9c35df72bd7599ea11e97da9c) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/neard/neard_0.16.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb index 57f2a3e2e1..bc9ce07d79 100644 --- a/meta/recipes-connectivity/neard/neard_0.16.bb +++ b/meta/recipes-connectivity/neard/neard_0.16.bb @@ -2,21 +2,22 @@ SUMMARY = "Linux NFC daemon" DESCRIPTION = "A daemon for the Linux Near Field Communication stack" HOMEPAGE = "http://01.org/linux-nfc" LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ + file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ + " DEPENDS = "dbus glib-2.0 libnl" -SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ +SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git;branch=master \ file://neard.in \ file://Makefile.am-fix-parallel-issue.patch \ file://Makefile.am-do-not-ship-version.h.patch \ file://0001-Add-header-dependency-to-nciattach.o.patch \ " -SRC_URI[md5sum] = "5c691fb7872856dc0d909c298bc8cb41" -SRC_URI[sha256sum] = "eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ - " +SRCREV = "949795024f7625420e93e288c56e194cb9a3e74a" + +S = "${WORKDIR}/git" inherit autotools pkgconfig systemd update-rc.d From patchwork Fri Apr 29 16:00: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: 7394 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 B08A3C433EF for ; Fri, 29 Apr 2022 16:02:49 +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.web12.12080.1651248159699365647 for ; Fri, 29 Apr 2022 09:02:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=WtJ7ro/I; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id r83so6869574pgr.2 for ; Fri, 29 Apr 2022 09:02:39 -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=CVrk+jLKpKJ9Oxhr2NV4yNUX/PbUdlMyasiWthiDTdU=; b=WtJ7ro/IC8neZwAbvwwq4Qs3PlNxcGFr61nbllr+vA/SXMFUf7TNY3WysYns+RvGOT z24JQ79jrRZ43afYCzjnVjeXh/vzBqn2Zx475Cq2nWU82jxsHCgu8e/rEqgOK1p9K6OD Yknuc8PoovNFHAkeHTPAcJNZc2DFAvd0QDkJiiGkJYRXOvAhCcz04Xb5dbki3Q4IwQIp Z6tZ//IdWK+8g97H97GotZzXBV6TcpT16YBM/I2+O+bsN2ffmnviZjB9TXOjt32ekOxU W6uqjWIIGt3PLymieQdNgse2i5jxnGHuDU1uJOPzwvjsbPqm9Ui09l1Lhv1/yOTRgRYo T75g== 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=CVrk+jLKpKJ9Oxhr2NV4yNUX/PbUdlMyasiWthiDTdU=; b=dhkea6VEGO0wI+o9rg2w06wfdyA2j6Jsv32mDGv6WOBcYC2Ojdgf7Xb1u0IX4s+fIn lkZIdLTllgJfE1fpkoHwdOA8Tsmr2ejzxvIWiqjSZsPzg0lmpxIG3HBaOi8+xiesoM3J qxxFrzqmKscWPvAUR1GbhacCVPo7FmdZ3fTIrRxrsNKq124+PEkTJ/sey7f6DAhufb3x 98K3YjDYZnhXHGCKQSpYA8yE12uQOrVO3p4UFESYNSGT3CCNqS00x2pVAsNgO+LCDVzh JSrj+CmA/Z7S3xwCv7EoAV3cHlqtdCntE/JYTS9ZdcH8Nj4L8Z2EwVzw+H0qN/6ue9ca 4PRA== X-Gm-Message-State: AOAM530l1OVYGceHT8YsMu1XyoF8v/1Di8DzFA7/D6bRkO0ea9zrAqJa 74ZdO1s4AdAOCnk/UKRqMkXVPv/TZfbmg/08yPo= X-Google-Smtp-Source: ABdhPJwcHLUVp8weqEc8tvxEdssVDXdCTSatIUpERC+O+84XRj/gSqNkLoYNgCOdn0nYWV1cJsqlYQ== X-Received: by 2002:a63:c23:0:b0:3aa:3f26:b2eb with SMTP id b35-20020a630c23000000b003aa3f26b2ebmr96501pgl.196.1651248158123; Fri, 29 Apr 2022 09:02:38 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 31/34] sanity: skip make 4.2.1 warning for debian Date: Fri, 29 Apr 2022 06:00:50 -1000 Message-Id: <3744d06135a76d0170141dc02ead3704a089a427.1651246310.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 ; Fri, 29 Apr 2022 16:02:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165050 From: Nicolas Dechesne This is a follow up patch of: ad5829aa1f8a (sanity: Show a warning that make 4.2.1 is buggy on non-ubuntu systems) Debian10 has the exact same version/sources for make as Ubuntu (focal), e.g. https://packages.debian.org/source/buster/make-dfsg and https://packages.ubuntu.com/source/focal/make-dfsg. As per the corresponding changelog, the patch mentioned in ad5829aa1f8a, is included in both Debian and Ubuntu in make 4.2.1-1.1. So it's safe to use make 4.2.1 in Debian10. Signed-off-by: Nicolas Dechesne Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 1d5d5278ff4f620cd786b85e880e8429a04a1548) Signed-off-by: Steve Sakoman --- meta/classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index c385d92e8b..c72a7b3ed3 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -470,7 +470,7 @@ def check_make_version(sanity_data): if bb.utils.vercmp_string_op(version, "4.2.1", "=="): distro = oe.lsb.distro_identifier() - if "ubuntu" in distro: + if "ubuntu" in distro or "debian" in distro: return None return "make version 4.2.1 is known to have issues on Centos/OpenSUSE and other non-Ubuntu systems. Please use a buildtools-make-tarball or a newer version of make.\n" return None From patchwork Fri Apr 29 16:00: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: 7393 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 B0B64C4332F for ; Fri, 29 Apr 2022 16:02:49 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web10.12148.1651248162663369431 for ; Fri, 29 Apr 2022 09:02:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=SfiZzvYP; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id cx11-20020a17090afd8b00b001d9fe5965b3so8977795pjb.3 for ; Fri, 29 Apr 2022 09:02: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=mJu68s99KddCp62wdCJyE3jX6h7/bn4S/P0m3Yo+t6Y=; b=SfiZzvYP8SITndT+qlHbAGv6In5Of2mj2mST8ftWoeUf+OSSrYFZUHPM+m0GcShSDf D2wnjubHmbiXqpbi2K4X1vxoTVwltpJW3U4AjSHfWHpzqxmgkRBtUUfxob7Rx8Ik1BhE UTCFKyT6ZuBlY2sajPiTg6feANc91BbL5202lSMibkZxS9Dms55gJNBhKs6OBXhAwWxb 8rQG9SgnqVLv366rRo3JlDPo5DNWjelOxSSLrYMX3CvrMCnc6kLWmMFf2HJ/gCdKVjQ2 CMrUle1PQbKFYFQZNV7cxPAjhjuV/z1+OUmZqJrDsF+CJ2hssWMNWVqWSIyPpi7fXryO Kc0Q== 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=mJu68s99KddCp62wdCJyE3jX6h7/bn4S/P0m3Yo+t6Y=; b=SNeaNAdlG/oYV0Y9QwO1JAw3sRYJgHeze7J+6+fr2z8wC8tS4pd10EHw7tt/0VNAo5 wDg3jHI09sQJUHeF8h+kurJlnvkgbtFEAvTzS8FiishqjxoZJhyOytsJda0W2bV7s48w LvGHt8ohzuOvk6Ccoc6roRj8A8WpDLmw8RmPTdzJy0WYCgxJVY9u1tm6Zzlb9GA0iiqU HbOWKaZ89h0kaJhAo+DtJosKP+vyeUvwAOCqPr8PaDx/9JSayOEpbw1QsYquY/RYUo5J ju3IPCEIP96ukHgvekZ/5YBnY70Syy4flGN1dsD2EmXXxNwCXXZlgVcdxrXgt5dQE7Ps +OpA== X-Gm-Message-State: AOAM533HFh3lRC40SV6m7Fkm058we5bZgVs4ZaiE5k7UNz2q3eliB8gc wxh6OTiuTCMU+8HFnI5w+05ytfAWDteF/49zybA= X-Google-Smtp-Source: ABdhPJxzHKpeJ4+oa/mnBZNi4u4OyAK3U+zzN5Pw4I9pVw1pm7OCvoBCzQrqXYEn4khg2cupv5DUZA== X-Received: by 2002:a17:902:e84b:b0:15d:5c31:8f8e with SMTP id t11-20020a170902e84b00b0015d5c318f8emr12657350plg.118.1651248161334; Fri, 29 Apr 2022 09:02: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 32/34] util-linux: Create u-a symlink for findfs utility Date: Fri, 29 Apr 2022 06:00:51 -1000 Message-Id: <04e03fa3acde7a23825fb9a17de98f1cecaae097.1651246310.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 ; Fri, 29 Apr 2022 16:02:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165051 From: Khem Raj busybox also installs findfs but into base_sbindir which works out to be ok when sbindir != base_sbindir but with usrmerge distro feature enabled this starts to cause trouble because busybox's postinst is trying to create a symlink for findfs applet in base_sbindir which is same as sbindir now and there already is binary from util-linux and image fails to build do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} (). The real reason is burried in do_rootfs logs update-alternatives: Error: not linking /mnt/b/yoe/master/build/tmp/work/beaglebone-yoe-linux-gnueabi/yoe-sdk-image/1.0-r0/rootfs/usr/sbin/findfs to /usr/bin/busybox.suid since /mnt/b/yoe/master/build/tmp/work/beaglebone-yoe-linux-gnueabi/yoe-sdk-image/1.0-r0/rootfs/usr/sbin/findfs exists and is not a link Creating proper u-a for findfs in util-linux fixes the issue Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 211ae2db1ab8fec1ed678170f9d8cbca2cc27ef3) Signed-off-by: Steve Sakoman --- meta/recipes-core/util-linux/util-linux_2.37.4.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/util-linux/util-linux_2.37.4.bb b/meta/recipes-core/util-linux/util-linux_2.37.4.bb index d609c30067..b39020884f 100644 --- a/meta/recipes-core/util-linux/util-linux_2.37.4.bb +++ b/meta/recipes-core/util-linux/util-linux_2.37.4.bb @@ -221,6 +221,7 @@ ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" +ALTERNATIVE_LINK_NAME[findfs] = "${sbindir}/findfs" ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" From patchwork Fri Apr 29 16:00:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7392 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 A9312C433FE for ; Fri, 29 Apr 2022 16:02:49 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web08.11900.1651248165514106782 for ; Fri, 29 Apr 2022 09:02:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KNqi2vYF; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id cx11-20020a17090afd8b00b001d9fe5965b3so8977899pjb.3 for ; Fri, 29 Apr 2022 09:02: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=Pei3BeWCPaQ/YvALjYtgq8+PY43BWvnoX4fJGeWCNkU=; b=KNqi2vYFR0oQSmPJ2811S9eYMjJSR25In9HdNnWrU+1RIngjagN6T8uITcNtFEMBYz GROOO7ecccIp9VRvEBKLlkCsd+JI2Sx25a4EJNKzAe22yJRoqEuszs2perLxOqTH0jDr NuDrz1Pm9xCi7NJhdfiGiSgLSLeEXn4wCOfacUDqPd2OJ4zvP1jC24l6J4JuDqhKProY UGV4yJpmGqPHmBQVdASigvkEjLodo+iX1oJznVUR9lxi1jXslszhBUu/9wkt9U9I83Fv wkEbnc/QWpilnz9TFIS5VahGLpy2Vfy64QIquusSqyy+k2dsl7RuJMjyiXRUek9VtZ3z FyTQ== 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=Pei3BeWCPaQ/YvALjYtgq8+PY43BWvnoX4fJGeWCNkU=; b=at/v0ikkYpLDZOOoIdNhf5oW8AcbZnOPd4gJJkkCLOpXtepRhVlPL3aybYZ+AxStPO uATGnLHocTqoF4cbqgk2XrYS0B7mBVDe/lkS3lly+8GJHtP+G5NEcQaKGHnD+DdaPEfr 1JrrtwNDI/28S8YFQkz0xKQpVgM235X5Z9Rnz1eL0rvEf3KPSCVgAqF9qZD2T5MdGxgP TI4Wv0r7O2lLIEpm5fAcNn3iot+mECRSvj+klTG+rx1tjz9FGbxQze2nCaogs6FiMg3m bkQZAM2sbs357DmqTd7LfnxUXVObAX6798aFjYfWE8BAjqVc2/7Iew6NKa+/KY+bCRgB /kIQ== X-Gm-Message-State: AOAM532SPqNnmt//pqKfli/HYjtgd7+URUdYKD3owIEY+2j9vpFftWr4 D7O/hCZ9rfwO4lYIlPzfYNnMvSOnJRbKgHgeEH0= X-Google-Smtp-Source: ABdhPJw8ItrOy3dfBmvHCrxK+U0hvYJkcZkmMuL6LIrVvMcXWZEeSBFRqySh1LCNbBnSZDflI/vS/Q== X-Received: by 2002:a17:90b:1e47:b0:1da:31f9:e5d1 with SMTP id pi7-20020a17090b1e4700b001da31f9e5d1mr4740674pjb.226.1651248164283; Fri, 29 Apr 2022 09:02: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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 33/34] staging: Ensure we filter out ourselves Date: Fri, 29 Apr 2022 06:00: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 ; Fri, 29 Apr 2022 16:02:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165052 From: Richard Purdie Adding a dependency on ourselves in this function doesn't make sense, the hash may change after hash equivalence is applied. Other code using BB_TASKDEPDATA does handle the self reference correctly (which is there for a reason), update this code to do likewise. Signed-off-by: Richard Purdie (cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c) 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 ab827766be..9fc8f4f283 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -651,7 +651,7 @@ python target_add_sysroot_deps () { taskdepdata = d.getVar("BB_TASKDEPDATA", False) deps = {} for dep in taskdepdata.values(): - if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0]: + if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0] and dep[0] != pn: deps[dep[0]] = dep[6] d.setVar("HASHEQUIV_EXTRA_SIGDATA", "\n".join("%s: %s" % (k, deps[k]) for k in sorted(deps.keys()))) From patchwork Fri Apr 29 16:00: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: 7395 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 A9BC4C433F5 for ; Fri, 29 Apr 2022 16:02:59 +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.web08.11903.1651248169682307269 for ; Fri, 29 Apr 2022 09:02:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xKuhzt7Q; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id gj17-20020a17090b109100b001d8b390f77bso10926992pjb.1 for ; Fri, 29 Apr 2022 09:02:49 -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=fdmNOhfg4WLdfzLfgClI2WnnvJBXjHVxXOHucwPYC0A=; b=xKuhzt7QZoEO5oNXNkQsgvoey14sTWBlKolMX1yIhMpnHdRztqcY6l2PEzK4rItfPV ENvk4NqVq/7EnfCeeNaXrWHTkdYJF9Cl7BOCp3QlYltXVP98ztpEWuUdhCeSJSEpbvfF ywa+y/R8jBeCoBJ9D/Z+A5H67FSZAcES3WI7L3HwpaImiluxcEIfXOuKuC9ncq1JUu9R VhSVA6MAzzcKocfOeEM2moJ19Os7fgrzhoJA/4FRCkl2fDef4wa4N776G72kbjuxc743 a8tFckO0C7Vibg+LQcrkICBCawMWMYxo1K4QqxPXcg/pzUUCXHLJZCSBdrli2im7sjnB 5qrQ== 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=fdmNOhfg4WLdfzLfgClI2WnnvJBXjHVxXOHucwPYC0A=; b=XNFXuYuwMdoPJmqBiBDuogGb1Hbt4n10r9DoM7QZa+4yJsJQj/SrqcRbybKKaVx1yt SKSyA/W0oJmlFIRMgZ9BMBfCdZ5VddG5mmyLaiNUr43OybVc76fXOtlT/P8fOKWLcnLX ZSPz7V8B8CkOM0hrBe+bMrWbvxYhTMIL2EY55qz7RmNlUGYzC8J50LaJQ9W2b1YI+6ta DqdXeLCGrKGH+sevutzGG5UHZOoBSUD7+iNJTRtsSme1IUW+IVyLD+oSmEX3V6nmfM61 bc0p6XBJzuvNDMg3kHe3Ha01wpP1jMqJH1Hh26eHS5EzRVpoTnJ+aPcGur/IWEm3T3y1 OhHA== X-Gm-Message-State: AOAM532YnD8yT8UH7GXeZB+JsqTb2QRnUkDhBPrPQFOQQASbw+0/qk7E jZimhquRuDCtYHGalmyLZ4oRq/qs2ie3B6KFYUo= X-Google-Smtp-Source: ABdhPJzPlCwL+AywfprwErxckUcY9F1EGl7s7aLzThwN9JoVMQvL4G3sA/kY9yB5GOS5K767BQ2vfg== X-Received: by 2002:a17:902:7298:b0:158:3a08:3163 with SMTP id d24-20020a170902729800b001583a083163mr69908pll.133.1651248168391; Fri, 29 Apr 2022 09:02:48 -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 i3-20020a056a00224300b0050d32f838e1sm3486125pfu.21.2022.04.29.09.02.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:02:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 34/34] libxml2: update patch status Date: Fri, 29 Apr 2022 06:00:53 -1000 Message-Id: <87d7383989a1ef6deaeff85739e622d8175ae9b6.1651246310.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 ; Fri, 29 Apr 2022 16:02:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165053 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 2e21e1e5e2659b02a771ce986fc3194deeda9f4d) Signed-off-by: Steve Sakoman --- meta/recipes-core/libxml/libxml2/runtest.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/libxml/libxml2/runtest.patch b/meta/recipes-core/libxml/libxml2/runtest.patch index a89dac8b75..42bb22cfd4 100644 --- a/meta/recipes-core/libxml/libxml2/runtest.patch +++ b/meta/recipes-core/libxml/libxml2/runtest.patch @@ -5,9 +5,11 @@ Subject: [PATCH] Add 'install-ptest' rule. Print a standard result line for each test. +The patch needs a rework according to comments in the merge request. + Signed-off-by: Mihaela Sendrea Signed-off-by: Andrej Valek -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/137] +Upstream-Status: Inappropriate [https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/137] Signed-off-by: Hongxu Jia Signed-off-by: Tony Tascioglu