From patchwork Wed Jun 8 14:39:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9014 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 3895CC433EF for ; Wed, 8 Jun 2022 14:40:29 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web08.7295.1654699197576437012 for ; Wed, 08 Jun 2022 07:39:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=DT9fTwVv; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id l7-20020a17090aaa8700b001dd1a5b9965so18494131pjq.2 for ; Wed, 08 Jun 2022 07:39:57 -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=hFC1EcpEWgewimK7HDnGF1Q7wiV2YEpkRBTlZYzjzbM=; b=DT9fTwVv6g+53qXuob3DMNV7uB5cmHu+SnSLif/G2B5F+vzD9AG2NN6xd+gj1dQFKf nK1QUQst8vQXB2q/KqoSjEinU+TMdp8omwcJ04cr3YShqr8yQeEayU0tFfA8k0ywmJQT 6SKZuZQ9louXH7G9X/U3j4+tiAZyhU4Dn6hZ2YBL3McwIxgWwmzpSVq15fiVmtEn9xOc iJLVtPf7wVlm8yDKK7HPDNUrDgGuMkz0ST4uSe7H7octonHmPbW3sZLTrRtcns1K8oCC 0nv8hgdX7akKGUM1YSZ5Z46Z36h5sOIyptrjODT6Ew8HIaQ6NKaokhEZ/DCyzAqhao1d 1fgg== 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=hFC1EcpEWgewimK7HDnGF1Q7wiV2YEpkRBTlZYzjzbM=; b=n/xxtD1EgJgXEazjEjs7nbJJd71M+SGnVPedvGHUNgUkGvD72Shr2KFrpc71XES6gs 0Tyf8yS83zIHj+NfIM7U9kIoRPkKPcUvgOr5feWeyVFQooQH2h3zO/NioSnDJWsbiYNm 7hf0RvtuF/y+tYaXPduMHdDJ1eX2UC6keYtYL+pn4jMvon2wJ93gDIXp6zvgptBe3Kbf iPBFyawEWjrqHtdBkAqPzWBjjk4LGCJ0ir+fwAchN8YWRO4/jmqG9RVpJ4KsEy7tDuLn GTj9YfUQ7yzrs/nvc0eSw8JJjOoBlmzYjXjzjRQeHJO7qhmjpsGjhuZpTh+f2qGixWOB 9pYw== X-Gm-Message-State: AOAM531UeB54Ja4nCc3N+TQhWrBurvUm3fFsXLF50eTiWS7gl1OxyD03 KUxf2we+n3t6hNGbwe8nlWoNaW7OosYkw9T3 X-Google-Smtp-Source: ABdhPJyTipc3lsZ0dTzf2+fIASTKEY8dkfSB5zX5qFrGWIhAX4FSW7BstCpMLCtquSk5S+qSFsPDzQ== X-Received: by 2002:a17:903:11d2:b0:167:8a0f:8d4b with SMTP id q18-20020a17090311d200b001678a0f8d4bmr12061264plh.78.1654699196576; Wed, 08 Jun 2022 07:39:56 -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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.39.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:39:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/22] cve-check: move update_symlinks to a library Date: Wed, 8 Jun 2022 04:39:14 -1000 Message-Id: <66bf08f2df478a909a12756c650dcc2ae09a0a47.1654698895.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 ; Wed, 08 Jun 2022 14:40:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166712 From: Marta Rybczynska Move the function to a library, it could be useful in other places. Signed-off-by: Marta Rybczynska Signed-off-by: Richard Purdie (cherry picked from commit debd37abcdde8788761ebdb4a05bc61f7394cbb8) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 11 +++-------- meta/lib/oe/cve_check.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index c80a365819..3844efcddb 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -80,16 +80,10 @@ CVE_CHECK_LAYER_INCLUDELIST ??= "" # set to "alphabetical" for version using single alphabetical character as increment release CVE_VERSION_SUFFIX ??= "" -def update_symlinks(target_path, link_path): - if link_path != target_path and os.path.exists(target_path): - if os.path.exists(os.path.realpath(link_path)): - os.remove(link_path) - os.symlink(os.path.basename(target_path), link_path) - def generate_json_report(d, out_path, link_path): if os.path.exists(d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")): import json - from oe.cve_check import cve_check_merge_jsons + from oe.cve_check import cve_check_merge_jsons, update_symlinks bb.note("Generating JSON CVE summary") index_file = d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH") @@ -110,6 +104,7 @@ def generate_json_report(d, out_path, link_path): python cve_save_summary_handler () { import shutil import datetime + from oe.cve_check import update_symlinks cve_tmp_file = d.getVar("CVE_CHECK_TMP_FILE") @@ -179,7 +174,7 @@ python cve_check_write_rootfs_manifest () { import shutil import json from oe.rootfs import image_list_installed_packages - from oe.cve_check import cve_check_merge_jsons + from oe.cve_check import cve_check_merge_jsons, update_symlinks if d.getVar("CVE_CHECK_COPY_FILES") == "1": deploy_file = d.getVar("CVE_CHECK_RECIPE_FILE") diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index dc7d2e2826..aa06497727 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py @@ -163,3 +163,13 @@ def cve_check_merge_jsons(output, data): return output["package"].append(data["package"][0]) + +def update_symlinks(target_path, link_path): + """ + Update a symbolic link link_path to point to target_path. + Remove the link and recreate it if exist and is different. + """ + if link_path != target_path and os.path.exists(target_path): + if os.path.exists(os.path.realpath(link_path)): + os.remove(link_path) + os.symlink(os.path.basename(target_path), link_path) From patchwork Wed Jun 8 14:39:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9004 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 53C95CCA47B for ; Wed, 8 Jun 2022 14:40:09 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.7224.1654699200772245583 for ; Wed, 08 Jun 2022 07:40:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=BQnnvUpf; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id l20-20020a17090a409400b001dd2a9d555bso18521025pjg.0 for ; Wed, 08 Jun 2022 07:40:00 -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=drLWR4ndQRQwwEoHrYbEEZoqyr6k6qwuqvYaSQNr8+A=; b=BQnnvUpf8PBPX2kq0VNgcyzu52c4Hk8MOz8dPlRkp/NdjPMBRmvr2FpiIiADZynAry fO1xejL2HzQI7CXhYS0JL3n3OZMeM5LulxqTu2OMNHOWMPWjPp2SQZd/v5Y+iiA4T0DL RLvthz2MwKjNe/lRfHNx6Vm9Q0eb1YQHTa9wvGQDLMiEGNKg5p+OuK23ikUjphX0Q4lx krDYefO4sTDHFQ5+WzR0BIXGBNC7ya3eyypSXGlQPyUlTxjDvGiFpZpGA4R2/GbsXfaO oJibx1dH4q5cFQM6pXgrXIOKk3ss/jpdncxUtBAP7U/WxiurPialGWC+MzLDKEd13uDx /3kA== 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=drLWR4ndQRQwwEoHrYbEEZoqyr6k6qwuqvYaSQNr8+A=; b=k+e9sc+3eMPKxXsTSKrUAuDZfKhHNp9kaNTzkMPMrP1Igw3g+MGU+pqnMAx5VNiBlt +LG0hQw6RX3XgQlXJ6vhkrNWoUkWBMTOpkLP1q8G+WN85++Lh8Pvhm4t+n1XqtyC2QCJ BQa4RDnafdX2TIDB8p1U/+7L01dYM9nyeP0F6C2s/9ajm7OQwTlwgmViaPZzcJIdVvnC NB6KD8U4M0qENich32JUbi9IS5FgP+xzdoCTzk2JmenEAGp4lzRn1QeMmQvl+5r3gLiJ 0PavTOczEl0YTZELRzkB6U1r/tqSlBWzXkR+j+HDhcL63FOzpgGMi/TblPv79lkFN+NB V9TA== X-Gm-Message-State: AOAM533kMHjDlEpQm25liF3r5j0n+BHuvJuQv23X/S2Sviwtc/s9yPRT nDYi/CnNyWCFjivhufm/6+m5SYlCBxD2rrET X-Google-Smtp-Source: ABdhPJzZZPC9lTnMxxgDtAbj3FFPCeTqaju2SCLGfSCcsPBsYUJ5BpZpHnMr43SFymnJGZ7Qt9FyMA== X-Received: by 2002:a17:90a:5d04:b0:1df:91d7:5563 with SMTP id s4-20020a17090a5d0400b001df91d75563mr72988025pji.95.1654699199677; Wed, 08 Jun 2022 07:39:59 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.39.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:39:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/22] cve-check: write empty fragment files in the text mode Date: Wed, 8 Jun 2022 04:39:15 -1000 Message-Id: <79c02facd3f248122b4b7a6bd00192151e4a6406.1654698895.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 ; Wed, 08 Jun 2022 14:40:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166713 From: Marta Rybczynska In the cve-check text mode output, we didn't write fragment files if there are no CVEs (if CVE_CHECK_REPORT_PATCHED is 1), or no unpached CVEs otherwise. However, in a system after multiple builds, cve_check_write_rootfs_manifest might find older files and use them as current, what leads to incorrect reporting. Fix it by always writing a fragment file, even if empty. Signed-off-by: Marta Rybczynska Signed-off-by: Richard Purdie (cherry picked from commit f1b7877acd0f6e3626faa57d9f89809cfcdfd0f1) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 3844efcddb..0c5f40b78d 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -435,23 +435,22 @@ def cve_write_data_text(d, patched, unpatched, ignored, cve_data): if unpatched_cves and d.getVar("CVE_CHECK_SHOW_WARNINGS") == "1": bb.warn("Found unpatched CVE (%s), for more information check %s" % (" ".join(unpatched_cves),cve_file)) - if write_string: - with open(cve_file, "w") as f: - bb.note("Writing file %s with CVE information" % cve_file) - f.write(write_string) + with open(cve_file, "w") as f: + bb.note("Writing file %s with CVE information" % cve_file) + f.write(write_string) - if d.getVar("CVE_CHECK_COPY_FILES") == "1": - deploy_file = d.getVar("CVE_CHECK_RECIPE_FILE") - bb.utils.mkdirhier(os.path.dirname(deploy_file)) - with open(deploy_file, "w") as f: - f.write(write_string) + if d.getVar("CVE_CHECK_COPY_FILES") == "1": + deploy_file = d.getVar("CVE_CHECK_RECIPE_FILE") + bb.utils.mkdirhier(os.path.dirname(deploy_file)) + with open(deploy_file, "w") as f: + f.write(write_string) - if d.getVar("CVE_CHECK_CREATE_MANIFEST") == "1": - cvelogpath = d.getVar("CVE_CHECK_SUMMARY_DIR") - bb.utils.mkdirhier(cvelogpath) + if d.getVar("CVE_CHECK_CREATE_MANIFEST") == "1": + cvelogpath = d.getVar("CVE_CHECK_SUMMARY_DIR") + bb.utils.mkdirhier(cvelogpath) - with open(d.getVar("CVE_CHECK_TMP_FILE"), "a") as f: - f.write("%s" % write_string) + with open(d.getVar("CVE_CHECK_TMP_FILE"), "a") as f: + f.write("%s" % write_string) def cve_check_write_json_output(d, output, direct_file, deploy_file, manifest_file): """ From patchwork Wed Jun 8 14:39:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9006 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 50BB3CCA47E for ; Wed, 8 Jun 2022 14:40:09 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.7228.1654699203213415335 for ; Wed, 08 Jun 2022 07:40:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=onJGuKuc; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d13so2147256plh.13 for ; Wed, 08 Jun 2022 07:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=eGi4FwQt/CWPzaA66UAe34BGhu5slEfYhiljgFU8N3w=; b=onJGuKucBrUnS/6KdH1f8H0NTJOCqosFJLfcWL6P6rqmWkGsjwJKKdh8PopkTvkEur kMS4qZb7oiTYmYFrjBgKur0UA1raGrVienapDC/8RXNpmSd/IKQ/pSGbqLkAmq6goZWk pZVu9uflUUEdTqGwUol+K5OHXkSVlM18wnbMYN8GkdkcKgzUmmZ3U83bqG4NU34/iseI z7UDPpv/DA6QRE0R1E43O+rfLLqMUO9dmfLpLSTUsDIYM17WOcwyTrl4V7/Zvy5RnPNg G5vwRdCER2okG2BEKmbwJZOCbWnl6aL8nrV0fFXATAb99/ISk+8fSp4EaTLnVgrPHHx4 FxZg== 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=eGi4FwQt/CWPzaA66UAe34BGhu5slEfYhiljgFU8N3w=; b=VNPovfw2podn1HnFdZE5RpedQyq9zyhAFFVuZruFs8TtmB/OFSwLV5VvWR83t1gWQy KGpm1O14EM17JPS6MdqPRsQKJRiPZ3PBUlTdWErKwPFxfqkq3EATjU0zh12YJw/+zk3r sXFSd2skZpU1uWWGG8bjO08xcmxgWuda2e3RiP7c90eu4idNxzEMfIMulqkJ9YOnloty PcP8uqJYunu1QsYzNPfiV1uVE5H3q1p8J1wm2YIwswxZE5dzf0BDYdO6uyKFQ55+Eo8K Vdwjfejm/UUIGKd4Yln+YaT6ZO6nbLCaDRQZvlQBiXdleMLTOowdDyRUeZK6wGtrjkSN mPEw== X-Gm-Message-State: AOAM532j3FHeW0VYCaIF+448iolCbK/WUXeguKVs+QL6h3O8CI4D/XSo OpWieCegzOToeDWVRoZK8ut/ndT+n4G2QdhK X-Google-Smtp-Source: ABdhPJxx8ipuI5EHuP3gwUcnr/8UmrOUY+I6FJnENnOVRVDDHJxprme24cyIFpg1S5+LwH1sliDVDQ== X-Received: by 2002:a17:90b:2241:b0:1e8:8ad8:5f22 with SMTP id hk1-20020a17090b224100b001e88ad85f22mr15544382pjb.73.1654699202274; Wed, 08 Jun 2022 07:40:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/22] cve-check: fix return type in check_cves Date: Wed, 8 Jun 2022 04:39:16 -1000 Message-Id: <2fc716ad75dcc59000dcc18143f06bcdf43be242.1654698895.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 ; Wed, 08 Jun 2022 14:40:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166714 From: Marta Rybczynska Make empty return types in check_cvs the same for all code paths. Signed-off-by: Marta Rybczynska Signed-off-by: Richard Purdie (cherry picked from commit f86393c93dec47b24e837d0c4c5761a716ecdbb6) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 0c5f40b78d..1b4910f737 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -264,7 +264,7 @@ def check_cves(d, patched_cves): products = d.getVar("CVE_PRODUCT").split() # If this has been unset then we're not scanning for CVEs here (for example, image recipes) if not products: - return ([], [], [], {}) + return ([], [], [], []) pv = d.getVar("CVE_VERSION").split("+git")[0] # If the recipe has been skipped/ignored we return empty lists From patchwork Wed Jun 8 14:39:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9005 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 5154FCCA47F for ; Wed, 8 Jun 2022 14:40:09 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web12.7280.1654699205704826136 for ; Wed, 08 Jun 2022 07:40:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mV28khcH; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id hv24-20020a17090ae41800b001e33eebdb5dso16154254pjb.0 for ; Wed, 08 Jun 2022 07:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=irI0wu9WqLOkBUUzICNg23LruZXecGyDrTu8d51pctk=; b=mV28khcHmkN4ovMrwGlyVhJ6se251ffpQKPvoVhNo5hNkUXNr/JA0xXJe1j81uuYf/ Oa5PuGA5OYT5xJhFbL/HSqSoesFUkxsQ8rOrkmWJfLeWIkhVI6K+AXe2tKLpoBSeSXgJ QZh+AbWL4RqPLgrLl9ZOzDc68vLImE3YQS1EIUn3J5LpT/OSm1C16ugRXlYUN70I0u05 +hsxdBHUNVchngpjZR0n99tWB/NCPBAYnlsmK0UQN5CSKgRtvVzMxbaaJRNXeoExMcPt oYccpBwhh0135MB3H/C7wtLD47YsjZV/QOYui4zzHkRFIA7OkT7tBxcsr0YDSZ+GEVoY MCZg== 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=irI0wu9WqLOkBUUzICNg23LruZXecGyDrTu8d51pctk=; b=kbD3bgzq5lGerk2IbMgoUGWxIlBcDGD6ufowmtGJMrsiyR5lQalCkmbroTsQegwXS3 cDYPONQTwdgxTr2At+Oz/DlMI3UNrYd1A1Qt6I5akXwz+anDawHz4Sv9dvFzR0csCwRP wdVNoLHnL1jlBE1FdHR+bqwGyboGAkYxDnb77ZeMU0poOUZUkPQuoeDN/cJt2X+S+ENx 5AROsRFjsmpj6VRYJ1z0fAoEm54xABVlsHgUiuhPywjMwkGRqjZYlTwLXgCjhID2wn8I C65rY1tCnG0jEsvGThw0/RrSW860+LPbDz28r3rmx6Qu/vV/PC6qnACPDWlkkIAm5XzG IzWg== X-Gm-Message-State: AOAM530NqRqof+zb2MhVCFQarAkw4e8xfqXLP0/7GCZjOyVfPXRNKl2e /xDyI+aW/XUhwTtRlF9/w775rvZ/pYCEqhIc X-Google-Smtp-Source: ABdhPJx+9QuW5JmK71JeKd1DdqZJlaxfTqlIKlZP0zQEJyAA6N4x0nzyie/a9s6+ytdqtmDokWSw3g== X-Received: by 2002:a17:902:d044:b0:166:4d45:2b0c with SMTP id l4-20020a170902d04400b001664d452b0cmr30023394pll.99.1654699204564; Wed, 08 Jun 2022 07:40:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/22] cve-update-db-native: make it possible to disable database updates Date: Wed, 8 Jun 2022 04:39:17 -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 ; Wed, 08 Jun 2022 14:40:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166715 From: Marta Rybczynska Make it possible to disable the database update completely by using a negative update interval CVE_DB_UPDATE_INTERVAL. Disabling the update is useful when running multiple parallel builds when we want to have a control on the database version. This allows coherent cve-check results without an database update for only some of the builds. Signed-off-by: Marta Rybczynska Signed-off-by: Richard Purdie (cherry picked from commit b5c2269240327c2a8f93b9e55354698f52c976f3) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-db-native.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index c8c1cbf115..18af89b53e 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -15,6 +15,7 @@ deltask do_populate_sysroot NVDCVE_URL ?= "https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-" # CVE database update interval, in seconds. By default: once a day (24*60*60). # Use 0 to force the update +# Use a negative value to skip the update CVE_DB_UPDATE_INTERVAL ?= "86400" python () { @@ -51,8 +52,9 @@ python do_fetch() { try: import time update_interval = int(d.getVar("CVE_DB_UPDATE_INTERVAL")) - if (update_interval < 0): - update_interval = 0 + if update_interval < 0: + bb.note("CVE database update skipped") + return if time.time() - os.path.getmtime(db_file) < update_interval: bb.debug(2, "Recently updated, skipping") return From patchwork Wed Jun 8 14:39:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9003 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 46827C43334 for ; Wed, 8 Jun 2022 14:40:09 +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.7233.1654699208210141816 for ; Wed, 08 Jun 2022 07:40:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=g2QFbMSh; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id w13-20020a17090a780d00b001e8961b355dso6791891pjk.5 for ; Wed, 08 Jun 2022 07:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=u7NUnP8We+3eYdLOhAzgBKX5kAziLKKHvx4nWuc05nw=; b=g2QFbMShNLOjAgVI3iI06TSuUeHQpuBBNOKoD0pFams9wliJJh5rn4KLvMWc2eN8JZ obgczxR9lUXsoJqdueRu9XrNnfuK2nGjTu3c9lZbU6uxfLtjcIgNwi52TnS5Zks7dRdI tMAuM2pgsqLI5/iOTX5KLn6vM/99Zlym9S6fMPVnXHd3Hcrx8VN8YvJYdg6+SJ27zgCq 4VBgOAgcNyYUCpXURc/we5snDPM2ocgZStlwtnRKVPL8++uHB4spVeAD1+9hA02QgJ4O cDcC8nUZGJ2a8g+auv7EJ0d3C5GsjIMbTETWWtiEgl9Mfv+dpuHu45wNDDEofVLmMdN2 PvzA== 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=u7NUnP8We+3eYdLOhAzgBKX5kAziLKKHvx4nWuc05nw=; b=71vzPmUir+TPCAjlVoEtdaAuS1GnqQEa0Qlt3RkJgdDR0kbmu8bTZsyJIkgj/XdAqi N3s36iKV9eVzaz3J+hqMFE67cQ/CiaYU4svKPa8LeE+6btHxsIM439hcNgpIVfTUus0n HLvE/k5K1gdiPqX+fX9dYV7naQ/D7clQTd6cdlXIFY+jqubMKAjmgcBjmrpx5+yW6DmR jQsGp9D9e4ef38ikVq7bM37nl/FHi0pbC1hDTZP+M/dC5jXE5kBytP4LnLCvGlAmchAu v1VJN12p9zZEUeL+IKQAe41JVcaX3o/GpXxHonIrJU0zZwxakTQMeiJIMYo07ua7q7I5 ur4Q== X-Gm-Message-State: AOAM533zEAuyYSxTaE89u3HC2iF/Eyb9OFABbfAOxoXQAB6BaPAj7XCw /yHZce4AFj4NGjkxTQETzaeNrUoIujTqoqzB X-Google-Smtp-Source: ABdhPJxIwZq2UII5VrG6iGF7WcTPRiFrwb6uTWoeFEN/OszJWIvVe4MA0RK8xeslrEfIUtLaeMxVWQ== X-Received: by 2002:a17:903:2308:b0:167:7030:6847 with SMTP id d8-20020a170903230800b0016770306847mr18666829plh.122.1654699206998; Wed, 08 Jun 2022 07:40:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/22] cups: upgrade 2.4.1 -> 2.4.2 Date: Wed, 8 Jun 2022 04:39:18 -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 ; Wed, 08 Jun 2022 14:40:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166716 From: wangmy Changelog: ========== - Fixed certificate strings comparison for Local authorization (CVE-2022-26691) - The cupsFileOpen function no longer opens files for append in read-write mode (Issue #291) - The cupsd daemon removed processing temporary queue (Issue #364) - Fixed delay in IPP backend if GNUTLS is used and endpoint doesn't confirm closing the connection (Issue #365) - Fixed conditional jump based on uninitialized value in cups/ppd.c (Issue #329) - Fixed CSS related issues in CUPS Web UI (Issue #344) - Fixed copyright in CUPS Web UI trailer template (Issue #346) - mDNS hostname in device uri is not resolved when installaling a permanent - IPP Everywhere queue (Issues #340, #343) - The lpstat command now reports when the scheduler is not running (Issue #352) - Updated the man pages concerning the -h option (Issue #357) - Re-added LibreSSL/OpenSSL support (Issue #362) - Updated the Solaris smf service file (Issue #368) - Fixed a regression in lpoptions option support (Issue #370) - The scheduler now regenerates the PPD cache information after changing the "cupsd.conf" file (Issue #371) - Updated the scheduler to set "auth-info-required" to "username,password" if a backend reports it needs authentication info but doesn't set a method for authentication (Issue #373) - Updated the configure script to look for the OpenSSL library the old way if pkg-config is not available (Issue #375) - Fixed the prototype for the httpWriteResponse function (Issue #380) - Brought back minimal AIX support (Issue #389) cupsGetResponse did not always set the last error. - Fixed a number of old references to the Apple CUPS web page. - Restored the default/generic printer icon file for the web interface. - Removed old stylesheet classes that are no longer used by the web interface. Signed-off-by: Wang Mingyu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6f4131e73553f47709e19871c23a411275ab3857) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/{cups_2.4.1.bb => cups_2.4.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/cups/{cups_2.4.1.bb => cups_2.4.2.bb} (51%) diff --git a/meta/recipes-extended/cups/cups_2.4.1.bb b/meta/recipes-extended/cups/cups_2.4.2.bb similarity index 51% rename from meta/recipes-extended/cups/cups_2.4.1.bb rename to meta/recipes-extended/cups/cups_2.4.2.bb index 27c88f82c7..f5ca749bac 100644 --- a/meta/recipes-extended/cups/cups_2.4.1.bb +++ b/meta/recipes-extended/cups/cups_2.4.2.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178" +SRC_URI[sha256sum] = "f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908" From patchwork Wed Jun 8 14:39:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9009 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 310EAC43334 for ; Wed, 8 Jun 2022 14:40:19 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.7235.1654699210293939756 for ; Wed, 08 Jun 2022 07:40:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XWPKHTUT; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id s14so17805079plk.8 for ; Wed, 08 Jun 2022 07:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Cco7bqsgvJecsFAIn1jhUXrBj5w5uVcot39rX6crB1A=; b=XWPKHTUTEoNShzY4Rde6rTyeuS5EB54yLlfQ8AhJ1gx/9e0vWit6zKWsKpgPi1dPl+ q00iuge0/hyxdCpIZjapWToIEjINeDKFKyVOdtcvc46m7W8E5QZjLvLZDx/AK6Ibcs2F uYLrL+oHKTgl9vJjM98YFjtzT+UnDY3z73qsH9lvZUy4d+s0jZAuSWu8AFVv2aBGmI1m ZbynrDiC5JR88NNjJCXDiP3n2I3alg1ifeMgC+OMlUrHJLyAyhRXSUvNYwaiVF3SN1A8 ka82XSRaPZm/qcRWAniGevky9X2lWs2Z0HI/YDAK+wzrqoZg2m/PcTqzuPog50hAY5be jb/g== 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=Cco7bqsgvJecsFAIn1jhUXrBj5w5uVcot39rX6crB1A=; b=4c2aQirNTs5AqD01V4ONpTBTfLW4d6hcbALvwKTTVZO3akm69QGULTio1DNIfwmWm1 4soPjrF7Lr6Pq1n/U4lEt7YS07TzbNSxNZJ2iUfpj8ehz7BesR+zja5bGg08Zj/5FyDs xRCPX7D9LH1MqxFcOV6b0ZySUQ3ChXJ4nF6by8o3ok88tgQDXH/GGRob3GPSpK5FVe8K o4p2bvvkncOQP+xbEnc6SBKlugo5scYnbppw3rQHCnkBZWF1H3uHGEymkvD7WNVYGhW1 u0k2WA2AKiDWIXM2zzENbFJv1+VVAZTO9C15DPBeZZmXGIKjNZewVN2UilGMfZWqpbMQ 4MdA== X-Gm-Message-State: AOAM531Eb3eG0cXh5zraJ/ZQPlNV2DJpXx8fUFmE563NrvUlUfRZB443 JlkhYGIcN0TMUZcSDAIHbstJSaBxmusi9+oc X-Google-Smtp-Source: ABdhPJyr0f2WTfkwxcZQL0gt+2Lr4DA34Tmo/BMWt1x0+WwRAzq19RyICDRo2Pe3wFSN7Gd0Ra2gGw== X-Received: by 2002:a17:902:ecca:b0:166:3e34:4d01 with SMTP id a10-20020a170902ecca00b001663e344d01mr33349767plh.97.1654699209250; Wed, 08 Jun 2022 07:40:09 -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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/22] logrotate: upgrade 3.19.0 -> 3.20.1 Date: Wed, 8 Jun 2022 04:39:19 -1000 Message-Id: <190457be2ee24a99da3a6383233ccc4b76dd2b0c.1654698895.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 ; Wed, 08 Jun 2022 14:40:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166717 From: wangmy Changelog: ========= drop world-readable permission on state file even when ACLs are enabled (#446) fix potential DoS from unprivileged users via the state file (CVE-2022-1348) fix a misleading debug message with copytruncate and rotate 0 (#443) add support for unsigned time_t (#438) do not lock state file /dev/null (#433) Signed-off-by: Wang Mingyu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 391fdcf742c4669c1c4654f9b022b3d277aa0038) Signed-off-by: Steve Sakoman --- .../logrotate/{logrotate_3.19.0.bb => logrotate_3.20.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/logrotate/{logrotate_3.19.0.bb => logrotate_3.20.1.bb} (97%) diff --git a/meta/recipes-extended/logrotate/logrotate_3.19.0.bb b/meta/recipes-extended/logrotate/logrotate_3.20.1.bb similarity index 97% rename from meta/recipes-extended/logrotate/logrotate_3.19.0.bb rename to meta/recipes-extended/logrotate/logrotate_3.20.1.bb index 2a60d9b31f..35977535aa 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.19.0.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.20.1.bb @@ -15,7 +15,7 @@ UPSTREAM_CHECK_REGEX = "logrotate-(?P\d+(\.\d+)+).tar" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "ddd5274d684c5c99ca724e8069329f343ebe376e07493d537d9effdc501214ba" +SRC_URI[sha256sum] = "742f6d6e18eceffa49a4bacd933686d3e42931cfccfb694d7f6369b704e5d094" # These CVEs are debian, gentoo or SUSE specific on the way logrotate was installed/used CVE_CHECK_IGNORE += "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550" From patchwork Wed Jun 8 14:39:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14249 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 07/22] glib-2.0: upgrade 2.72.1 -> 2.72.2 Date: Wed, 8 Jun 2022 04:39:20 -1000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Richard Purdie Bugs fixed: 2640 UWP warnings about extensions and verbs with glib 2.72.1 2605 Backport !2449 and !2600 mingw test fixes to glib-2-72 2616 Backport !2615 “Meson: Fix gio-windows-2.0 override name” to glib-2-72 2629 Backport !2626, !2627 minor leak fixes to glib-2-72 2643 Backport !2642 “meson: Check rres.compiled() before calling rres.returncode()” to glib-2-72 2644 Backport !2631 “Cast to guintptr instead of subtracting by null” to glib-2-72 2662 Backport !2654 “gtask: use g_strconcat() in g_task_return() only if needed” to glib-2-72 2691 Backport !2661 “win32appinfo: change log level from warning to debug” to glib-2-72 Translation updates: Croatian Danish English (United Kingdom) French Galician German Nepali Portuguese (Brazil) Signed-off-by: Richard Purdie (cherry picked from commit 780d40c9cc98fd5e9369be974acbbb60d7531a60) Signed-off-by: Steve Sakoman --- meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 2 +- .../glib-2.0/{glib-2.0_2.72.1.bb => glib-2.0_2.72.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.72.1.bb => glib-2.0_2.72.2.bb} (96%) 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 816b790ce7..fb50fff6a5 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 d52b1b530c5d8a1e70ae45d6e2139e9d3f25207f Mon Sep 17 00:00:00 2001 +From a30eb17c20e070124b55523d86729348f2929f95 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 diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.72.2.bb similarity index 96% rename from meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.72.2.bb index c9ccedd81f..c4a8a4b8ad 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.72.2.bb @@ -19,7 +19,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2" +SRC_URI[sha256sum] = "78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. From patchwork Wed Jun 8 14:39: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: 9008 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 3112CCCA47B for ; Wed, 8 Jun 2022 14:40:19 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web12.7281.1654699215361002971 for ; Wed, 08 Jun 2022 07:40:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=AdRqB701; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id x4so9953269pfj.10 for ; Wed, 08 Jun 2022 07:40: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=oQuZ/xHLRIiqhJ6LpEHMkvqt+ijwxT/ZbRLUoEaurRI=; b=AdRqB701vfYaHgjuSej55Y2wy28IiB2zWXFjsuICHo7boDyqccbweikxoMUDVOtWUl ydg0sr2YIsHd05ipl0E7s/bBNw3vQzuJcXGUdIqpgdaCi5ameS62I//AXvQcTqfu3Ka1 bEC4MBWBCGK0Y3FMtlCqQRTtfR/eJfKGTtdaNE6GJFi2J8bKsYbNSZEGkFThSjIuQuj7 DTuELPQnAHuPhawEAv7pTV2uAJ+E2IGbEfJ6h4BWH9n2LDO3m87KCXdQGuuVVJmaKs2y TOL3J8hlrolg+3+3me54aQWznvItEMVKuIMZm2+JcyPC+SvkgIq+rYZ487vqoqsdNHWX qy8w== 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=oQuZ/xHLRIiqhJ6LpEHMkvqt+ijwxT/ZbRLUoEaurRI=; b=N4la8CCMMbEUjG/IxPxgzK4th/BczEgKUg0v6byJij3QvOgrI2VSIKpooPHk4Nqj8P skWzihGHhZ0M76CGy7bb5w/Y9OPv5ZmRwVBt0SBeuwZagRHwreK+AbT3Ue0HYWjBLObJ 8oJ8zX/X/Un12ti6XlgFVHMYa0/P4QXBYejX1seP9l+hyuMzGRIj+7k8Megt6fiQ8fG2 DX7hlfRkUOkSy6IaOUUjkfGa8KbNhtafkPftyWgjDaP+6vG1YVwtpOdQZI3mMcdkyW2Q W95iVbAzUSVJ+2EOR/fSWaS1tSgQbkqi2Ka7AcO8yWNQxgymZnFtjHYoTejManLUmhWg rqaw== X-Gm-Message-State: AOAM53157xx6dpDWxBNRShTtoyri858jRBzNiCRGOWm9E5RcswOakH3r AMFXD9OMDDAUS0+Zey9FvssIYA5L4WbTZmr9 X-Google-Smtp-Source: ABdhPJx+/sKdbSz/y/4jXuwkwKRLfpFr5W8FFBeygAbEvrFceq0xWvWe/CH67GWjKvr7waVbwmMPpA== X-Received: by 2002:a63:ef41:0:b0:3fb:c201:797d with SMTP id c1-20020a63ef41000000b003fbc201797dmr31246705pgk.104.1654699214326; Wed, 08 Jun 2022 07:40:14 -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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/22] libxkbcommon: upgrade 1.4.0 -> 1.4.1 Date: Wed, 8 Jun 2022 04:39:21 -1000 Message-Id: <9311e798437c44f64f0256dd894a8173cb8b465d.1654698895.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 ; Wed, 08 Jun 2022 14:40:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166719 From: Richard Purdie libxkbcommon 1.4.1 - 2022-05-21 ================== - Fix compose sequence overriding (common prefix) not working correctly. Regressed in 1.2.0. - Remove various bogus currency sign (particulary Euro and Korean Won) entries from the keysym <-> Unicode mappings. They prevented the real keysyms/codepoints for these from mapping correctly. Signed-off-by: Richard Purdie (cherry picked from commit 75655c8b48b425beb42b23d8e596d3c987047792) Signed-off-by: Steve Sakoman --- .../xorg-lib/{libxkbcommon_1.4.0.bb => libxkbcommon_1.4.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_1.4.0.bb => libxkbcommon_1.4.1.bb} (94%) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.4.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.4.1.bb similarity index 94% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_1.4.0.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_1.4.1.bb index 34652e9c4e..89093e6786 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.4.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.4.1.bb @@ -9,7 +9,7 @@ DEPENDS = "flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031" +SRC_URI[sha256sum] = "943c07a1e2198026d8102b17270a1f406e4d3d6bbc4ae105b9e1b82d7d136b39" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" From patchwork Wed Jun 8 14:39:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14250 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 09/22] gtk+3: upgrade 3.24.33 -> 3.24.34 Date: Wed, 8 Jun 2022 04:39:22 -1000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Richard Purdie Overview of Changes in GTK+ 3.24.34, 05-18-2022 =============================================== * Include legacy hicolor icons * Fix the build with gcc 12 * MacOS: - Restore QUARTZ_RELOCATION support * X11: - Trap errors when getting output properties * Wayland: - Ignore empty preedit updates This fixes a problem with textview scrolling * Translation updates Danish Dutch French German Hungarian Italian Kazakh Latvian Lithuanian Norwegian Bokmål Swedish Signed-off-by: Richard Purdie (cherry picked from commit a652d392a47aa7c0652aac941fb7d550aea192ae) Signed-off-by: Steve Sakoman --- meta/recipes-gnome/gtk+/{gtk+3_3.24.33.bb => gtk+3_3.24.34.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-gnome/gtk+/{gtk+3_3.24.33.bb => gtk+3_3.24.34.bb} (89%) diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.33.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.34.bb similarity index 89% rename from meta/recipes-gnome/gtk+/gtk+3_3.24.33.bb rename to meta/recipes-gnome/gtk+/gtk+3_3.24.34.bb index fb9e29dd8c..f862e143d4 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.33.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.34.bb @@ -7,7 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801" +SRC_URI[sha256sum] = "dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec" S = "${WORKDIR}/gtk+-${PV}" From patchwork Wed Jun 8 14:39: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: 9013 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 3EB2FCCA483 for ; Wed, 8 Jun 2022 14:40:29 +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.7233.1654699208210141816 for ; Wed, 08 Jun 2022 07:40:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XqiC2Zdx; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id w13-20020a17090a780d00b001e8961b355dso6791891pjk.5 for ; Wed, 08 Jun 2022 07:40: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=8l7JY0F2p1ndCw1M+yqq/KQ1FhpKIJTJD0PNhmoz790=; b=XqiC2Zdxd+ZIIUP6fXJS0W/fTkxRCOpCdkv5xt4DQeKcn7RMMCASlUnutHfnAgRd0I w0FX9JKKczf3tJGN6yUER0R9GBGLGerLb1f47GuLNJVZGSmYczaptSTqAVhWiuUJC+gZ 6hmJ1xvPMoR0E982U0URiQBijaeZplmWeBscpcT4Gsi4QPiD9W/LTTWqUKsHBfsNKfXW P0WP73lE9J9sEGWroCS7rgClCkBglNkPp8RGyX6vNatyn/7xbRDcC/6vYOtq1JcNxN2d iedA1czq8E9JzN2RKfu+TvN2nWI+OMXvLRNaudp7mptXCLgHtDjjqf+2uvVaH1/BYX/O 2b0A== 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=8l7JY0F2p1ndCw1M+yqq/KQ1FhpKIJTJD0PNhmoz790=; b=jCulyBWAFUPJYr3hnYXVd8gIECpDYD5hB39n8fgIj4J9QC3ivNK8E/6hOhDR462QHw FQzY5D3Mh3uuWi3eihxiIMNl4le5mc/scUboBV+XyzYhPN7ncJYbSl1GQRf5LuUWH9Ae AX+olbKkRmNxjAoDBhAhd8RwTq0L1KeACtYT/0dwILm6lvIAS2FMF/P6f65v4F5Kej26 ZqDRK1I/Mk3LnwgxNRw2QbsPSn2g+qMkQnJFjTnn94TMN6rrzPHUFG6vGe3LlGTfFsza G8vEeuT+3ciJLbXnrTT36kZHkYta0TeZw6y5ci0fJwuguyF0KH9Ui3v3+a61+tkrHuAv eLUw== X-Gm-Message-State: AOAM533Yyco+TbPPCU+IE4skVS0FAqc+I0eFBER9goqnIOeB8MU7ISOI rDGxDNfap9HH6oJX+TapERaKHIkKaDNpFDg0 X-Google-Smtp-Source: ABdhPJwJXFTCcFx882JqGKvBVZGQWkky4OcHEp1XMtu4TQFZ3Epn/0h41mZmPol08kO1mfqAufWDCw== X-Received: by 2002:a17:903:22d1:b0:166:4bc1:a1da with SMTP id y17-20020a17090322d100b001664bc1a1damr30489898plg.13.1654699219084; Wed, 08 Jun 2022 07:40:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/22] webkitgtk: upgrade 2.36.1 -> 2.36.3 Date: Wed, 8 Jun 2022 04:39:23 -1000 Message-Id: <4e5437696e422631a1ae042f18412461242ef62e.1654698895.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 ; Wed, 08 Jun 2022 14:40:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166721 From: Richard Purdie This is a bug fix release in the stable 2.36 series. Support capturing already encoded video streams, which takes advantage of encoding done in hardware by devices which support this feature. Avoid using experimental GStreamer elements for video demuxing. Avoid using the legacy GStreamer VA-API decoding plug-ins, which often cause rendering issues and are not much maintained. Their usage can be re-enabled setting WEBKIT_GST_ENABLE_LEGACY_VAAPI=1 in the environment. Fix playback of YouTube streams which use dynamic ad insertion. Fix display capture with Pipewire. Fix the build without the X11 target when X11 headers are not present. Fix several crashes and rendering issues. Signed-off-by: Richard Purdie (cherry picked from commit 69e1c72417a4ea5594c17ead7bff2f9a0298e6c5) Signed-off-by: Steve Sakoman --- .../webkit/{webkitgtk_2.36.1.bb => webkitgtk_2.36.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-sato/webkit/{webkitgtk_2.36.1.bb => webkitgtk_2.36.3.bb} (98%) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.36.3.bb similarity index 98% rename from meta/recipes-sato/webkit/webkitgtk_2.36.1.bb rename to meta/recipes-sato/webkit/webkitgtk_2.36.3.bb index 65757c36a7..83b6f8a6ee 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.36.3.bb @@ -17,7 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \ " -SRC_URI[sha256sum] = "0149ea5fb1d20f2a9981677d45c952a047330001ea24a8dc29035239f12c0c8f" +SRC_URI[sha256sum] = "732fcf8c4ec644b8ed28b46ebbd7c1ebab9d9e0afea9bdf5e5d12786afc478d1" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc From patchwork Wed Jun 8 14:39: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: 9012 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 3DA3CCCA47E for ; Wed, 8 Jun 2022 14:40:29 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web12.7283.1654699222504648117 for ; Wed, 08 Jun 2022 07:40:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Xjk5YSDB; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id g186so10194863pgc.1 for ; Wed, 08 Jun 2022 07:40: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=R6Aa/EmHgICQcRHyFtzR0757QCGmW7KDSKC4os3+dQs=; b=Xjk5YSDB/PfxSFariPmraXn+GHEiLWgHkTFUMmcftl2qU8t4RkLSO0YJa2iAuUS+GE Dr7OlmHVltpnLlel0LZ0uqaT6o6dDVd4MnuaXBAZWeVOsYKZtetF0e7HN3ZdjJ/LaL/q Q1EYZ5VfRHeD5CfUv979tWfERxdjEHG4TmRoMqkM23Vz0G0R2Rr3VBn2kGl0yRaJ6hzJ 7ZljwtFce0wtRGl8i6uMuA4ZUYCOmOgMiyNGpzZSRE19AVTBObTMp5TJfuuaGgeGmu2O W2qgex885sehQetbR0q3mqOOCzgN4LLb/mCrWBnD0TjojoKzpS7x7yxLe5AXlIoRium0 Q88Q== 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=R6Aa/EmHgICQcRHyFtzR0757QCGmW7KDSKC4os3+dQs=; b=Fl1by1j3/bAgr5+52lWelqg3qS74JC2wnONHA9DltTGoQKhsdo0l3roGoZuZWUYZNk cBu1B4fyBlASHPcPKXQlejyMMlutL0CbT1y/npwpgX2Cn2RJ00Ek1YEGSseskdtbidkH zPtetWNhOIGYDhe1wJci7D4m0kZvu/KeSR+LEYexcer7X+B/B48zbYW/r7tqn8Z1SN05 l8PWeIcXsK5xCOWKWaxP6mW7nWaFPgeFStHugHUvus/hcXmegbh8sWrPHAO4rhXGF5Yp g9/x6eOw9ui+e++j6gBS+xTtCgZRoGX9yp8w1g/yo4Te+mDapDvWy+GZo6AcZ96LjRZH 1VDQ== X-Gm-Message-State: AOAM533cFAyKJ55Xw4nUzkXiiz28bYxnOzUk+lWFy003MN4zEeytPlXz SlCNaMfEQPpXxcNTeEexCNMa4b34tJCQ06Nk X-Google-Smtp-Source: ABdhPJz6PYOuvByaFASG2euuqo70wY5feQoqOJztcB1aw0QKMai+KzhiMbUIA931Pjruo3bz4zphaQ== X-Received: by 2002:a63:2bc4:0:b0:3fa:cc63:415e with SMTP id r187-20020a632bc4000000b003facc63415emr30353540pgr.465.1654699221440; Wed, 08 Jun 2022 07:40: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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/22] linux-firmware: package new Qualcomm firmware Date: Wed, 8 Jun 2022 04:39:24 -1000 Message-Id: <99c0d4b8f91c647f53b778a1802b856a64617a40.1654698895.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 ; Wed, 08 Jun 2022 14:40:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166722 From: Dmitry Baryshkov Create separate packages with firmware files for APQ8096 SoC and for Adreno 2xx/4xx. Include A330 firmware into the 3xx package. Signed-off-by: Dmitry Baryshkov Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 1a0cb8f9131d1f238dc150e583a7ff816645765f) Signed-off-by: Dmitry Baryshkov Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20220509.bb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb index 87d2efef12..7da5eca893 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb @@ -307,8 +307,9 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qcom-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ ${PN}-qcom-vpu-1.0 ${PN}-qcom-vpu-2.0 \ - ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ + ${PN}-qcom-adreno-a2xx ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a4xx ${PN}-qcom-adreno-a530 \ ${PN}-qcom-adreno-a630 ${PN}-qcom-adreno-a650 ${PN}-qcom-adreno-a660 \ + ${PN}-qcom-apq8096-audio ${PN}-qcom-apq8096-modem \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-qcom-sm8250-audio ${PN}-qcom-sm8250-compute \ ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \ @@ -961,11 +962,15 @@ FILES:${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" FILES:${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" FILES:${PN}-qcom-vpu-1.0 = "${nonarch_base_libdir}/firmware/qcom/vpu-1.0/*" FILES:${PN}-qcom-vpu-2.0 = "${nonarch_base_libdir}/firmware/qcom/vpu-2.0/*" -FILES:${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" +FILES:${PN}-qcom-adreno-a2xx = "${nonarch_base_libdir}/firmware/qcom/leia_*.fw" +FILES:${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a3*_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" +FILES:${PN}-qcom-adreno-a4xx = "${nonarch_base_libdir}/firmware/qcom/a4*_*.fw" FILES:${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" FILES:${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" FILES:${PN}-qcom-adreno-a650 = "${nonarch_base_libdir}/firmware/qcom/a650*.* ${nonarch_base_libdir}/firmware/qcom/sm8250/a650*.*" FILES:${PN}-qcom-adreno-a660 = "${nonarch_base_libdir}/firmware/qcom/a660*.*" +FILES:${PN}-qcom-apq8096-audio = "${nonarch_base_libdir}/firmware/qcom/apq8096/adsp*.*" +FILES:${PN}-qcom-apq8096-modem = "${nonarch_base_libdir}/firmware/qcom/apq8096/mba.mbn ${nonarch_base_libdir}/firmware/qcom/apq8096/modem*.* ${nonarch_base_libdir}/firmware/qcom/apq8096/wlanmdsp.mbn" FILES:${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES:${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" FILES:${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" @@ -977,11 +982,15 @@ RDEPENDS:${PN}-qcom-venus-5.2 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-5.4 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-vpu-1.0 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-vpu-2.0 = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-adreno-a2xx = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-adreno-a4xx = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a530 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a630 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a650 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a660 = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-apq8096-audio = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-apq8096-modem = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sdm845-audio = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sdm845-compute = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-sdm845-modem = "${PN}-qcom-license" From patchwork Wed Jun 8 14:39:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9011 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 3191ECCA47B for ; Wed, 8 Jun 2022 14:40:29 +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.web09.7313.1654699224628944417 for ; Wed, 08 Jun 2022 07:40:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=idh8vDLA; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id u2so18531516pfc.2 for ; Wed, 08 Jun 2022 07:40: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=65nrhbu6a1KFVgN7Y5JG/h1/IiTKfGK6ZzfXH/jPV4Q=; b=idh8vDLAeo/a7KPbq2pcQghEBtkUTYdDJyPwTk05oIVq6Aukzrh/iCFOisrnK3rBnM LjRfz6GJBJunnwb1qA5B1kI8QsPOvhZf3yVbjIyXnoxOTKcAZYrnWFL18w/v2Wj3ELeQ 8ljqIO990C52tTJfSnoo+9bFMbTZdoF8tSWWhKH/3hocAeKIc9pUsdhVv4+BxHrGOQ9F Hwb46XMfNGvurgM9UYyR/wDEh3ewgp+6DZvQRaNI6TEMlK7SmWRAiAongyvlgpY/ZYgz NtwaV6+GXs1kLSdbr6exTU04zBOYilMjtobhoC8t+TWmnqIpfu2wGuwrlyZpbyMzQ0xZ snyw== 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=65nrhbu6a1KFVgN7Y5JG/h1/IiTKfGK6ZzfXH/jPV4Q=; b=zzOYCYxvJwOF+cOOQrUJMbQtlM4sJPOW/la86x/i7lSKyKRUm0XfxpPUdlf7Sa/3Or uR+2627z2f2upMbQ3T1j/qrC6Sw/OmPH1qabNAXLUqk28WzDBIl31lNME2fpXjEtpPSw qlLSlTlAuqDqGqeoumE16kzp8gNSpiQpQbJo2kMXqAeEYsr3J0rb/gb9wMnQlgZiiMhI TCb06IVEqaMeaXl9HnZl5q5eliyr12vF0fyGSKJdjj3yFCNlKkX8ms7yxp/Buz/LkpDv 9+RB7f9r+Gr/drTS3bQabV6TgOxLvIs2T2y+h+tuD1u4hRecMqR9YwQ+PLGKS1/E2dCP xudw== X-Gm-Message-State: AOAM530H0RStJbhK0ooI/OSklpz2mGNRxewXSrXQzDWu0DCWgb7zVd/f YSt/qfygbAxPTZUNCgbnfQyDz85H16qccHU5 X-Google-Smtp-Source: ABdhPJyn6Kp8lHoIBwoUAcjWpdyhK2drxOQOdJINIfz4ekmc7HuLcVgkGSx0fm7kPD4yBWFts/J7BQ== X-Received: by 2002:a05:6a00:1ad4:b0:51c:7852:2bd1 with SMTP id f20-20020a056a001ad400b0051c78522bd1mr797426pfv.2.1654699223578; Wed, 08 Jun 2022 07:40: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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/22] linux-firmware: split ath3k firmware Date: Wed, 8 Jun 2022 04:39:25 -1000 Message-Id: <324e4f598c0e59ba2376d5fd76068eedac17b0d3.1654698895.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 ; Wed, 08 Jun 2022 14:40:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166723 From: Dmitry Baryshkov Atheros AR3011 Bluetooth devices require special ath3k-1.fw firmware file. Package it separately from the main linux-firmware package to allow deploying this firmware on embedded devices. Signed-off-by: Dmitry Baryshkov Signed-off-by: Luca Ceresoli (cherry picked from commit a12a5606f4c7003d9a90c493380c656ee557dea5) Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20220509.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb index 7da5eca893..6e328e5726 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb @@ -270,7 +270,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-bcm4373 \ ${PN}-bcm43xx \ ${PN}-bcm43xx-hdr \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ ${PN}-gplv2-license ${PN}-carl9170 \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ \ @@ -320,6 +320,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ # For atheros LICENSE:${PN}-ar9170 = "Firmware-atheros_firmware" +LICENSE:${PN}-ath3k = "Firmware-atheros_firmware" LICENSE:${PN}-ath6k = "Firmware-atheros_firmware" LICENSE:${PN}-ath9k = "Firmware-atheros_firmware" LICENSE:${PN}-atheros-license = "Firmware-atheros_firmware" @@ -328,6 +329,9 @@ FILES:${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_f FILES:${PN}-ar9170 = " \ ${nonarch_base_libdir}/firmware/ar9170*.fw \ " +FILES:${PN}-ath3k = " \ + ${nonarch_base_libdir}/firmware/ath3k*fw \ +" FILES:${PN}-ath6k = " \ ${nonarch_base_libdir}/firmware/ath6k \ " From patchwork Wed Jun 8 14:39: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: 9010 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 318EAC43334 for ; Wed, 8 Jun 2022 14:40:29 +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.web08.7307.1654699228435722956 for ; Wed, 08 Jun 2022 07:40:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5Rp+KkhE; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id d129so19060170pgc.9 for ; Wed, 08 Jun 2022 07:40: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=IaO/VR/GXKnaMfzMz4L2RpEo74Xmt/57IiMMRW3eUAU=; b=5Rp+KkhEMKMXTMbs29TUHG7bN5yistp4d3qDI4rqz2G8sBziykvqLMqm2pbGCscsWb 7PBBeeDt5smHOXMSqfWJdxQ3fgt/hacPaawucTYlgei5PmNdoMSVVA1iYA+beZvSPQWu i8IXdFLFM5FUK9NPOlwbzx3ig09FO1m8EfvBdRzLUy3JQtDEduWNKE8PXzv3D1wwkzLr JkerxIhIPEPG6zoelyVwtwwkakStXzscqgU01XJz9jEkvn0/CIBZV/qVGj4udgB/8Cay F/r7bKnSPmkty2l96nwrRP6nDPgx9G2MuB5wTLm5H2xxOVIJ4TRkhRcdHdRZJT6E277D G3ng== 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=IaO/VR/GXKnaMfzMz4L2RpEo74Xmt/57IiMMRW3eUAU=; b=A/4krLm53xvlXEw/2BLkQmmtLSntdFqOB9KiFPvj/MM1SGyf9e/rO2BZBLsllxwXEH e/EScWYKqwtf6MFbucRAijxuwibM4Ts63CjBnsuz3uMIsJgey7wJF0QJiMB88ukh6dED is9BNZo3wwhnfltcy0vvOHjh//nTCXyia5kqzPCj8SczuIVmhAIzH1HHLDeeLDh3rvut 6IQQpqG8wDLuu1v1Y97qRgvFtTCXjSxJZV0KkOOtGWZHav5mz8HtLpWXQmu4nGJgcHmT EjAAwZjg8eEM8C98R7GD0FORMhnOhB7oP2ZmdHTPxm14DLzkBG+pb7T6fqYchriJ7K78 ER3w== X-Gm-Message-State: AOAM533WBf4KGYoiMcbEu2hYUuiiBMZ3aHdOTKDX3YZFcU84kFPidrEo iOldx9XxPXRJI363BDiDvZKoWZ8Llu0Yn01K X-Google-Smtp-Source: ABdhPJx5VLDEo0qYeVRaEYiY59UbayGx1u8IpqUfJaK71RCRt0FrQIngy84VF58m5Pq57txvaiBlsQ== X-Received: by 2002:aa7:88cb:0:b0:51c:2627:2c03 with SMTP id k11-20020aa788cb000000b0051c26272c03mr14018355pff.63.1654699227350; Wed, 08 Jun 2022 07:40: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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/22] patch.py: make sure that patches/series file exists before quilt pop Date: Wed, 8 Jun 2022 04:39:26 -1000 Message-Id: <5323f0951923f201b0ad8f78aa3f42b8c3c97a17.1654698895.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 ; Wed, 08 Jun 2022 14:40:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166724 From: Martin Jansa * Since quilt upgrade to 0.67 some recipes sometimes fail in do_patch with errors like: ERROR: Applying patch 'GPLv2.patch' on target directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/keymaps/1.0-r31' CmdError('quilt --quiltrc /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/keymaps/1.0-r31/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: stderr: File series fully applied, ends at patch GPLv2.patch ') * It affects only recipes with S = "${WORKDIR}", which wipe only ${S}/patches, because in other cases whole ${S} is wiped when do_unpack is re-executed. * It was originally added in: https://git.openembedded.org/openembedded-core/commit/?id=5fe5e6a15f26f23f0c5b863fafad7a0d382a55e2 since then it was extended to wipe whole ${S} when ${S} != ${WORKDIR} in: https://git.openembedded.org/openembedded-core/commit/?id=5fe5e6a15f26f23f0c5b863fafad7a0d382a55e2 https://git.openembedded.org/openembedded-core/commit/?id=eccae514b71394ffaed8fc45dea7942152a334a1 this is now causing issues to quilt-0.67 because it checks that ${S}/patches/series exists during 'quilt pop -a -f' which we call from QuiltTree.Clean to undo patches possibly already applied in ${S} in previous do_patch execution. * There are couple recipes affected by this e.g. keymaps (.patch already removed in oe-core), makedevs (.patch removal sent to ML yesterday https://lists.openembedded.org/g/openembedded-core/message/166172), devmem2 (https://lists.openembedded.org/g/openembedded-devel/message/97270), but there are other recipes with S = "${WORKDIR}" where you can trigger this e.g. by having a .patch file in DISTRO layer .bbappend (e.g. tzdata with webOS https://github.com/webosose/meta-webosose/blob/06e5298d9f5c47679b679081d9930f8d1c776142/meta-webos/recipes-extended/tzdata/tzdata.bbappend#L10) This do_patch issue is caused by: https://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=8b39a960afcf45cd4f5804ae62b6b0656bdb191d introduced in kirkstone with: https://git.openembedded.org/openembedded-core/commit/?h=kirkstone&id=fa71afcee9ab42198c619333b77a15bd2ae02b20 The shortest sequence to reproduce this is just bitbake keymaps -c patch bitbake keymaps -c unpack -f bitbake keymaps -c patch with https://git.openembedded.org/openembedded-core/commit/?id=17d981005a0c0c97702ad88602b7181b69bcc9eb reverted. And the change in quilt behavior is causing QuiltTree.Clean (quilt pop -a -f) in: https://git.openembedded.org/openembedded-core/tree/meta/lib/oe/patch.py?id=17d981005a0c0c97702ad88602b7181b69bcc9eb#n601 to silently fail with "No series file found" before undoing the patches in ${S} and then quilt push failing, because all the patches are _still_ applied in ${S}. Removing ".pc" doesn't help, because we really need quilt's help to undo the patches (in this case to delete COPYING file from WORKDIR before applying the .patch which tries to add it again), because do_unpack cannot just wipe S and start over (because S == WORKDIR) - nor selectively removing the files listed in SRC_URI, because COPYING file isn't listed there. Using skip_series_check in 'quilt pop' (partially reverting the change from upstream) does fix this as well and it's simple one line patch (just adding skip_series_check=1 in pop.in), but might be difficult to upstream, because it's this strange OE specific behavior that we remove 'patches' directory and then still need quilt pop to work. Signed-off-by: Martin Jansa Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit c9d36882044b1c633d8611a77df54cd68c9bee25) Signed-off-by: Steve Sakoman --- meta/lib/oe/patch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 9034fcae03..95b915a6ab 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -598,6 +598,8 @@ class QuiltTree(PatchSet): def Clean(self): try: + # make sure that patches/series file exists before quilt pop to keep quilt-0.67 happy + open(os.path.join(self.dir, "patches","series"), 'a').close() self._runcmd(["pop", "-a", "-f"]) oe.path.remove(os.path.join(self.dir, "patches","series")) except Exception: From patchwork Wed Jun 8 14:39: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: 9016 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 311B4CCA47B for ; Wed, 8 Jun 2022 14:40:39 +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.7287.1654699230805625898 for ; Wed, 08 Jun 2022 07:40:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=c6CH7bfT; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id n18so17816507plg.5 for ; Wed, 08 Jun 2022 07:40: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=Y6XTLgPYP0oJTJUYgLDAFsukgKoH8Cx+3DgNXTreCBQ=; b=c6CH7bfTg1EYgVUvJemwHfIrbsodc4POodqCj5IFdC+xOpBs9BZF8n+pjG49HIk1xk imN5YdgnAIDKR1lNnyRlgOzK4VPHQEUCxRTS2do22hD/UvTlyGuTUDkODTcs8FalIrge kxb2CM7aR9RU+mrJdBXBqk9X8ZpUnzDywghiaTF2FpvfLVSVJy2EuCXDNWTXBwrb7MUA 0QrxjF9jAin6g7ww5aBG2GKatyYti45SlJe1SVU3+arx9KZl5Fg4qLeFlao+AbDUujtE yV4EXbn7XqY9dYwcRxT4pMSSk3L0TMctIudSusRpELqo2oLQPzAqYbJdGxCAWKgWSGsl 8sdw== 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=Y6XTLgPYP0oJTJUYgLDAFsukgKoH8Cx+3DgNXTreCBQ=; b=Bls4KYayLuHN1/j/BZ0dsy2D+rS03YDy4SK52WJ6ars1TDSo22TJxaeA8Kz7lqgt4y /YQzngYd7mCqTYeenscxNcJveQZaMVwNvrzgfMCgPhDjNuisWVWBaM80y/pD0Z24tnTI P8clg8w58Qj+/pqRsS68Ovtl+0oaH1WnsPcjZ0wc1yv/oV2+WGqX6K+oG0QIsChuOUeu pGmYV3WAPZAnC6E+IkVpxnPc2aABjSnhUyqJUQcrT5nu6pLbaR8m95uXHacqEmr24LUb QgYJgYvoO6E5hm32btVdjYil6t6bsw3ZKZq62ymcRUc9USs1/yv3fucs/1EDmStfkSWo 86kw== X-Gm-Message-State: AOAM530bCfT83n9DeCVNjT9XoRwpvkVriGAVKwCR7VNTK6hSImOH9ToE urk4cbc6zxaOdJsPxjxGhmu0hTDu4Mme2LpT X-Google-Smtp-Source: ABdhPJziYeBToJDZLeFPGdu0hipB6SPb07QRbLWgj+0UweKEdBikV98Xgd8hoFbbe8sqJybjyywPgQ== X-Received: by 2002:a17:90a:1c02:b0:1e0:df7:31f2 with SMTP id s2-20020a17090a1c0200b001e00df731f2mr74213122pjs.222.1654699229580; Wed, 08 Jun 2022 07:40: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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/22] openssl: Backport fix for ptest cert expiry Date: Wed, 8 Jun 2022 04:39: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 ; Wed, 08 Jun 2022 14:40:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166725 From: Richard Purdie ptests in in openssl have started failing as one of the test certificates has expired. Backport a fix for this from upstream, replacing the test certificate to allow the ptests to pass again. Signed-off-by: Richard Purdie (cherry picked from commit f26f0b34f12bbca2beed153da402a3594d127374) Signed-off-by: Steve Sakoman --- ...ea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch | 55 +++++++++++++++++++ .../openssl/openssl_3.0.3.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch diff --git a/meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch b/meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch new file mode 100644 index 0000000000..0249d4181b --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch @@ -0,0 +1,55 @@ +From 770aea88c3888cc5cb3ebc94ffcef706c68bc1d2 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Wed, 1 Jun 2022 12:06:33 +0200 +Subject: [PATCH] Update expired SCT issuer certificate + +Fixes #15179 + +Reviewed-by: Matt Caswell +Reviewed-by: Dmitry Belyavskiy +(Merged from https://github.com/openssl/openssl/pull/18444) + +Upstream-Status: Backport +[Fixes ptest failures in OE-Core] +--- + test/certs/embeddedSCTs1_issuer.pem | 30 ++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/test/certs/embeddedSCTs1_issuer.pem b/test/certs/embeddedSCTs1_issuer.pem +index 1fa449d5a098..6aa9455f09ed 100644 +--- a/test/certs/embeddedSCTs1_issuer.pem ++++ b/test/certs/embeddedSCTs1_issuer.pem +@@ -1,18 +1,18 @@ + -----BEGIN CERTIFICATE----- +-MIIC0DCCAjmgAwIBAgIBADANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJHQjEk ++MIIC0jCCAjugAwIBAgIBADANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJHQjEk + MCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENBMQ4wDAYDVQQIEwVX +-YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAeFw0xMjA2MDEwMDAwMDBaFw0yMjA2MDEw +-MDAwMDBaMFUxCzAJBgNVBAYTAkdCMSQwIgYDVQQKExtDZXJ0aWZpY2F0ZSBUcmFu +-c3BhcmVuY3kgQ0ExDjAMBgNVBAgTBVdhbGVzMRAwDgYDVQQHEwdFcncgV2VuMIGf +-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVimhTYhCicRmTbneDIRgcKkATxtB7 +-jHbrkVfT0PtLO1FuzsvRyY2RxS90P6tjXVUJnNE6uvMa5UFEJFGnTHgW8iQ8+EjP +-KDHM5nugSlojgZ88ujfmJNnDvbKZuDnd/iYx0ss6hPx7srXFL8/BT/9Ab1zURmnL +-svfP34b7arnRsQIDAQABo4GvMIGsMB0GA1UdDgQWBBRfnYgNyHPmVNT4DdjmsMEk +-tEfDVTB9BgNVHSMEdjB0gBRfnYgNyHPmVNT4DdjmsMEktEfDVaFZpFcwVTELMAkG +-A1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRyYW5zcGFyZW5jeSBDQTEO +-MAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW6CAQAwDAYDVR0TBAUwAwEB +-/zANBgkqhkiG9w0BAQUFAAOBgQAGCMxKbWTyIF4UbASydvkrDvqUpdryOvw4BmBt +-OZDQoeojPUApV2lGOwRmYef6HReZFSCa6i4Kd1F2QRIn18ADB8dHDmFYT9czQiRy +-f1HWkLxHqd81TbD26yWVXeGJPE3VICskovPkQNJ0tU4b03YmnKliibduyqQQkOFP +-OwqULg== ++YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAgFw0yMjA2MDExMDM4MDJaGA8yMTIyMDUw ++ODEwMzgwMlowVTELMAkGA1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRy ++YW5zcGFyZW5jeSBDQTEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW4w ++gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANWKaFNiEKJxGZNud4MhGBwqQBPG ++0HuMduuRV9PQ+0s7UW7Oy9HJjZHFL3Q/q2NdVQmc0Tq68xrlQUQkUadMeBbyJDz4 ++SM8oMczme6BKWiOBnzy6N+Yk2cO9spm4Od3+JjHSyzqE/HuytcUvz8FP/0BvXNRG ++acuy98/fhvtqudGxAgMBAAGjga8wgawwHQYDVR0OBBYEFF+diA3Ic+ZU1PgN2Oaw ++wSS0R8NVMH0GA1UdIwR2MHSAFF+diA3Ic+ZU1PgN2OawwSS0R8NVoVmkVzBVMQsw ++CQYDVQQGEwJHQjEkMCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENB ++MQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHRXJ3IFdlboIBADAMBgNVHRMEBTAD ++AQH/MA0GCSqGSIb3DQEBCwUAA4GBAD0aYh9OkFYfXV7kBfhrtD0PJG2U47OV/1qq +++uFpqB0S1WO06eJT0pzYf1ebUcxjBkajbJZm/FHT85VthZ1lFHsky87aFD8XlJCo ++2IOhKOkvvWKPUdFLoO/ZVXqEVKkcsS1eXK1glFvb07eJZya3JVG0KdMhV2YoDg6c ++Doud4XrO + -----END CERTIFICATE----- diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.3.bb b/meta/recipes-connectivity/openssl/openssl_3.0.3.bb index fd88ae807d..35a62755ad 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.3.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.3.bb @@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ + file://770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Wed Jun 8 14:39: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: 9018 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 38DE6C433EF for ; Wed, 8 Jun 2022 14:40:39 +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.7287.1654699230805625898 for ; Wed, 08 Jun 2022 07:40:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7LCvAwrC; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id n18so17816507plg.5 for ; Wed, 08 Jun 2022 07:40: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=Jx7YVzMI35uGAl9V7RsxhqHmYzkN5B6v69kLgj7ewZ4=; b=7LCvAwrCiGzWpPWhmjbJSiPMn/tXyHSNjK441TUYri/8toUb3Xs6qp9cdIDXKJ316H 7Bbjqo63CNbkyX2OEUjkqzS2rlIxFcnztkh82X6b3QKYC72xLAmFH/zxcOlmYFCsKr8r hoMP6q+6qHh0mbWT8xvUp72XYQhPTfZfMQVlBBv3QWucm1N641+SXu49OU5bBnCIwpjp JQs5lqGOMQZZQKlM/QXLIYn18cThfJA0X5JrtPrnKyX9DEwlVmNsVCedtCIZ24sHeJwE i4Ic1/SUUcT3M5ax37sqCOy5PB5mjk+gSe+6Pk+vas142UjQmNbo3uphU4BePxGChiC5 XxCA== 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=Jx7YVzMI35uGAl9V7RsxhqHmYzkN5B6v69kLgj7ewZ4=; b=d11Io9AV4ufUPIbltgNHal+D3oQBQsk+mk6UDU+i4pcx2mUKvx0d5BK8Kj7o4WnZYY jgv/Of/9wEDSj0Gif41Maq88g/k2EsW0ZcIFIT86gMN0DVwynev6QN0gCf+Xmrk/BAVy YRCVX4PPc/Q0K4JEqxdBXxCFimMMPYYgZbeCDZS8a5qdDbaylYHglx2N7XV1bUzQ2ceN lKtdErnvC8oFxDDFaKraKhqN+LzNBYSiRftfGefKEf+7FCI8xy2oKMVWDgmnYK5+6xEA 95IWE/0uFoUA2Wi8OrPyMcw/zkttKsLfZWxazdYVDdUJwfayeoH81KofAb2m6vFbzw5s i/Yg== X-Gm-Message-State: AOAM530OgN2hp02A7MW+yoobkFFQeMJfWFpctU59sJPsng7d50NRLhey 3ktSbkOY5HNjJsOlrA+Dn3rYZRiZJtxZFgHx X-Google-Smtp-Source: ABdhPJwPa8LRPYRL6C/dIX+UNGYdsIDaw9AOsIF0w8+2mk5Bfn2ySIslIdtYglaT7LymnzjMJD/20A== X-Received: by 2002:a17:90a:64c5:b0:1e6:a230:2a71 with SMTP id i5-20020a17090a64c500b001e6a2302a71mr33054050pjm.49.1654699232062; Wed, 08 Jun 2022 07:40: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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/22] gcc: depend on zstd-native Date: Wed, 8 Jun 2022 04:39:28 -1000 Message-Id: <0efcba381d51a9ab8519c3d50a8b48181a0e38e4.1654698895.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 ; Wed, 08 Jun 2022 14:40:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166726 From: Jeremy Puhlman Sharing sstate cache binaries between two systems, one with libzstd installed and the other without, leads to various gcc components being linked against the system libzstd and failing to run on the system with out it installed. Make zstd-native from our system available. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie (cherry picked from commit 2b0a6f03137f24b211c8881cebf65732e550a942) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-11.3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-11.3.inc b/meta/recipes-devtools/gcc/gcc-11.3.inc index b1ef9d25af..acbb43a25f 100644 --- a/meta/recipes-devtools/gcc/gcc-11.3.inc +++ b/meta/recipes-devtools/gcc/gcc-11.3.inc @@ -11,7 +11,7 @@ BINV = "11.3.0" FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" DEPENDS =+ "mpfr gmp libmpc zlib flex-native" -NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native" +NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native zstd-native" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" From patchwork Wed Jun 8 14:39: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: 9015 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 2D554C43334 for ; Wed, 8 Jun 2022 14:40:39 +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.web11.7238.1654699235191198159 for ; Wed, 08 Jun 2022 07:40:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cSdf88di; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id c18so10746184pgh.11 for ; Wed, 08 Jun 2022 07:40:35 -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=eckJoM8dPQW3gP6FoSRFD6z2f2kFMEpUWl+4iWPaX8U=; b=cSdf88diS5aIU21wLlEPR3/KHBjlNxhO5taMzwRXRiXm0GgsTjB24AXcU/JyRH5A6O LzSjn5RA+qD1e2Zr11AP5VQMw2Vh28iIv9llS7wc+icRXoBBohmjvPGUl72xaZX5o1HP 6h7t+QkNLPs0jeyiUfTALzcvekWCN2AzDGUers5IWO9xfJV7k+ZO46OEppyZcgkxoV23 zPFcWEgThCq0qjjcKKXs8OLotzqc4HksyGNCU5Ee9cRgz3bvy/QKjcwn2u+KkPM8qONo 7P77wYKXmsfw5QJyFS9/uDrXJrVOFCqEsdeN7GEIU0ZPAOpCciiAKrrIicn2C85ul4Rk ZMsw== 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=eckJoM8dPQW3gP6FoSRFD6z2f2kFMEpUWl+4iWPaX8U=; b=0XJnIUZn0cQ3GP074QT1RBrcnX22tMIlVJ7WVa7eBQGMx4zaOasqsaMLo5/O3TT4zS i3DV6ZfODJ3UsTnf5bw5hNZRFh2WRm4Jxh6pQsTp4G5JaxXdOuDzfuLt5pSvubWsGP04 gZCt0XAj6cNGDK3tOpK6zxKgLCEiCkyOi5BEkZxoZv6fXr5J5rw28CYHtjeaopQQlJv/ PAGYIyHq2+mVjT2DX6LohRh5ndU3n3dFYpYUqW3mvxSNZLLLqYOLEtkn3TRE9NXbOhZy LPsi5xyfCC0vImFWAGm1thylWlJvbxeoZC0eykharUb6OZv6QHy7aG+jtgMhcoY42IvO Ll4g== X-Gm-Message-State: AOAM532nPzGJlMgE4tIwoxwDRQCeo3sWT+j79QewbZJlNhKHua/n0XQI AyXhRjOIihkHoYjlM9pityC7/vmyRuKUAKKj X-Google-Smtp-Source: ABdhPJyu9rTFyvvDfvI4nj49E2OaOtgkUQRjsxyTRdFUTI+rtinjPMk2dIvHS+nOdULfZkkNSwXLjQ== X-Received: by 2002:a05:6a00:9a2:b0:505:974f:9fd6 with SMTP id u34-20020a056a0009a200b00505974f9fd6mr34952178pfg.12.1654699234197; Wed, 08 Jun 2022 07:40:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/22] gcc-cross-canadian: Add nativesdk-zstd dependency Date: Wed, 8 Jun 2022 04:39: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 ; Wed, 08 Jun 2022 14:40:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166727 From: Richard Purdie To match the changes to gcc-cross, add a nativesdk-zstd dependency to ensure our configurations match. Signed-off-by: Richard Purdie (cherry picked from commit c145e00710fe557b5a3832fdc556ad53434b3615) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 168486bd4e..a87b446c4f 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -175,7 +175,7 @@ do_install () { } ELFUTILS = "nativesdk-elfutils" -DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib" +DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib nativesdk-zstd" RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" SYSTEMHEADERS = "${target_includedir}/" From patchwork Wed Jun 8 14:39: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: 9017 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 38E5CCCA47F for ; Wed, 8 Jun 2022 14:40:39 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.7241.1654699237963107941 for ; Wed, 08 Jun 2022 07:40:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nf4GaRIL; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id r71so19109228pgr.0 for ; Wed, 08 Jun 2022 07:40:37 -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=rPVVTsLoivUJ1nfbHJM8XjX3k62CYLFhDv4Boj7jNng=; b=nf4GaRILMyVrKHhFrRD7KAI54k5sJh+9Bahexg8cJT0kpbxGn/YP+TofFjrC4mKsIV Ry3qylU1/9zkxNRlYGlWeEw7IqqbcDsWCp1jPPFzI+W81XfnUV7/3K182Bdgd7zhYc+i oqP/aaDLwQfZ4Hm8zI4U6PoIzt5B0sWO5j3dT+gxxnroFAp430yDaJz0Y86mbh0qsIMZ ESJYwhm+xFF0XOLiI9di3mUAkOwi1HBAQwA8e7X2jzOVisR/YGu3TecNiBXLNbuCb3+e 8lQOxAsrFaZYtpbDUCtXjdF8qjCmISxHE/pZM3qJ7OMSZw53NS3GN3qGxh6zii0YW/FM DNzg== 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=rPVVTsLoivUJ1nfbHJM8XjX3k62CYLFhDv4Boj7jNng=; b=2H2dZTwdoRAHvzXBnlqUp1NY3sEs11mrmzF5/iwPGl+xc/d+pgQVAws+dlyVIgoo6w VAPAevIS9IejlezMLOeu83Bm5YOf3lWWX/nxoHomSHjO7FLJna6ZhLde/solSOs6x/ap VTKQBhzbnr4AidEbak5M+i1uxbLYy1zJQE8vOfD5HxeoYILc7ALRJPIhgRTT/VtUlRpo pFqWRhL+EbhqPYvvfnQ8hx7JfJILDxEeXISOdrWsu1QZmY47VSf7YW5LmjeMwlwylrb4 p7dLkp1g8kb1CZBw44sEfR7Z29jfhlOLGWiBqle3j5jEGI8cOEh3mAQOdKZj0HuvJ20w W39Q== X-Gm-Message-State: AOAM5334R80HtEwuz2IWogYlyxb+GHpOi9UBEqlvfmyOGzWwcBiE9gk4 nQYOStAQ9iNbtCPvgr/Y3KdlFVVHp0lVkhn+ X-Google-Smtp-Source: ABdhPJyTuJAIi4UbSivYIu+2mkNkTzb/iDcBBZzNpXp86J2dVTbKJYAdtJwqbkiB83el0S1S6rIoRA== X-Received: by 2002:a05:6a00:248a:b0:51b:f461:8318 with SMTP id c10-20020a056a00248a00b0051bf4618318mr23147500pfv.47.1654699236828; Wed, 08 Jun 2022 07:40:36 -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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/22] perl: Fix build with gcc-12 Date: Wed, 8 Jun 2022 04:39:30 -1000 Message-Id: <4eb85dbace4d6d2cccdeed96b4aee80a8fc24e37.1654698895.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 ; Wed, 08 Jun 2022 14:40:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166728 From: Mingli Yu Fix the build failure when debug build is enabled. Add DEBUG_BUILD = "1" in conf/local.conf. $ bitbake perl | In function 'dynprep', inlined from 'S_sortsv_flags_impl' at pp_sort.c:358:20, inlined from 'sortsv_amagic_i_ncmp' at pp_sort.c:572:5: | pp_sort.c:1232:1: error: inlining failed in call to 'always_inline' 'S_amagic_i_ncmp': function not considered for inlining | 1232 | S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b) Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit 880296e68cfd92cfd4c9474972c8d8e6f21a2a40) Signed-off-by: Steve Sakoman --- .../files/0001-Fix-build-with-gcc-12.patch | 143 ++++++++++++++++++ meta/recipes-devtools/perl/perl_5.34.1.bb | 1 + 2 files changed, 144 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch diff --git a/meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch b/meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch new file mode 100644 index 0000000000..1d98e1389b --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch @@ -0,0 +1,143 @@ +From ee957eb9e4ec29a462cdbb2f3bbe29d4270534ef Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 2 Jun 2022 13:01:37 +0800 +Subject: [PATCH] proto.h: Fix build with gcc-12 + +Fixes: + In function 'dynprep', + inlined from 'S_sortsv_flags_impl' at pp_sort.c:358:20, + inlined from 'sortsv_amagic_i_ncmp' at pp_sort.c:572:5: + pp_sort.c:1232:1: error: inlining failed in call to 'always_inline' 'S_amagic_i_ncmp': function not considered for inlining + 1232 | S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b) + +Upstream-Status: Submitted [https://github.com/Perl/perl5/pull/19808] + +Signed-off-by: Mingli Yu +--- + proto.h | 42 ++++++++++++++---------------------------- + 1 file changed, 14 insertions(+), 28 deletions(-) + +diff --git a/proto.h b/proto.h +index faca6d1..3a76c04 100644 +--- a/proto.h ++++ b/proto.h +@@ -5606,50 +5606,43 @@ STATIC SSize_t S_unpack_rec(pTHX_ struct tempsym* symptr, const char *s, const c + #endif + #if defined(PERL_IN_PP_SORT_C) + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp(pTHX_ SV *const str1, SV *const str2) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp(pTHX_ SV *const str1, SV *const str2); + #define PERL_ARGS_ASSERT_AMAGIC_CMP \ + assert(str1); assert(str2) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_desc(pTHX_ SV *const str1, SV *const str2) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_desc(pTHX_ SV *const str1, SV *const str2); + #define PERL_ARGS_ASSERT_AMAGIC_CMP_DESC \ + assert(str1); assert(str2) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_AMAGIC_I_NCMP \ + assert(a); assert(b) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp_desc(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp_desc(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_AMAGIC_I_NCMP_DESC \ + assert(a); assert(b) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_AMAGIC_NCMP \ + assert(a); assert(b) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp_desc(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp_desc(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_AMAGIC_NCMP_DESC \ + assert(a); assert(b) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_cmp_desc(pTHX_ SV *const str1, SV *const str2) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_cmp_desc(pTHX_ SV *const str1, SV *const str2); + #define PERL_ARGS_ASSERT_CMP_DESC \ + assert(str1); assert(str2) + #endif +@@ -5671,51 +5664,44 @@ PERL_STATIC_FORCE_INLINE void S_sortsv_flags_impl(pTHX_ SV** array, size_t num_e + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_SV_I_NCMP \ + assert(a); assert(b) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp_desc(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp_desc(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_SV_I_NCMP_DESC \ + assert(a); assert(b) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_SV_NCMP \ + assert(a); assert(b) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp_desc(pTHX_ SV *const a, SV *const b) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp_desc(pTHX_ SV *const a, SV *const b); + #define PERL_ARGS_ASSERT_SV_NCMP_DESC \ + assert(a); assert(b) + #endif + + # if defined(USE_LOCALE_COLLATE) + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2); + #define PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE \ + assert(str1); assert(str2) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2); + #define PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE_DESC \ + assert(str1); assert(str2) + #endif + + #ifndef PERL_NO_INLINE_FUNCTIONS +-PERL_STATIC_FORCE_INLINE I32 S_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2) +- __attribute__always_inline__; ++PERL_STATIC_FORCE_INLINE I32 S_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2); + #define PERL_ARGS_ASSERT_CMP_LOCALE_DESC \ + assert(str1); assert(str2) + #endif +-- +2.25.1 + diff --git a/meta/recipes-devtools/perl/perl_5.34.1.bb b/meta/recipes-devtools/perl/perl_5.34.1.bb index 0e9d0c032e..4b9d2e2c50 100644 --- a/meta/recipes-devtools/perl/perl_5.34.1.bb +++ b/meta/recipes-devtools/perl/perl_5.34.1.bb @@ -17,6 +17,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ + file://0001-Fix-build-with-gcc-12.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ From patchwork Wed Jun 8 14:39: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: 9022 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 31B33C43334 for ; Wed, 8 Jun 2022 14:40:49 +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.web11.7243.1654699240299715406 for ; Wed, 08 Jun 2022 07:40:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ep+gHzcs; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id u12-20020a17090a1d4c00b001df78c7c209so24003035pju.1 for ; Wed, 08 Jun 2022 07:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=T1Bdn/xaiLsZRvXuU5MKPGqXSLglVxxlXRfx0y2NfIE=; b=ep+gHzcsBREKtVwigUx/CeYaJ3DEsORVYqLME+yt7USVrfdeXHOjy0C/oPCA8+UbOr FUUZLMqtqNA9eSa3/m1ydNNbFOmmFZNIzbkoLZ5CJ+cRBu7p3wPonYch7QwSk2VvdKv6 orZvfb/AksqSIP1iCNB/dRVKpu+sxeqNycIfuVSQ7vxdhSpsps5Oi9OR0nPaBEq0mTd9 rdrtSWsgUyZBC/uGfgrk6T7XJw/8jh6jwCU3opaYoPoGwUT5+4s3h6137YVNNgQxHo5N N9gd79Y0fzJGMHlJ2I46x/k3XVLm/6UwJHqK05BNkGY2rc61TJRH6hfZi+jiX/1ATPN0 M4Ug== 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=T1Bdn/xaiLsZRvXuU5MKPGqXSLglVxxlXRfx0y2NfIE=; b=OJ+zAjff1UXdsCxbIXHqQLunm/keQqxzAstEmmf9jdN5wWczRQdTc3e3SeGHQ4l4EW Puo/jPwVIbAGWVMYKf4LZkl8ez3ic4oYuKq7WTReKnmXL7BMuOd08yTLb7mUFsMcIH+g RUMkkk8ohG16TzIbWyRqqzLtKmBTY++MXLaTgUeZJFOlVA46c+x5HbaMDTODQVCaNkmG guVOXiHVDOO4iJzTk3ZQFPuOXDQfr+MQ4WBzVRi5kXuJN2m6Mm+9eQNfw0vlK5SW0juB pTfQFJjiuJFpkn/Eq30nhu6GeP9XJb80qabHZrJcRM32nNPgT/tydnWrAPxsCWmHbu6A 9vPA== X-Gm-Message-State: AOAM532fyXrWhRlSos6mtOv/uWyPXecQ0u5BKrO2hiLzhPvp8753ZdDI 4ye66nGVHNyMQgsR1xVy6oujFf5Xrsp7KIZX X-Google-Smtp-Source: ABdhPJzKO82oWSylgeGsv/5kYaLmF939r9cRPGHbblFDmj/PTv8qC/Of4UG89+hVhvXGM3NtnGBSdQ== X-Received: by 2002:a17:903:120b:b0:168:98a9:221f with SMTP id l11-20020a170903120b00b0016898a9221fmr2712491plh.48.1654699239259; Wed, 08 Jun 2022 07:40:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/22] kernel-yocto.bbclass: Reset to exiting on non-zero return code at end of task Date: Wed, 8 Jun 2022 04:39:31 -1000 Message-Id: <45b4597db37e3ad50ff84cda39fd14a25d6d2680.1654698895.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 ; Wed, 08 Jun 2022 14:40:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166729 From: Stefan Wiehler Several tasks deactivate exiting on non-zero return codes via set +e because they run subcommands that have legitimate non-zero return codes. However when appending to those tasks, this behavior is not expected and can lead to builds silently proceeding in case of an error. Therefore reset the default behavior at the end of the respective tasks via set -e. Signed-off-by: Stefan Wiehler Signed-off-by: Richard Purdie (cherry picked from commit 83a6f28d2e464f00202090e998a63045adba9e4e) Signed-off-by: Steve Sakoman --- meta/classes/kernel-yocto.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 4cb638864c..afccffcf17 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -310,6 +310,8 @@ do_kernel_metadata() { bbnote "KERNEL_FEATURES: $KERNEL_FEATURES_FINAL" bbnote "Final scc/cfg list: $sccs_defconfig $bsp_definition $sccs $KERNEL_FEATURES_FINAL" fi + + set -e } do_patch() { @@ -339,6 +341,8 @@ do_patch() { fi done fi + + set -e } do_kernel_checkout() { @@ -397,6 +401,8 @@ do_kernel_checkout() { git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" git clean -d -f fi + + set -e } do_kernel_checkout[dirs] = "${S} ${WORKDIR}" @@ -691,6 +697,8 @@ do_validate_branches() { kgit-s2q --clean fi fi + + set -e } OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT" From patchwork Wed Jun 8 14:39: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: 9021 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 420C0CCA47B for ; Wed, 8 Jun 2022 14:40:49 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.7242.1654699242798439114 for ; Wed, 08 Jun 2022 07:40:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pFP71Qv+; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id e9so8236245pju.5 for ; Wed, 08 Jun 2022 07:40: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=vIybM8xMVVyyHP4EZb4QV7puu9i/ecaO/GTsy8DVVjQ=; b=pFP71Qv+QhX9FNzA89Ev/SMFJgmElQknx6zD4pLhW83BbtTlt9flZpupcg+HgRqjfo BfLDcW+AE4Hcb7KAKvHOic1Pywxrf+PojE6T+8XkD6EIpEeRU9QqHTA9qAqgAw3Wt2Ml f9QzKm8dMjYyOPCboBjAFIcVabQRIuCHR8k71mZv7Fu3GVKawVi4ltJNS/Y1RL/F+71s DqdgzVlo/HJF/D7f9WHD0CfSLH7g03L05g3Yrb3+OT5R2XqK0eo7/22WkLcwtszcH4MU WLAsCZt26gZGSiq6AHN37y2A2GM0K2Li5bzNDSJCsV87fCV0zQxxvZzaBsIFiI2z1aOW UZ2w== 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=vIybM8xMVVyyHP4EZb4QV7puu9i/ecaO/GTsy8DVVjQ=; b=IGSo39Zq0O3wYNnV2FfNTNT9pKsuMphW5hqln8QYj4xgHVrvFu902/b0ZO4dcrRwAv iFhC2Ocwo44cT3hAbCRVBH+dyru7eeFJaysa5bgSTq95V0VccTWmPacfGquHDqO2AtsV Fzm2EaML97ULp+GzDzcNKasydkE5QezsAehlkCxkntDFKfieryT9YKEo6bHYfMSwtOwm azPJIsUiNdXpxiJ74/M9Q8mfK6sktFyQJHk345VwWrfremdVlPT6CPm14fzSIHPMSKFs FkB/5heiKjvJ7tyaiWEqSmwMDW+tE7VxNzddcXGzhza4W6Ir09qWDsc6deOIEQmiwlz/ 05Eg== X-Gm-Message-State: AOAM533J5R/ovH6nYt8Y/YeJC2SUNOxzVAqKabiHHhawyHkh+NNrgezV OUU12jCczHp/UxeorzvPprQudj65Mtkzpa8y X-Google-Smtp-Source: ABdhPJzI9SkN3mvAcgVsbpNlclKXyrv9Yb120EmC4YOxMQLb+iY1gTPq3EnFkijx7uWzbRZB/1Wo7Q== X-Received: by 2002:a17:90b:4a4c:b0:1e3:3ad6:a5bd with SMTP id lb12-20020a17090b4a4c00b001e33ad6a5bdmr37489174pjb.172.1654699241749; Wed, 08 Jun 2022 07:40: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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/22] alsa-plugins: fix libavtp vs. avtp packageconfig Date: Wed, 8 Jun 2022 04:39:32 -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 ; Wed, 08 Jun 2022 14:40:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166730 From: Marcel Ziswiler Fix PACKAGECONFIG to refer to libavtp instead of avtp as this is what the project and everything is really called everywhere. Signed-off-by: Marcel Ziswiler Signed-off-by: Richard Purdie (cherry picked from commit 8824d91fe2063195014c38c134b97946d3b429c2) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb index c435f61d4c..560fd80f0b 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.6.bb @@ -34,7 +34,7 @@ PACKAGECONFIG ??= "\ speexdsp \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ " -PACKAGECONFIG[aaf] = "--enable-aaf,--disable-aaf,avtp" +PACKAGECONFIG[aaf] = "--enable-aaf,--disable-aaf,libavtp" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[libav] = "--enable-libav,--disable-libav,libav" PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin" From patchwork Wed Jun 8 14:39: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: 9020 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 31904C433EF for ; Wed, 8 Jun 2022 14:40:49 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.7244.1654699245214778858 for ; Wed, 08 Jun 2022 07:40:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=kgfdFUks; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id q140so4014294pgq.6 for ; Wed, 08 Jun 2022 07:40: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=2wTyqu0pIzlnqdy5L1KLEEcCRBRusAjfjqQU8Kn2Yqo=; b=kgfdFUksEGPEmwk13jLBOPUNFrHKNOdr577mMxgq47mj5+tLmpzzjlyrtM8Od9jJgA hCwbXmHyyf1/zXtuL5OZqf0Wla4rNVAOmqGzisqEmnKxIrD0+VcDEvEUoq30Husogyvw ypSXbPwvBV6P3fRj59xBJMpd/XF9+A/M7hyQqGobQc5II4uni0cCJa5Mdjr69L36lqC2 JtgHWVmY3gOowIbYxFQHZDGnFKNoFrJDUa+JIfNJTe/n7CCTq87OE6H61x0f0SHHip1B t/modaNyx7VhSfzKRCrL1QShHkEMz1W/BFKyMTAbF+BN3nUjVrSBgfU+lldwbgEGvEEl geMg== 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=2wTyqu0pIzlnqdy5L1KLEEcCRBRusAjfjqQU8Kn2Yqo=; b=z1wjoWJFvN8g03f9K2q3B1nAbI5mQsnH3yHvOA2n4xfya2g2M2aOb/rq+I9HsSt9mt 4fhoHlFSLKLTILLybCP2FFPV85uTu+6gPClwBuZG2+mA7Qt2AXYjJvglcEIiawu3w+4i mHrDVV4MC8V3pKAJmDGqfvPFyzfQnYf0rN98iOdILwmnlgK4z8+9WfxjdFlSBf8SveDo LHKfFdRXZJ9VwplthWSN4nyDc0/alYJtFpadYVirM76O9KUWtZh4cpcWkGTzkLZoYgyW 0h7tXQQM1r8S8+e2VEBDn8oaoUk/z3nMn7eMayR0hJaON8144Ne7myeo2gQygDvCjDEt Ff8Q== X-Gm-Message-State: AOAM5311Qb3mHB5tM7F6joXDeLR4DE8lqQ7ZbkurimYNdrqEuSqbN5rQ JXz0lPYDvC7kS1qnSdBzqN24nG8M1b5f82ss X-Google-Smtp-Source: ABdhPJzPYcr4Vk9nQc73kPnnlr2OvpEqG0JdRpHvjh4odOOMoWihUkTDC18+w2yPSzA5vF6hPQBr5w== X-Received: by 2002:a63:2164:0:b0:3fd:b97e:2e4b with SMTP id s36-20020a632164000000b003fdb97e2e4bmr14333848pgm.77.1654699244211; Wed, 08 Jun 2022 07:40: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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/22] libseccomp: Correct LIC_FILES_CHKSUM Date: Wed, 8 Jun 2022 04:39:33 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jun 2022 14:40:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166731 From: Peter Kjellerstedt Previously, only the first line of the LICENSE file was included, which only covered the license name and thus would not detect a change to the version (or anything else for that matter). Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 3ac45755dffc611fb46f5cd1c07f4876d3094893) Signed-off-by: Steve Sakoman --- meta/recipes-support/libseccomp/libseccomp_2.5.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb index d47200e01c..4c0fb1d7b3 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The libseccomp library provides and easy to use, platform indepen HOMEPAGE = "https://github.com/seccomp/libseccomp" SECTION = "security" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" DEPENDS += "gperf-native" From patchwork Wed Jun 8 14:39: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: 9019 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 32A54CCA47E for ; Wed, 8 Jun 2022 14:40:49 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.7246.1654699247881747221 for ; Wed, 08 Jun 2022 07:40:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gZDWVOJM; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id l20-20020a17090a409400b001dd2a9d555bso18523049pjg.0 for ; Wed, 08 Jun 2022 07:40:47 -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=DIZGZX+OKKwfDjfs9n7LK8xC/UYzaI2JdmgQAQ1Qc4o=; b=gZDWVOJM3wpfXRDH2ham1ML4TSfi1l4SQ0ojgqqAYrIuzXykGmiW+nUXJgT2+d4SOv HPrLU5av4Uo4bNgIHRg62EPamqdwlpYI5BZAI/eysennAOPPw9VGap/OyM9PfdfhoQBU v/DRRZvDaeusJqezKZ42RwAeEvEPEmwepBQLT3CguKyBqVbZ7Zwnpaqe9bosCGpLaALe fnIv789yRZttgnr+gdaJ7m1effJgjiJADtlIuDRc0Kr6urGIj/YecafFSdcEEBc6/9vF 7FOVC6fR7qZkITLZf/90RyDV0ClCLc1ZH1OnW2lmvzudfFizabn/RgsAMgySvAl6mLfu n9YQ== 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=DIZGZX+OKKwfDjfs9n7LK8xC/UYzaI2JdmgQAQ1Qc4o=; b=FgkDBCjk5+sgVu+s1rfSPLAgxIFKW+xOQrff9m/AZBoI6sBsGApy+nLE7zn4BtKAWE qFT1urIyi1ZIy0uddEmV9VT0b5ltBa8OWu+rkXHQFMNXntRMvjYuyNBoIRPS/ePT+WPM v0tNlyjIn60WWCgUFs2I9Fb+CH47+urg+M9IJ/3jsNadOjHSTZToTUu+ZwOl4jHYff9D UqK0EahxBF6Onb7quZWL+9q/deMdkf8RtEEiI7GdCHb37OEeRNF5ivQkG4L6Ewre1VxA RwqZB5fEAoKKxvLfaHEk8osm+GXZ8p0eTVAyDHRbh8X3XJRaaRTknz/e82Ln905MHX4+ /PTQ== X-Gm-Message-State: AOAM533bGHmltUMvXmbnUonQ2CEQOjcKSS+Rngz+TnyMxneWcDSrJhbE mox+Yx71PUrb4tpstiMGDq5vcUrs40Izo+/g X-Google-Smtp-Source: ABdhPJxamEeAbJhFi3A6AXNVrVHb3chjHzH+dwq2BlDfvdSWvMmT0PUaM76WkNvp1KM+X5JIJ+NxIg== X-Received: by 2002:a17:90a:408f:b0:1e3:23a:2370 with SMTP id l15-20020a17090a408f00b001e3023a2370mr37606414pjg.84.1654699246816; Wed, 08 Jun 2022 07:40:46 -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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/22] license.bbclass: Bound beginline and endline in copy_license_files() Date: Wed, 8 Jun 2022 04:39:34 -1000 Message-Id: <3001199ca8da38208649e8016e77880690835706.1654698895.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 ; Wed, 08 Jun 2022 14:40:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166732 From: Peter Kjellerstedt Ensure that begin_idx (i.e., beginline - 1) and end_idx (i.e., endline) are positive numbers in copy_license_files(). This makes sure the same lines are copied as populate_lic_qa_checksum() uses when it calculates the checksum. Before, beginline=0 would typically lead to that no lines were copied at all. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit ab3cc3651d08d226675c461da760cda0bb6c0ce0) Signed-off-by: Steve Sakoman --- meta/classes/license.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 0c637e966e..4ebfc4fb92 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -84,17 +84,17 @@ def copy_license_files(lic_files_paths, destdir): os.link(src, dst) except OSError as err: if err.errno == errno.EXDEV: - # Copy license files if hard-link is not possible even if st_dev is the + # Copy license files if hardlink is not possible even if st_dev is the # same on source and destination (docker container with device-mapper?) canlink = False else: raise - # Only chown if we did hardling, and, we're running under pseudo + # Only chown if we did hardlink and we're running under pseudo if canlink and os.environ.get('PSEUDO_DISABLED') == '0': os.chown(dst,0,0) if not canlink: - begin_idx = int(beginline)-1 if beginline is not None else None - end_idx = int(endline) if endline is not None else None + begin_idx = max(0, int(beginline) - 1) if beginline is not None else None + end_idx = max(0, int(endline)) if endline is not None else None if begin_idx is None and end_idx is None: shutil.copyfile(src, dst) else: From patchwork Wed Jun 8 14:39: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: 9023 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 2DEEEC433EF for ; Wed, 8 Jun 2022 14:40:59 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web12.7283.1654699222504648117 for ; Wed, 08 Jun 2022 07:40:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=grvjzL4L; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id g186so10194863pgc.1 for ; Wed, 08 Jun 2022 07:40:50 -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=sDVsDOdftDlZW0mZSKsKEnjbGGoGvPNHYJskTDZM3KY=; b=grvjzL4L4HV8LwDAsRUi6rIWDStybvLbzZt8b2reH6CLh8PvtKg4b772Wrr2gv8OO/ wWsio6WMz4zPQqJIj9fweTvTVO+UGPR8WTEloMCIIjVHORS4NPK9lZvnRwgkG+Xpwfof eLwtRnMuva8tAPGY4IkTtLIAeJ0nJOKQ69fAf3+vYo2ZTOpewEyIiLXaz6XC5vkaXmw/ ziKZ+ARag5Jhyd2tkzCvOviO4454IM1+aN92Jj3Cwb25/eAqHtgN/jtQloDShUxRbTx/ 0FL+8J9C/22vcnvf6IbAxS2mV2/rd35ApsPjzW1vUqyuOxWlMJ+NiE7g2VpfB5imgQCq Q8Xg== 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=sDVsDOdftDlZW0mZSKsKEnjbGGoGvPNHYJskTDZM3KY=; b=qYN2BbCpnijIIm7roHbdZ6gqa4AyzKGiPiZoVaNigLAcfTqMVcnntG4wWsm9o88y9R 2znw+W9VfV3bizs+aikEyn3n94DsJo4HaVOak5F0IEKDZFMnUnqylWEsP/9IT5z+QnDr EyY8y2k5oOEcuWr2h0XXrYlwbn54fQTLXez+TNCONa5PRvorN0tnm6inPm/I2lclPBeB TJWpPKWtNuMD8XaH5iJNTIM2Wc16xQbAc1LQMclyeoHMi5PvT5Fd6UKRsVplpVsZ6uGM w1G9MO1HDGAqqHGC4wWaXmz7kFbRp90YGpmrAMtNhS6FgqbCX0el+g342KScZ2oCRZMV oZSA== X-Gm-Message-State: AOAM531CzcQt0/YL/RXyBnhscqpgMm2WlS6KKXZFi4Bx3gDjFMLFGcOo fwiZf8kQdiHmIm0kAhytF9k4Ul+Tj8pdnJyh X-Google-Smtp-Source: ABdhPJwgZLyfu2IQGUeXW460X+nWKwzeTBIKkRRziOs8LuDnbTGr3yD13fy0xQYFJ0N7/cGQUvN/uA== X-Received: by 2002:a65:6e05:0:b0:3da:eb74:ef9c with SMTP id bd5-20020a656e05000000b003daeb74ef9cmr30852578pgb.563.1654699249482; Wed, 08 Jun 2022 07:40:49 -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 i4-20020aa787c4000000b0051bc581b62asm12945213pfo.121.2022.06.08.07.40.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 07:40:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/22] rootfs.py: find .ko.zst kernel modules Date: Wed, 8 Jun 2022 04:39:35 -1000 Message-Id: <6ade2bfdd9297896b9f251dd62f55e461fef1a3e.1654698895.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 ; Wed, 08 Jun 2022 14:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166733 From: Sean Anderson With CONFIG_MODULE_COMPRESS_ZSTD enabled, kernel modules will have a .ko.zst extension. This fixes depmod not being run. Fixes: 1b696a45ddb ("rootfs.py: Add check for kernel modules before running depmod") Signed-off-by: Sean Anderson Signed-off-by: Richard Purdie (cherry picked from commit 425efac7110f0f42d70643e0a448e834d0f01a7a) Signed-off-by: Steve Sakoman --- meta/lib/oe/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 98cf3f244d..61ccf369f1 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -311,7 +311,7 @@ class Rootfs(object, metaclass=ABCMeta): def _check_for_kernel_modules(self, modules_dir): for root, dirs, files in os.walk(modules_dir, topdown=True): for name in files: - found_ko = name.endswith((".ko", ".ko.gz", ".ko.xz")) + found_ko = name.endswith((".ko", ".ko.gz", ".ko.xz", ".ko.zst")) if found_ko: return found_ko return False