From patchwork Tue May 10 18:05: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: 7856 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 926F4C4332F for ; Tue, 10 May 2022 18:06:13 +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.web12.672.1652205964184979817 for ; Tue, 10 May 2022 11:06:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=e0zeZbOG; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id n10so5456836pjh.5 for ; Tue, 10 May 2022 11:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BxMol2vX9GjIBuSNrp5XFKlVRAgFrMFTQ/D0MD7iftQ=; b=e0zeZbOGACT/7DTu0CWd931leMUg9WDe0uGbseb4B71PObDbBZhu++3GOO+x6UYMK8 oCgch5TvcA7gsfEhDVU39hxeP4vNMm0gf54cpwyF0DVnanjO1cR2qOM890w1sa/LY3Gv eISJfPkmJVeUogjV3Kej83uoBiR3UUM35qwuaVAUzzYQYgKQx0fD00NX7B52lk0GX/lb JKa9RFxHDTraJVQshAq2FjMUKDbhDn+Brsxb9qqntEuIu9ymbfqu7Ax84CUTrmzpVI0t zVZGDZunruQOknIS7F3gFXqAY6cXaREkQlFn9CUBVaTYC0crBpddvFCiM1nm1Xyb7ZzG EGSw== 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=BxMol2vX9GjIBuSNrp5XFKlVRAgFrMFTQ/D0MD7iftQ=; b=Z/X2x4ehAQGt9mv+PlOyBaA+iHW3xaf/mpffjJgxqNgE8uVAb9qIMjIW6KsP+bg5hi EVLVRycv9rmtRJ0OUuV7nZ+MOGjuN39wVMvRThr4/uisZ6su0RL6KktGcHp38H6a8N1d ZKrPJmFuJUD6zNNKEKslRtNxpRUvLtXwgN9eKlvZdSighy004bbIJYNlyrNWcBk8ekZ+ FzpWDi7bDjZ2k3Ht6ud/9zgGcuZB14hiYxClNrcB8TqQXK0fAE4PeceWpO8IfpVy4Hxb 4/X5B7nKuwwihToCfM2JjH8sRLV5aZPrze+cvXGCc8xI3XjfYnWOTb2kvThutlqF8Aoe mJeQ== X-Gm-Message-State: AOAM531bc+75UeDdfnAOUJJ37u6E5FqHwp7nFxkV+JumA7gIFEfdNuiZ VEZanqLVi5k2BscqzQsHPFx221GF8McPGEyN X-Google-Smtp-Source: ABdhPJy2ibtw5rlWBU1usocjo2wozmNrd+nPv1O5Pmz1gqiBlOOoKoAs8Wy5FYce30077UAsjH4C/g== X-Received: by 2002:a17:902:b094:b0:15c:dee8:74c8 with SMTP id p20-20020a170902b09400b0015cdee874c8mr21368339plr.6.1652205962872; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:02 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 01/18] providers: use local variable for packages_dynamic pattern Date: Tue, 10 May 2022 08:05:26 -1000 Message-Id: <4fddb0c9ef344d73b10fd9491a39f4c36e3094b1.1652205806.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 ; Tue, 10 May 2022 18:06:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13681 From: Matt Madison During parsing, Python raises RuntimeError: dictionary changed size during iteration in getRuntimeProviders, if you happen to have a recipe with an explicit RDEPENDS on a dynamic package containing a '+' character, such as 'gtk+3-locale-en'. This is because we're using the modified pattern as the key into the packages_dynamic dict to append to rproviders, and since that key doesn't exist, the dict is getting modified to add a new, empty, entry for it. So even without the runtime error, we'd be generating an incorrect result. Fix this by using a local variable for modifying the pattern and using the original key to retrieve the value on a match. Signed-off-by: Matt Madison Signed-off-by: Richard Purdie (cherry picked from commit 07de375c3e57f17ab7b47569186f24ecd9896825) Signed-off-by: Steve Sakoman --- lib/bb/providers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bb/providers.py b/lib/bb/providers.py index 8c1c31a5..e11a4637 100644 --- a/lib/bb/providers.py +++ b/lib/bb/providers.py @@ -396,8 +396,8 @@ def getRuntimeProviders(dataCache, rdepend): return rproviders # Only search dynamic packages if we can't find anything in other variables - for pattern in dataCache.packages_dynamic: - pattern = pattern.replace(r'+', r"\+") + for pat_key in dataCache.packages_dynamic: + pattern = pat_key.replace(r'+', r"\+") if pattern in regexp_cache: regexp = regexp_cache[pattern] else: @@ -408,7 +408,7 @@ def getRuntimeProviders(dataCache, rdepend): raise regexp_cache[pattern] = regexp if regexp.match(rdepend): - rproviders += dataCache.packages_dynamic[pattern] + rproviders += dataCache.packages_dynamic[pat_key] logger.debug("Assuming %s is a dynamic package, but it may not exist" % rdepend) return rproviders From patchwork Tue May 10 18:05: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: 7857 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 8AAD9C433EF for ; Tue, 10 May 2022 18:06:23 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web08.643.1652205966583722690 for ; Tue, 10 May 2022 11:06:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pyujqRBQ; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id i24so15571342pfa.7 for ; Tue, 10 May 2022 11:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ze0FpdJqm5D8cXtb+fCiZkxINHI4YOPUg51oGeeRUG8=; b=pyujqRBQV2dcY3cOXgMSJyK4LzxpwZooxOuq+W3BXktELmunbCRTBZFgjSdselga/y fC3hLEKMjAdV1gtVJI9xls4N9pvk13oxFcVTy/wTu8RatdpYfctVlWubfY+H5os7YgYS TwjAStEB9Ms1ViLec78TbuvJFKLnRcNk3DwhFJO731UUDU9/Z2s70+FXJ8tnizs6G58j FAsiWAnfyUOiS75+Vselv3q8iu712bJGX05WVDyEfwQLiJaf5LoyuWgxkNL2ZdXq3jIZ uOZVWA+p3pgJaN9skkalyZv1W+/trj5jFQ1/TybdL4qnEXtis58udzAtHQQsPs4jFGFx ZWwg== 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=ze0FpdJqm5D8cXtb+fCiZkxINHI4YOPUg51oGeeRUG8=; b=cVmEdkusutssaJ1gyseBeNY5PtjzzUywL3LfsbGIQKrp2WtidifPbjC81bL05oVyHN YSzqxrFNKORtWJyd1Kmm/ckZWC39S5u5QyRVnpPNKy5oFgRPYbSiNw34rKEtVrk9GHGw dhgiCmxHOu6oC5Ji6deszhuwrhY8E2ICx6aO4DqvFMJAZES1dMzKtd4qjCvU9D071tHT oVzRPjXBCIJG2gqAdNCrcTAbejbQUrlXXGEyXlcCh6hcrcOGWLPleDnyRB8b4n+Thxni 4viT4ao5ob+3MscdKZw7Oko6f2+sx6IVW0E2m1UvUY05f7wvcC80Vk/3a8fODGljoX2W IBcQ== X-Gm-Message-State: AOAM533Zgl9K591eT34muQOa8C4nSH0A91eUAVyCoZxBsrxESEGR0IN1 V5gljSG4Gxk82ETYW6V9vCOnXdkKo1GC5b5r X-Google-Smtp-Source: ABdhPJw+bO/1/ihlIquhjg2mJ5bleTe9CWA8MrG7RGEE+TwxjhFXS6LgOmdBsRST1zm3uNKCP4wRbQ== X-Received: by 2002:aa7:848a:0:b0:510:44da:223d with SMTP id u10-20020aa7848a000000b0051044da223dmr21672541pfn.66.1652205965349; Tue, 10 May 2022 11:06:05 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:04 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 02/18] tests/parse: Fix one test overwriting another Date: Tue, 10 May 2022 08:05:27 -1000 Message-Id: <1a06e13dfbf43a4d2ed5e8246676095dc3b697b3.1652205806.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 ; Tue, 10 May 2022 18:06:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13682 From: Richard Purdie Fix an issue where two tests have the same name with one overwriting the other. Signed-off-by: Richard Purdie (cherry picked from commit da812d938fd79e2cc7bdf355ccf5b0f9ead684c4) Signed-off-by: Steve Sakoman --- lib/bb/tests/parse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/tests/parse.py b/lib/bb/tests/parse.py index 4d17f82e..2898f9bb 100644 --- a/lib/bb/tests/parse.py +++ b/lib/bb/tests/parse.py @@ -119,7 +119,7 @@ EXTRA_OECONF:class-target = "b" EXTRA_OECONF:append = " c" """ - def test_parse_overrides(self): + def test_parse_overrides2(self): f = self.parsehelper(self.overridetest2) d = bb.parse.handle(f.name, self.d)[''] d.appendVar("EXTRA_OECONF", " d") From patchwork Tue May 10 18:05: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: 7855 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 8E481C433EF for ; Tue, 10 May 2022 18:06:13 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web09.623.1652205968899111144 for ; Tue, 10 May 2022 11:06:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6CL0wv+J; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id g8so15573856pfh.5 for ; Tue, 10 May 2022 11:06: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=rZrcv8K+FV1dbOyTPnsjZOx1dN+Os5DaHV73XA6N3aQ=; b=6CL0wv+JuOWrWzUhVJuki+kXGzXKC5uJI3tgur0uyZCcHpmfJYBzXTUEPseT1E9KCB dGXMgh6cmqVAvx5EQYpxTeDClhaa40CFskdFE3KlNS7T9DLxCdZnIehPWJW+8Q+Las25 TVHopnyNITLVkSYiYJWCzgsBefClJw4/TomqSpPlKqJm6p4IqZ0C14E/VLMqGO9iwp1S 78hwsPhCsYWiew2N0E4ej8/+fHGTCyqs1WNYJeWg/n9Kgb1+amFBJOfLsxYLNdJcPNGv fJKpXdmmgq9a/jAZY2YoaQuhHcR1OtinoZ3fw0m5V7xh1aB2/YvWewMwlni3wzyq0Nqu WA2A== 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=rZrcv8K+FV1dbOyTPnsjZOx1dN+Os5DaHV73XA6N3aQ=; b=Iqz9pqQ6zHfQHcHfDBRr6nI4A+qsBlzgzHB5i+qHpUWSWpguRwpodHYlKXeVF+C0JS aGJBc2TXMEM14YyFjypToin3pqHewlnhqoe8hPp6xVFe/Z7DB4seYHH/MN1m/3aPRhQA BbKgYqHcbV3ZceWq7ZNKFqOxZRKVfBWn3JQM4ON+X/YhrrRa1cTlycyRowyhTJYooUWH Am6S/fz9ANehC+tgr7RrzhxfQU9gYSqa57xFqYCJzCm0IQDDlusMltWG/8FsCfaGyqeX w2IZPgtBKd4tOZoe1WtOQREoe8tJr+8M8L63HQYqTjZ+Rd8vSPjIi0pzOakDQJ2VaOgg 0VaQ== X-Gm-Message-State: AOAM53085OXBB1dMFAXM5oXDsYshp5XJNs5MG+RMjNPvNnpWnVV94ISR EMjbPPGTr/2Yapnzis/AxWtkE53gyQ1uSyuz X-Google-Smtp-Source: ABdhPJzVQ4pYbnRMdCuFtfaWikxkFmIWRdX7uwN//x5Dx5QhjrKKy9Hj+uUQk19YpdMDwAKSH0cyjw== X-Received: by 2002:a05:6a00:168a:b0:4f7:e161:83cd with SMTP id k10-20020a056a00168a00b004f7e16183cdmr21531210pfc.56.1652205967845; Tue, 10 May 2022 11:06:07 -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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:07 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 03/18] server/process: Drop unused import Date: Tue, 10 May 2022 08:05:28 -1000 Message-Id: <8e03262d87804747c17da14fb2e3cc3a17b06eed.1652205806.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 ; Tue, 10 May 2022 18:06:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13683 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 543315e6463f15ca7ab2b4ef3e8ed41bb4207ccf) Signed-off-by: Steve Sakoman --- lib/bb/server/process.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index 19ef8398..613956f3 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -20,7 +20,6 @@ import os import sys import time import select -import signal import socket import subprocess import errno From patchwork Tue May 10 18:05: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: 7854 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 89B56C433F5 for ; Tue, 10 May 2022 18:06:13 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web09.625.1652205971397246784 for ; Tue, 10 May 2022 11:06:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=z/+NZjJz; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id cx11-20020a17090afd8b00b001d9fe5965b3so2646079pjb.3 for ; Tue, 10 May 2022 11:06:11 -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=CeeIF34ElbNLMddiQhn3rJ2qK3XhFwhoRw3IE6J4wDg=; b=z/+NZjJzQpfXVHSwSnayQUA7YlfZGESmEE10ku4mhvf5AY97G4BzZzBu8PmMoEIVJq S5mM3HguFAWEkjd9RNoaIEy/NqGMGSzLlsM6SZ60F/JX5MKeJ8FfOd8B7ISWZGfZS9vw uzBkch4jVkv/rqlExLdEJTXWthQkVwWVLk3a0dwdu8Ao6/RHnGQcKKzxuYW2Hko2BjTg 0s190OJRtOhQ0qgVdfIP8NZSFrCYlFvOHvmshJvY9GPRcfbKpycUNDsamOyZjbzXIrK8 229VzLtwy9K5AxbeVoAHbs80FCkEPPCfsOIcqy7vyJ0OYoulQMuTq+ljd1sX48aKIQZc DF+A== 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=CeeIF34ElbNLMddiQhn3rJ2qK3XhFwhoRw3IE6J4wDg=; b=QAwGuS6kMCBdbi1IP/jMOwcWu5POGPtyf8JjSOjgiPr9XpOajiexghbFmtKlleiHKr l+vsXK9jZQyTL1EPTl8rXL3rh816kKkLxYtE+God0jppBfdlGawRU7WVIG4xPgP+bMsr RdVs2f8qdMBE5NOvku3rqGnG78u8OKwa/ojnE308rLoz0Yrgpq+rrxPjxhQyhgKspZpW P5N3dG6DWK+QjgJ6qZMwqQi72rqBU2NH/fAzkhTZBpqif3h0Q+jPo+ss/z3uCMkVPORY 1NWNv5chcrE4LY9bvqPhYuN9VbUY3r9qd0iqZdi1AJlCUCbCpSvcEMWBb5RYB+ua5ePD wSeA== X-Gm-Message-State: AOAM533O9FJaHZinYq/j/FVyNezIljIt6HoUPo7jRrDlg+6eiuNhLD9j ghSppuKPW0UD6wkLbjc4cPnEKeQ2prHB0K+D X-Google-Smtp-Source: ABdhPJzUtmbjC8Cmw9WHQECk7YVo6kPmiZKg7Jj/y9yeNRaa4bJqG8HXvRXqQU/lPNeX3RW5JuED2Q== X-Received: by 2002:a17:90a:e517:b0:1d7:5bbd:f9f0 with SMTP id t23-20020a17090ae51700b001d75bbdf9f0mr1083308pjy.77.1652205970376; Tue, 10 May 2022 11:06:10 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:09 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 04/18] ui/buildinfohelper: Drop unused import Date: Tue, 10 May 2022 08:05: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 ; Tue, 10 May 2022 18:06:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13684 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit aca0ff85109f4b0f3c201c02c3f59cad7ee2e787) Signed-off-by: Steve Sakoman --- lib/bb/ui/buildinfohelper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py index 0761f73b..9c4215f9 100644 --- a/lib/bb/ui/buildinfohelper.py +++ b/lib/bb/ui/buildinfohelper.py @@ -45,7 +45,7 @@ from pprint import pformat import logging from datetime import datetime, timedelta -from django.db import transaction, connection +from django.db import transaction # pylint: disable=invalid-name From patchwork Tue May 10 18:05: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: 7858 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 8F486C433F5 for ; Tue, 10 May 2022 18:06:23 +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.602.1652205974213689466 for ; Tue, 10 May 2022 11:06:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QlACOePE; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id c11so17414115plg.13 for ; Tue, 10 May 2022 11:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AjANAmCOUBkBqwzL1akKeBlVniAPLvilxVdcLQRtr18=; b=QlACOePEUQApvj7NBwAT+ehdBzZQxdsBRFrv2QN+eN3JFi3t8yeAwfyd+da2F09Zhb C1wfFMnaQZVk/IQOh8C6fd8T0TyGWBe4F5QiXD1MtgcTLoSYA7Cy0QF4VntJbOsLDLp6 Fk5V2sC0H7wjsJ/940kUjiSUR5bzFQSB/QWGJDcHVcVKffn6WyX59l7TbXNWAJp47jGq 6ki7rDQI0vglFAq1yIRfeDb1EKAPke69lq3pRV9qxo+zKjBmZf3PieY9PvBbtgUPXgFz OsgFKvi7mPPfgUDFqTAyJy8yH59GDy70NARvuIpf6nre6trO0QhyLnDch3h/8nJffInx yHqQ== 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=AjANAmCOUBkBqwzL1akKeBlVniAPLvilxVdcLQRtr18=; b=DxYvMrplvHaQGHyHsC3q50u9nVRRsSgxU4YDx4tBZVVIN6lgih79BLEI3bwcEd9DKQ LSYkS4pZ/dTu6gqMkoUKPwnH0lXs93/nQRE7iTj7mz3yACwwLynwTbSQLOOregZ78kPf ufB1Yj1NKYekN3QbSzdmJ8glY3eVwPF4dokoxg/tTpmhpMVcb2txhb9ECF9oqno4E418 DPhG/v7bYG4OofjQsQXyVaFRPN32w3g23jvWLiaWhsrEjEoD/Psj1SYvRMFramUWd6j4 CxxMMQxve/4BjB0YOzyAf09vuPJ83w1PTSJpjda/C+Zp8nwczyWzDkahYA2BPIKom2tB Lgqg== X-Gm-Message-State: AOAM532IXl9uhF7kAnKMS6DyXTQAUqN6O+eQK6Adr9fyUe7WmcPEeh8u hnLFv7WjoGlE83h+0kgogO0lj855LsA1Az9z X-Google-Smtp-Source: ABdhPJynQzPFHTaGRnYxtcsVeWazQjz/MKusTFOUCMMsi/GdLYnhB0yV5sitOUhwBtRmnrO5FFC4AQ== X-Received: by 2002:a17:902:f24c:b0:15c:b564:e4cc with SMTP id j12-20020a170902f24c00b0015cb564e4ccmr21435032plc.137.1652205973118; Tue, 10 May 2022 11:06:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:12 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 05/18] cooker: Drop unused loop Date: Tue, 10 May 2022 08:05:30 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 10 May 2022 18:06:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13685 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 1c811ad6f10560e7a7fb6830cf83707551ba04bd) Signed-off-by: Steve Sakoman --- lib/bb/cooker.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 08593d11..6da9291f 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -744,19 +744,18 @@ class BBCooker: taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc]) mcdeps |= set(taskdata[mc].get_mcdepends()) new = False - for mc in self.multiconfigs: - for k in mcdeps: - if k in seen: - continue - l = k.split(':') - depmc = l[2] - if depmc not in self.multiconfigs: - bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc)) - else: - logger.debug("Adding providers for multiconfig dependency %s" % l[3]) - taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3]) - seen.add(k) - new = True + for k in mcdeps: + if k in seen: + continue + l = k.split(':') + depmc = l[2] + if depmc not in self.multiconfigs: + bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc)) + else: + logger.debug("Adding providers for multiconfig dependency %s" % l[3]) + taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3]) + seen.add(k) + new = True for mc in self.multiconfigs: taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc]) From patchwork Tue May 10 18:05: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: 7859 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 90DD1C4332F for ; Tue, 10 May 2022 18:06:23 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web09.625.1652205971397246784 for ; Tue, 10 May 2022 11:06:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5l815EF3; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id cx11-20020a17090afd8b00b001d9fe5965b3so2646079pjb.3 for ; Tue, 10 May 2022 11:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=irAwxtw+2l2pV2lfo2mVFihkd2cxnyjtQMAgdh0nskE=; b=5l815EF3nuVJQFEWbaEb7+RPwmKcJEuM7LgWHnJhm8fwBhzWKhSiPLZMpq3eHG+eWP HFCqt7KnVs3UKwaNvzxFke7HVIsUbxkLr/RZotkRABUlYHMgRhh27lGNRADpv5d9XZQe LJejzRNA62IxXuocnda4qGWIqMwv1Q42DAwvpg5ZsYWa6mvLZBJo19WrnpYTVkiWz8cb cQeZobtK5dsqZ8f33TNIWxJXPL3oSK44Hx/T083TBVtRifsh+I+dQBQmAuOUSZ2Lbs/8 E9Xe2nrzOrpPXkct1cXG8DZyf4UVxtfKgyeT6b4iabv4lP/uGLi4RdRHRKd9jOFU1Qfv qgMg== 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=irAwxtw+2l2pV2lfo2mVFihkd2cxnyjtQMAgdh0nskE=; b=nBIKmK7qeY3Y9AfpnR5YlTr1oj7WrE4wLOezmzGLVZw6hMUz6fNxHgGMZaIFyPFvWd AwQ2cOmA71ZMPPP3DIFiUO+8219MNoH3pJYcRsiyL02G+ea6heo4y1XjdJP9Dv5Jd/bG FPGN37EbgrKqq8HyVQCp8NmMzb20rbh0Z31sb6k7iS8XlDs3KihLTtGVf1PN504worcs fmERb5VscG13bLnNDr3rNPowWPrTaQgVMD23TQK+bqTS1t8HkDwJMYuYKXxenalAFjH8 OLL5SnDbqggwgcLovkfF6d4gUSKXa1tIJbPBHlFD2Dn/Pl/ky6P5HxXkExmxUYJDisos +hkA== X-Gm-Message-State: AOAM533STm/f4We12lvB2xscVoGk9opJOVCxBGCCHlAulpsxppPr8UXK 3nsb4OriWjG1T85VI29XG1pg8eH27XNFbmdN X-Google-Smtp-Source: ABdhPJxoqUZcSKZFh2Ne7HOetSJymny3GAegklP8GhYAenSub24X0rDbOs8h2whrzlL2CFlKnyNqIQ== X-Received: by 2002:a17:902:c409:b0:15e:bdd3:1fa3 with SMTP id k9-20020a170902c40900b0015ebdd31fa3mr21668125plk.67.1652205975650; Tue, 10 May 2022 11:06:15 -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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:14 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 06/18] msg: Drop unused local variable Date: Tue, 10 May 2022 08:05:31 -1000 Message-Id: <98b6158c174779fcfa214bb52e2e91d1db86ef83.1652205806.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 ; Tue, 10 May 2022 18:06:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13686 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 140929b404ee1e2f5e0e1a3a1d3aa49fb3759ade) Signed-off-by: Steve Sakoman --- lib/bb/msg.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index c95a874b..93575d89 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -133,7 +133,6 @@ class LogFilterShowOnce(logging.Filter): self.seen_errors = set() def filter(self, record): - msg = record.msg if record.levelno == bb.msg.BBLogFormatter.WARNONCE: if record.msg in self.seen_warnings: return False From patchwork Tue May 10 18:05: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: 7861 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 980E1C433FE for ; Tue, 10 May 2022 18:06:23 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web12.676.1652205979333931980 for ; Tue, 10 May 2022 11:06:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=E+3Attjj; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id 204so12786675pfx.3 for ; Tue, 10 May 2022 11:06: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=k6uq1/hvG3gnz5PVSBkYD3f/A5maIEDVH4g5gUVaGOc=; b=E+3Attjji8zFAUxQbHXflGWd2nYfl3p3k39NHLtb9vBu8ZFvmXTRa/TDH/vBBOySR5 FpeFQ/TSscn9/08Ztz0lzEhcGxImI9z4oslXMvcXxaDQkerPCtNF8DtUEVVxEo854J9y tFDJty3g8bW6P8t/ulLMyFOppFo7dYckjwO8fFuB9NQrX12JoKVFZDTonULOwqV2Ci9w VyyKOwoIwCqZly/ktxEWOKguYquaVKJe8ky+LSwDSiLmiV0dTy3zkAprHaVWkzMqMy49 XPydu4GovtkSTxYsH3XrsSE/XNtXnWnbe/z1gdJGoLJK/8mMiXCY+xpr1W7WKakOUO8k d6GA== 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=k6uq1/hvG3gnz5PVSBkYD3f/A5maIEDVH4g5gUVaGOc=; b=dCZZwsvoygwiGDvtqyy9nb7NEDYlfKPzInQHFC08F79FspTKXFmGY1JP7RFbnjA27k FNTKylfZyF7uMmNUfi89qcbxOJ2q/ybBMsOMuLsjzELJJYzw13UxslPVTNyCWJigfsD6 CBKIWRPVyO8KKkShBo95pQyLnDTztcKO23+0QqGjzvaldzG3S1RqF2ElqedA3Bd+6eiz nv1FSNW1vfBbOgv3xNhRD8gc/1wzS/7ZBZtGNazKf15MRJHQcMTT4iAfhexqYCu8jp0E ejJspF9d5t1DLQ9FgFk2GOoXVdIG34wbNu2RNH7N/WuJxS4N1y4k1Au1Z2/fIou5z61d Vxag== X-Gm-Message-State: AOAM531JLayVEEj7u5cZFnYt6R9nC0ECvtkWyjp0zzBqoTKb1B0glf5W 36UuUsUcLwvHcrmqdoSRNdnbRzh9zEgruVcJ X-Google-Smtp-Source: ABdhPJxpCnzTd8Q4dBXLwrga5DmHm8WBk7AIquFQarXJIPhxAJ42XBG+x6j/kcCWTVm2EKXFvCHJ0Q== X-Received: by 2002:a63:2a0d:0:b0:3ab:392c:f45c with SMTP id q13-20020a632a0d000000b003ab392cf45cmr17807496pgq.575.1652205978154; Tue, 10 May 2022 11:06:18 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:17 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 07/18] buildinfohelper: Drop unused function Date: Tue, 10 May 2022 08:05:32 -1000 Message-Id: <2fce0e575f843099aa3a77cdadb9cdecc0a78ca4.1652205806.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 ; Tue, 10 May 2022 18:06:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13687 From: Richard Purdie The function has a loop where the variable is never used which I was going to fix but the entire function never seems to be called so remove it entirely. Signed-off-by: Richard Purdie (cherry picked from commit 3bcb20f025907f4e88bbe3d14f5638d5f01010cb) Signed-off-by: Steve Sakoman --- lib/bb/ui/buildinfohelper.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py index 9c4215f9..c4ca2677 100644 --- a/lib/bb/ui/buildinfohelper.py +++ b/lib/bb/ui/buildinfohelper.py @@ -1062,27 +1062,6 @@ class BuildInfoHelper(object): return recipe_info - def _get_path_information(self, task_object): - self._ensure_build() - - assert isinstance(task_object, Task) - build_stats_format = "{tmpdir}/buildstats/{buildname}/{package}/" - build_stats_path = [] - - for t in self.internal_state['targets']: - buildname = self.internal_state['build'].build_name - pe, pv = task_object.recipe.version.split(":",1) - if pe: - package = task_object.recipe.name + "-" + pe + "_" + pv - else: - package = task_object.recipe.name + "-" + pv - - build_stats_path.append(build_stats_format.format(tmpdir=self.tmp_dir, - buildname=buildname, - package=package)) - - return build_stats_path - ################################ ## external available methods to store information From patchwork Tue May 10 18:05: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: 7860 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 9CEC0C43217 for ; Tue, 10 May 2022 18:06:23 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web12.677.1652205982322914085 for ; Tue, 10 May 2022 11:06:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lCm1NLh9; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id v10so15245788pgl.11 for ; Tue, 10 May 2022 11:06: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=ShqqtqrtJ+nE5Ow0Ym8bK7Fy0Vr+EDh8BD8+HEINatU=; b=lCm1NLh9zX11D+/W22J5cgoMHz1CQqi03stkZJEr8cvMUd+cn0lqNEzpvWSdH3cdk8 RC65ckb6bOcRrBL/Uz1CwC3G10dWECL9IndVOjT0b3mVLoqkiGrjRf3Ri8pOSJUDy/Ol QpM4heQ98YMI1KmHnSfUn+/SuhSpzgAitevDmRHF5tuZEg0MIxoU+ThnJ4zvYyxDsX5k Rj1lOuRh09pB0SUya2YzgfeTOZoXF1RZEw0s6kFrQz1qO8Iwz8xj04vIIEt5iMvwrU05 2mv5TTd386mZFSeucwGMj9E1zEFn98HUnXA4+vzzUHpwe+XXd60Z/i5fwFsOW1FXZX+R nqIA== 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=ShqqtqrtJ+nE5Ow0Ym8bK7Fy0Vr+EDh8BD8+HEINatU=; b=AALuhQyPpx/DDfSvxDw65ZDwXlwVx2zFAzHceNg/qlAMMdOCBy/6b6tOspv8UxcWce f3NXo7qh6AFaNtSqgxZmxLkUUnsaVcYgTzl0Ye4OKvC2DWFRyqZMZAvkWY+v5W7hRl/M HNETBKnie+CbK05NqXLXz8u1MGwqlwkROfCRJ7sYMGKZjDAKTdY/3VH39+45EAc3AGMD 9lxXxsGaXPyGO+LvdU6MofUHRbDFZxZcEpU/eMYBJcx3BhapDb6FP9/oAZRO9i6uyNtv Fa2/3dHmUzMGaV42/9irWXcYJHqKPqUMhF7ibRIbRd3Zu8ksVIEEjvkdM0LCSLbEK79E EBIA== X-Gm-Message-State: AOAM530IdFgE6EBY/JDmi5FP/D8Mm0gN/QRzw0ArI2+tHPzIzd648lF/ U1fePbTVpykEegf+dJXcQvE/3WJPM+9/i/TP X-Google-Smtp-Source: ABdhPJwuRyyNkgY+j4I9xhawokXkKwzKfVqKmGeMjL3lBc8tELDZYcloGjcUe+4F91uo2OakH3xahg== X-Received: by 2002:a05:6a00:230d:b0:4f6:ec4f:35ff with SMTP id h13-20020a056a00230d00b004f6ec4f35ffmr21667880pfh.53.1652205981210; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:20 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 08/18] fetch2/crate: Drop unused import Date: Tue, 10 May 2022 08:05:33 -1000 Message-Id: <7fcb08de9ab8d65beb8d6129a7e17da348759248.1652205806.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 ; Tue, 10 May 2022 18:06:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13688 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 879f17ecd5ba09e217cef74f6a51339b145e8ef5) Signed-off-by: Steve Sakoman --- lib/bb/fetch2/crate.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bb/fetch2/crate.py b/lib/bb/fetch2/crate.py index aac1221c..f4ddc782 100644 --- a/lib/bb/fetch2/crate.py +++ b/lib/bb/fetch2/crate.py @@ -13,7 +13,6 @@ BitBake 'Fetch' implementation for crates.io import hashlib import json import os -import shutil import subprocess import bb from bb.fetch2 import logger, subprocess_setup, UnpackError From patchwork Tue May 10 18:05: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: 7864 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 A33EDC4332F for ; Tue, 10 May 2022 18:06:33 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web12.676.1652205979333931980 for ; Tue, 10 May 2022 11:06:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ORN44P7C; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id 204so12786675pfx.3 for ; Tue, 10 May 2022 11:06: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=l9mvRF+fYmbAFx4Hjsju3wAPx2UNNTLXahEp3b0m8GE=; b=ORN44P7CpGl0gy8PxRha+8xhDMpE58pd1E2FJV5EDrO9YYH26cyanuREkMKrZX1Z6U qDp9e3t/obCixFy/gjb0K36YFS3+ZuO94T2AzlawBGIf9eAKBjygOarbLcwNS44bJ2oo BZQjeDQycQBLuqq5kjgjqZglF251tgv8IEUhgowp8UilowU8pQwCRVgskJhx+N1ZoD7C F/3NuPSNuVR03db71AQajUAlk/WYa6de9o9DmiIgDvr8nSFsQRbnsR6fqurJLvTBxbwM epEaKU4Hk+uraFYju8oAes+tMZ1dkdMQYlSb7+kNCI3sMLqdM4QOz+lTVTiz/N2irqVj CUDg== 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=l9mvRF+fYmbAFx4Hjsju3wAPx2UNNTLXahEp3b0m8GE=; b=OOkv5tG221AwgQuDqfuJ5PidUtR58qJSRwfU1WC8MhAEXbvwT0wtbGHLXUo96hJrt9 TUOCngN6k7UxAzEaKD/I+YNKQBL4wi45EWgw53gzjx35ecszFqewIQoWACGiXFC8xedz RQId8zfk941dMv/cnnzFYWSph3tdN30IdhLQAjY5kV2uti0+CkoUvaM81AtAdC+3eouC chxERsINw+T+NoqMkIhXfjl7eH7uwW9YV42W+9Iq2TAZKkN62+MGpqnWeKlvrFYKEitw KDeSRovkeYl3MjKVUNVVFgyrwj4komlHxtKff7Es/4sDSxBmlOMGHoEYFWBMfpN/10Yn JbfA== X-Gm-Message-State: AOAM530Ze09Ilwg77AtbqqSGbNZzH4I38mJ0nf73ddlXU9voPPM3Tvw4 KaLYOV2hcGAdU2L0uk/4gMEyLkwF9uEINwMk X-Google-Smtp-Source: ABdhPJz/WXgkZBdeLPlBp1VmRa52rEkWAEli3KAFhFycm1XQ6J8j9Dj/z12PgE4UozAqMe+eyCR/ig== X-Received: by 2002:a65:62c3:0:b0:3c6:12b1:1177 with SMTP id m3-20020a6562c3000000b003c612b11177mr17612759pgv.597.1652205983826; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:23 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 09/18] siggen: Drop pointless break statement Date: Tue, 10 May 2022 08:05:34 -1000 Message-Id: <8f6d2339ed4578986fdf7a13ebd278df041067b9.1652205806.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 ; Tue, 10 May 2022 18:06:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13689 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 42809f6acb79e39042e81d54c28efb92b7481e44) Signed-off-by: Steve Sakoman --- lib/bb/siggen.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 130b38d8..9fa568f6 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -40,7 +40,6 @@ def init(d): for sg in siggens: if desired == sg.name: return sg(d) - break else: logger.error("Invalid signature generator '%s', using default 'noop'\n" "Available generators: %s", desired, From patchwork Tue May 10 18:05: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: 7863 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 A1782C433FE for ; Tue, 10 May 2022 18:06:33 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web11.611.1652205987756061556 for ; Tue, 10 May 2022 11:06:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qh+ldY4G; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id x12so15257552pgj.7 for ; Tue, 10 May 2022 11:06:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5XhttYXoW9GNle+UOsHsjipgvJ0IppAdGNzM41y3NZ0=; b=qh+ldY4GhBtzLph3Vps/Wwtr2Xn8/bunz5rIUVCMRjP2WuZ9P/o2pfVWpbxLDPTZ9C o46+w2JZ89Cdu7WXj66AST2cQvMkEnV17HNiEne5aWbvpaiZvgSiLaMSYvwee7FkAKku VhqYZnpSZMojsD1mzUNkB5LmsVyd9E5r+l3v+MAqmWMM/ADBqWUkVma9FQ4VGKpjD1fJ 9AiQwUJLq1FRud8LITlspsfJAujGbctXJenBk6MG3ITPCESlw8bvmirx3Oswr0rf8ibM WUqXnl9wXhvsLHUSvS6y27exYYfLaIp/8mL4c1vuISg0R1dRnT9UcOuyZlGoXfH1m12i mPiQ== 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=5XhttYXoW9GNle+UOsHsjipgvJ0IppAdGNzM41y3NZ0=; b=I1OWVZIFG6GAlg+tkgDQl7VydjpMvYwBAxKQXSqaogOmgv7EJN1eSK+yd8cKNUDWGQ 9SHZSxnNlW3Po16aAE+Lr3uS8wIB6qsQWepl0/gG7K2ppVX8xjUAj5ODM1eZyBageWC3 oLt1U38Mqi3dTNexOdmGXWCEfnBYoFcIUrEsrPR3RT4JeZsdfoFpN0bIgTr2ckUBXTfB 7DtJkeRdSJtHiB4LllRThY7IxuzJ1rIMCL2cEEzdLTcjEXt3Sg6Bf/0qZn7QXfgEi3gY sVUXhtun2sEraLPVa7wjagiengKuJwaqFwAshpWEPoVWZVdI9Yaol2afolMFUdIVSE7C GuJw== X-Gm-Message-State: AOAM530OAtMGKgFXRfLc5/Wt25cg9bFqra8bZhR1d7alPI2thaw/xdEd zKEtyQ3bYo+bOSKILeQzx7EyiwlXGwEjr/0/ X-Google-Smtp-Source: ABdhPJy7+GM6nKeCYN//XTZRqi8ZKyZSKuH6tqESD4DNg7aitJ3bKWtQpjYXEgUmTdVudp2BYHP65A== X-Received: by 2002:aa7:83d0:0:b0:50c:eb2b:8e8a with SMTP id j16-20020aa783d0000000b0050ceb2b8e8amr21636266pfn.31.1652205986587; Tue, 10 May 2022 11:06:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:25 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 10/18] ui/knotty: Drop pointless pass statement Date: Tue, 10 May 2022 08:05:35 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 10 May 2022 18:06:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13690 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 625565087d8c9e7a6a79b0b4f3e5be2d77d5f100) Signed-off-by: Steve Sakoman --- lib/bb/ui/knotty.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 3f410fd5..61cf0a37 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -877,7 +877,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): state_force_shutdown() main.shutdown = main.shutdown + 1 - pass except Exception as e: import traceback sys.stderr.write(traceback.format_exc()) From patchwork Tue May 10 18:05:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7862 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 A1756C433EF for ; Tue, 10 May 2022 18:06:33 +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.602.1652205974213689466 for ; Tue, 10 May 2022 11:06:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tfsaHNku; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id c11so17414115plg.13 for ; Tue, 10 May 2022 11:06: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=aKbu0GvbKgFsdxb0O06GEBcfek2ATD+zAShT4dJgfHE=; b=tfsaHNkuqnIhUeAUtzTmVSt8HZfEp9/ubTHvthiHUYX7zRHyEHoYzKMQilVQlUnSsp UElpQa51+2oAtudxLoUStOKtFMu7oidOfIx2Y3ju/IL819+0gpP/xEMknjl1XPNrPyFx SpACa8fLV4ZEFXrXAhjBdJ/ghuYJGDnbvVgxonvwldzoPn7Hqo1HGbL0ABsO339rBs+W 8Ru+lhiOgA6H4uegbnzwPPfQdWVyqnUJkUD45m2wUxRt4QI4pjK1yUq244SW3vCPCBCw j1c+oJk4YsAA7CuiHnxNSA5J5hcYKbwgflFHtLTnRSFspHwZtb3kSMmihBDOGBBRMw3a L2zA== 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=aKbu0GvbKgFsdxb0O06GEBcfek2ATD+zAShT4dJgfHE=; b=AcQTTqqHxlMXpYItp0kwCjhYwox8Ze2NQ96e+vTs3APx3l7aeeJmmD7vB/VD0zKwB6 I+XFA71+gjJR1o+scM6FlaSFpxklmmhaFeeIkdlRGSv7J5LH6IOOIevqKlP6t0EjBmjW +Ae+2SH51k+iCpufyzJpPaYCAyp2KlwgdiCwEI+mjC46iiS5YvPKECS0JrlAbkWh09o7 X2k3YiL2U4XUANA+3TCsC6NRWoyzoD2LnqAOg4sCNiIwGmfrrqt0Q5zq7js0w6SULHx9 FTyy3PuuHx/Cuyi4ukObDVSUY+EBgQ3udsJMdEnpXqhzvLtjUrl0FoWqrO9xMG4ibfFv NNMA== X-Gm-Message-State: AOAM532nOfxU7j3gPh2GTxV2SLyvtE2yfLxLupAm3Id6OQXAmo3+w1xH rj50dAx1v1SDHnIYiu5ZORz2C94dW95HyfV9 X-Google-Smtp-Source: ABdhPJygC/mLF0skNHfe/b6mb8cfueRj3uEECekSFMSbyD5mQ7q8zeF8NrNqQnUydtVlisJHKZ6Nlg== X-Received: by 2002:a17:90b:4f4c:b0:1dc:acba:9f3 with SMTP id pj12-20020a17090b4f4c00b001dcacba09f3mr1111732pjb.159.1652205989286; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:28 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 11/18] persist_data: Use a valid exception for missing implementation Date: Tue, 10 May 2022 08:05:36 -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 ; Tue, 10 May 2022 18:06:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13691 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 7254eb6b3e8ef504ef2274541dcc55f1d42238c6) Signed-off-by: Steve Sakoman --- lib/bb/persist_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py index 9e20a837..ce84a158 100644 --- a/lib/bb/persist_data.py +++ b/lib/bb/persist_data.py @@ -208,7 +208,7 @@ class SQLTable(collections.abc.MutableMapping): def __lt__(self, other): if not isinstance(other, Mapping): - raise NotImplemented + raise NotImplementedError() return len(self) < len(other) From patchwork Tue May 10 18:05:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7865 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 A4D6CC433EF for ; Tue, 10 May 2022 18:06:43 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.614.1652205993340569441 for ; Tue, 10 May 2022 11:06:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=UZtb5WVv; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id a15-20020a17090ad80f00b001dc2e23ad84so2640237pjv.4 for ; Tue, 10 May 2022 11:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MUTfbQBVdwP0MUzP0QYHspmFyqMeTnWUzIbo98ngA7o=; b=UZtb5WVvKus+LKpOt/BRgeI3pPnTcOEV0c7iDDh8ckynksAijkpa1Napg/ocxcmMCy c8M2tLsF//s3dlJ1AvxTfW81Q+6B0KEbGFA4zd6l5W0fIbjz/xckVrVnNCE6IzwG3HDc 2lulLTaoS79J9J93PnxZj3L3httw7PZz9v2RAeLtdJmrOmNLdvYhk3EVUacUhLogkv8O CmRjai55CgUXQ85fIWDoW6p9m0270omJdvUME1w9r4Hm5BQPRXrTqOwV22Sba+sA6Tv9 ZvG34FkpNxhUUzhb0GPJKiyYW6ibeX3k0/bdUjc8e7sYdRD8TkTKN25HieyEF2MDf+fF E4Mw== 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=MUTfbQBVdwP0MUzP0QYHspmFyqMeTnWUzIbo98ngA7o=; b=o7gPqrJuzrPGum0OhRjYu2kF/pkfQUXmenugm62riYP06K9jivQh/tmWRO9vq1conj syyvZMNaZcjsEyIO7zOKvQS3flM7dVSh0QmrjkVHC9kJg2ILAI3gV5LMrHdb0GEVpJBc xqBK8Ec46jNTcY5r3TZhzxMjFvOdpZxyLbVS8YI1GQnItLxOMcLmwLtlNpO1PTYbym01 /EhvboPXn0WdoPIobdw+Iq/Z0bp227cqQHckphpB19vkzGxIdmHT8uWTGmC0J+abHIOC a+hHJ4jHUHHP9LaxFhWzKC98YyBCJmSv+SurZf5UNPhV3qEcoGlBw3R+D1isONg0mP5b B7tw== X-Gm-Message-State: AOAM531N8rOAAFTV6rnweHM12DqgIRpQJOuZE2IBBrhODFY26pXVydna W5FPiPqWGc9D8E6ZRpfKSPoK7PqhJLNfPJpM X-Google-Smtp-Source: ABdhPJyjBCWPLozkrgY8LVVQcbjJOfsGhZoXtbSzvs+mbE9Lw2VyTvxSKZmdtX0VSiClPKuf/e7cZw== X-Received: by 2002:a17:903:244f:b0:15e:bb9a:3aa9 with SMTP id l15-20020a170903244f00b0015ebb9a3aa9mr21494571pls.78.1652205992247; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:31 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 12/18] runqueue: Drop pointless variable assignment Date: Tue, 10 May 2022 08:05:37 -1000 Message-Id: <190c61d94a54b5eaecfc850640c91f1360ff3543.1652205806.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 ; Tue, 10 May 2022 18:06:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13692 From: Richard Purdie This is set at the start of the loop anyway so it does nothing. Drop the pointless code. Signed-off-by: Richard Purdie (cherry picked from commit e6a3173c9cdf349ccbd4cf612868f92cce8717c8) Signed-off-by: Steve Sakoman --- lib/bb/runqueue.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index a7a84630..a4e82f37 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2664,7 +2664,6 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq): sq_revdeps_squash[point] = set() if point in rqdata.runq_setscene_tids: sq_revdeps_squash[point] = tasks - tasks = set() continue for dep in rqdata.runtaskentries[point].depends: if point in sq_revdeps[dep]: From patchwork Tue May 10 18:05:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7867 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 A4DD8C4332F for ; Tue, 10 May 2022 18:06:43 +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.web10.607.1652205995786449277 for ; Tue, 10 May 2022 11:06:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xDhL2C6Q; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 15so15262166pgf.4 for ; Tue, 10 May 2022 11:06: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=i4JX2FIE8z2GHfYLrQ3C60x4EdVG08opUO5KVHDrXG0=; b=xDhL2C6QggGXwSzuz8JlWA8vuL08JKp9rT8/csTQulJlAt51UdqKmjS/WK8A5gWCLI kxJll84tqmUHOGc4CRKrDPPpyeVQJxYicxcctvRmVgRagvz4UiTMjWRCchXK66VBCg80 VoxufZrqg2IJec+9c0JscplHpbSUcl7Q90t+FdBdAEvOa2ckNevdmyY8ddho7D/hxvtU 9WxOI7MZlIbWbBYeU4ydzNvbQgH6OLvMJaBayAu5OiHI1lsU1RY2cUHaG5yk+VpK7hYw ZBWb2ITwiYw/q+nPsyeMyn1Ki2O/0Nj8Bup7HYweJMgIpsO6zOGnRISsWStl8fQplETd xX7g== 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=i4JX2FIE8z2GHfYLrQ3C60x4EdVG08opUO5KVHDrXG0=; b=uZXngrwFCj2X/ypFA3BP1hRcsClOrpuJEGUIj51LOjTxbcFYx11Po9YoC2zLjeTir+ 0jPDkHGSaEMg7MoHBdQVJd1GuPFpe0VQG9hPW7ygEJztZLdEM6m38ZyDE4Zzio8+9J3s b6M2SgSqbUFuBLZ5uqnfK4QwvuDgqM/FWuEk5MpUCuLChf5aIXal5ybIusxQdu3dRfTe b4qxob0mvZQOFerECZNpDu5+ZiCFJGk+mdXOp5qFYmRAflSZluxMloKSgQF/RVHkUYtI txTE5i7J7lTgplk5N1zJKKXKLekY3hqn42FyF/sa/UUS7eu159trPuPwH3smE3sNOfLY Vmpg== X-Gm-Message-State: AOAM531SafLsXAuwTJMpNyI7MdjbL0yKdLpPXgjNbhtvQRZKw3iJUtst J7B6sONHruzXgeAFEhpXAgLKA2oJAggR1B3m X-Google-Smtp-Source: ABdhPJx6C7aYxPCFhale5P8wRK1Cf+z6h62QcFJUd3qwVbIo2R0RKkaX6/bHGcC7OUyq4A3NQJyZxg== X-Received: by 2002:a05:6a00:1941:b0:50d:807d:530b with SMTP id s1-20020a056a00194100b0050d807d530bmr21469460pfk.17.1652205994688; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:34 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 13/18] buildinfohelper: Drop unused variables Date: Tue, 10 May 2022 08:05:38 -1000 Message-Id: <3ca8346167c381a6b6c1db2fb68ca266e87abd74.1652205806.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 ; Tue, 10 May 2022 18:06:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13693 From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit d720dfa40620e64a557edef527148d58fcb1d858) Signed-off-by: Steve Sakoman --- lib/bb/ui/buildinfohelper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py index c4ca2677..129bb329 100644 --- a/lib/bb/ui/buildinfohelper.py +++ b/lib/bb/ui/buildinfohelper.py @@ -496,7 +496,7 @@ class ORMWrapper(object): if not parent_path: parent_path = "/" parent_obj = self._cached_get(Target_File, target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY) - tf_obj = Target_File.objects.create( + Target_File.objects.create( target = target_obj, path = path, size = size, @@ -561,7 +561,7 @@ class ORMWrapper(object): parent_obj = Target_File.objects.get(target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY) - tf_obj = Target_File.objects.create( + Target_File.objects.create( target = target_obj, path = path, size = size, From patchwork Tue May 10 18:05:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7866 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 9CE3AC433F5 for ; Tue, 10 May 2022 18:06:43 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web10.609.1652205998184472247 for ; Tue, 10 May 2022 11:06:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=azg2g8ls; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id x52so15580907pfu.11 for ; Tue, 10 May 2022 11:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=N1Y0EIx1oVrzRhafJE7gCCEntMxO5O0I07rapMu3228=; b=azg2g8ls6UGRikcBt6IA6VFSeg2YvNjhlx1l1Wg9RHbrLrzsHlkBpNCA/gpzBgOD6B BP2CZSBB+yAxOB3kL1AY26Okj/ENZ6sq6TZ5hOyQifQXOaFmibyMeKIBiXZXzfLAmVMa MP6oFmEeggiRgEvSJPq4MwmOp1NDUOY1lcZ603QAza4p5LFSd/eCL7gIC0RQdVPbbGvI H5NQ+5Y6dOgiRfdNtSWYq8fsnpthQ6xN66HlBtCKkFV4mk8HO9tmfkmYEzNgJlz8MYQd CWY4tH+HmwVbNgbEwOBajHrJRJvsjLIqimqzU3u0CgflTFnev8m46+gqL60s62dFctCn yeiw== 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=N1Y0EIx1oVrzRhafJE7gCCEntMxO5O0I07rapMu3228=; b=aiN7RBG7pSfraxWa5A8dNsc+mPzQX0rZQDJuHDdqBf12DgTkOMNcPrvGQwQhXnGTb2 GmZ2RtrbPHB5waQa9oE6Doneeiog9LUs1ytDbUeKEiibNZmnkPHoqoIOAoNIxJjZ8uMv lC6gw2/I40ZrwMJSvobMrEAWSG/BqBh4UPBNx1oa1oNQNObcFrLHWYy9vvj/9QlhfazT zM/UJarfUAkecgug/ETjI3GJvAQgWJSi4D/nGaxKbl0C2aMrcJ8OmVv09tgTDP9kG5z1 wSN5wb/zAYxaLiCEipLU/xq5f35jPylEm/QOrdBt9qsPr9pZIgzoWMAuy59K0TdZXZt8 cryA== X-Gm-Message-State: AOAM5310m0nedXNPgivLO69KmU98p8D0C6HR7XyUNSCE6p5KqsLkUltp GyNxXRqTJ/VQj7nLsIezCXIaRTGt1uzE2E8F X-Google-Smtp-Source: ABdhPJwrC230EyWP8vyNlHeTKRUl8wtVsecLgoQDVlvwy7cb4lVlxKbnCe8rybxl3XqCGynNVTrK5A== X-Received: by 2002:a62:1687:0:b0:50d:3364:46d4 with SMTP id 129-20020a621687000000b0050d336446d4mr21563569pfw.74.1652205997107; Tue, 10 May 2022 11:06:37 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:36 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 14/18] fetch2/osc: Add missing parameter Date: Tue, 10 May 2022 08:05:39 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 10 May 2022 18:06:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13694 From: Richard Purdie This probably means the osc fetcher isn't being used but fix the missing parameter. Signed-off-by: Richard Purdie (cherry picked from commit a23c201cb6efc5c0abf763c26f905442f0eebb68) Signed-off-by: Steve Sakoman --- lib/bb/fetch2/osc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/fetch2/osc.py b/lib/bb/fetch2/osc.py index d9ce4439..99a529e5 100644 --- a/lib/bb/fetch2/osc.py +++ b/lib/bb/fetch2/osc.py @@ -43,7 +43,7 @@ class Osc(FetchMethod): ud.revision = ud.parm['rev'] else: pv = d.getVar("PV", False) - rev = bb.fetch2.srcrev_internal_helper(ud, d) + rev = bb.fetch2.srcrev_internal_helper(ud, d, '') if rev: ud.revision = rev else: From patchwork Tue May 10 18:05:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7868 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 AD09FC433FE for ; Tue, 10 May 2022 18:06:43 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web12.683.1652206000910398894 for ; Tue, 10 May 2022 11:06:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3Qpt3nU8; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id l11so9692173pgt.13 for ; Tue, 10 May 2022 11:06: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=wpYxsLkAZarFu1ZNhLqkIWcfTi/243R9XscNnwxz4+8=; b=3Qpt3nU82ZPT9s47gDhD5It8U0svAbEJUGh1c/xT7xieF3dXMT3wrPc2hx+GxL5pyf jyC2LMjBtY3kpw3Ecq2K8swZOZyKkS+8TT2Htx5tYmTD+DhnlHM2epo4nq/pLJUT83vO 9ebsktGl0esN466U+L4rWab7VY3Ev92M34Lddt5VNzc52n/w7bgTrbf2AdzC8j3Zn8av oLgpCsafzZhyEZXmdganFfEoJF3jzpCmOJPIh4XZJJcuq/xzVznnX2z/fNdSRRIDNUH9 cRrQxy1gtC0jlvwxv8XCMLr2exFfYM1wvDw9JCPufr+/DwK7c5J9c26pNw8o7U2rsejr CiiQ== 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=wpYxsLkAZarFu1ZNhLqkIWcfTi/243R9XscNnwxz4+8=; b=acNoRATbqtwpTsmqGb9u9zJ4oWMkcZAitgaF1XSR95FFMMVhYxCld/C+AZAvch33RT N28xoTCMKPeqHpdJ27KZTQczAbcgwBkh038/5N4g960XPpQ1bQWEiHSMQ598LonMqmJv F8NGvJPXZN+DUIvOdu0tjl0CSm5hpnDg4Zb6DtnLfcxCaIoaspbMrXddOmCA6QioL4bt qVXn7wIiq4iqMQOuKHFKDXoh4nQqHHeDKfAaGcWlUAUbr5PhOrlYW3iItcTMDUAK8mKj oVzoOiicNY2u2XAlq/YRt9z6eASWd/csRk0BByyMJ77igi9jktoM2w7JFRFA6e0mbbxK C6TA== X-Gm-Message-State: AOAM532nnk18qIjJNZQQBNj7Cq+q+C/P8MD/cBipmIyMThUOs2l1Jv9+ Ax+I9Jr53+uHdMAKETZT7wx8Dm2p8FJxt1KO X-Google-Smtp-Source: ABdhPJz+YHXxl1O2Ao7dYhZDw+XeTbW5ZS5s9WINf6HzatK6W5AUVnYwIYR/eevavHiMG/vkNXYA+A== X-Received: by 2002:a05:6a00:2148:b0:4fa:92f2:bae3 with SMTP id o8-20020a056a00214800b004fa92f2bae3mr21705781pfk.69.1652205999706; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:39 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 15/18] fetch2/ssh.py: decode path back for ssh Date: Tue, 10 May 2022 08:05:40 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 10 May 2022 18:06:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13695 From: Robert Yang The path has been encoded by urllib.parse.quote(), so decode it back for ssh. Fixed when fetch from PREMIRRORS via ssh: $ bitbake bonnie++ libsigc++-2.0 -cfetch scp: /path/to/downloads/libsigc%2B%2B-2.10.7.tar.xz: No such file or directory Signed-off-by: Robert Yang Signed-off-by: Richard Purdie (cherry picked from commit c1c8fc678eb4783cea3974328a5fa8d1b79f1266) Signed-off-by: Steve Sakoman --- lib/bb/fetch2/ssh.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bb/fetch2/ssh.py b/lib/bb/fetch2/ssh.py index 48445308..8d082b38 100644 --- a/lib/bb/fetch2/ssh.py +++ b/lib/bb/fetch2/ssh.py @@ -32,6 +32,7 @@ IETF secsh internet draft: import re, os from bb.fetch2 import check_network_access, FetchMethod, ParameterError, runfetchcmd +import urllib __pattern__ = re.compile(r''' @@ -70,6 +71,7 @@ class SSH(FetchMethod): "git:// prefix with protocol=ssh", urldata.url) m = __pattern__.match(urldata.url) path = m.group('path') + path = urllib.parse.unquote(path) host = m.group('host') urldata.localpath = os.path.join(d.getVar('DL_DIR'), os.path.basename(os.path.normpath(path))) @@ -99,7 +101,7 @@ class SSH(FetchMethod): if path[0] != '~': path = '/%s' % path - path = path.replace("%3A", ":") + path = urllib.parse.unquote(path) fr += ':%s' % path @@ -139,7 +141,7 @@ class SSH(FetchMethod): if path[0] != '~': path = '/%s' % path - path = path.replace("%3A", ":") + path = urllib.parse.unquote(path) cmd = 'ssh -o BatchMode=true %s %s [ -f %s ]' % ( portarg, From patchwork Tue May 10 18:05:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7871 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 A09A7C4332F for ; Tue, 10 May 2022 18:06:53 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web09.629.1652206003451564122 for ; Tue, 10 May 2022 11:06:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=eKpXmG8Y; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id g184so12766689pgc.1 for ; Tue, 10 May 2022 11:06:43 -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=CK6I828emvT02CmhlQqIR1l0GCrKwgbOB0SrQ7GUOY4=; b=eKpXmG8YJFpswQ7Miy2tGA36ujyIPoaFNf+2J4BKeiOGmi1InH6C3pjOG3ytmNckzT i2vsPE00fVbOrzra2tZ4guzM30WbOk1raF9sCA1vz5rXr/aN8BwN6hwdHXODkIO7zHGC SO62LOFOMWq2z4znC+P0oBkXHmHQMPL49497TWImZSBPhZJ5VI38XswL/agMi2B9Wh4y HCJ2HxdEGfWs8ZtGZV9EsDCNKXFDDEbxbx2xgR9/Ax2E4JZkuTbyhQ8PkOOqqco4fRwJ AwmH4+7MH/6Qhuv/QCh8f4/LuRlctSzTgyaCfuEJVsGVWFzWADP0jAPiqZrkQi81zYrd jzow== 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=CK6I828emvT02CmhlQqIR1l0GCrKwgbOB0SrQ7GUOY4=; b=YIXEUoq1LgjaZWfy7nKJfkDFc3dfcMfL2fJF8/RMFE+QAA8GIPgylhDDWVnnKXkjDR tffjo9cGS/F/QIc3jK9KIr5+q910M/HK1fh6ftXYnEEl/DlPJmPZv7CeEG5/cdu0jsNa /ByQIz1lMQbuuyfM/mJnwh/ssycmjSq2t1xgdKT7XNBax5k/QPAeNPj0kkVqMLemImrN RCBpyg6KIxOSB7aSwHxneSxi3g0LCkMRyhCT2spLl9nxwHKdUxZSzSRo9KPDal6Ej1s6 fJB+23vSF5NIVcQjdueUsPGs/sr1oM7uYOgjFsmmm9Z5/CmHw/Bq5h6sqnlXyD7QESWo 8M5g== X-Gm-Message-State: AOAM533wkyFX1SxwMvWo97FuV0pfRrCxAUosOK+vNflocWcq56034m0Z jJoSVhGfcV8UpNmqAWNZI5x0FaE89LcMip9v X-Google-Smtp-Source: ABdhPJzbNxQA4FfD3rPKPZ8q+86baF/YOiM1DAZfbG2W6nvB1ZMjdXc1BE32tgO055tygt6my3CrrA== X-Received: by 2002:a62:6410:0:b0:4f3:9654:266d with SMTP id y16-20020a626410000000b004f39654266dmr2981626pfb.59.1652206002257; Tue, 10 May 2022 11:06:42 -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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:41 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 16/18] runqueue: Fix sig file location when using multiconfig Date: Tue, 10 May 2022 08:05:41 -1000 Message-Id: <23d5829088147bb3d296558695833866d1bf04cd.1652205806.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 ; Tue, 10 May 2022 18:06:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13696 From: Richard Purdie We're using the wrong data store when trying to locate siginfo files, fix this. Thanks to Gregory Lumen for spotting. [YOCTO #14774] Signed-off-by: Richard Purdie (cherry picked from commit 0ed800e19a3197f8e622c8d3b630aae384e60aba) Signed-off-by: Steve Sakoman --- lib/bb/runqueue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index a4e82f37..f34f1568 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1674,7 +1674,7 @@ class RunQueue: (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn] h = self.rqdata.runtaskentries[tid].hash - matches = bb.siggen.find_siginfo(pn, taskname, [], self.cfgData) + matches = bb.siggen.find_siginfo(pn, taskname, [], self.cooker.databuilder.mcdata[mc]) match = None for m in matches: if h in m: From patchwork Tue May 10 18:05:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7870 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 9D3CAC433F5 for ; Tue, 10 May 2022 18:06:53 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.611.1652206005982248248 for ; Tue, 10 May 2022 11:06:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2XDwuEgv; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d17so17468870plg.0 for ; Tue, 10 May 2022 11:06: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=VxKJs/6ndKqV4bAMj6Gsg2R5aK27w2TRYhY4Pwf+dB4=; b=2XDwuEgv9Dl19RAX70uXbt6YMk8Fu9qVTYat6JdKljRX/lwdDfikmSzWUKu9X8QDYK FdJV4xpkcmPCWuQgq/E0rnwF3v94vOh8MoWgJSqz+zYpUoHC9VGrNdJ5Sznldz7yzbfY +at1trM2GOFu5NN0YzLC6YlWjh8T3T8w6CdLqZDhcFF/TiJTqitKv1sWQoqZ2hSIXVtF GRmNs/0SQdWfjTjO+7e7RzEe/FA1PraLJ7iMahSO6E1YiV9AsRX94XoE03kMzapwegv/ ALcf3CxFnt4zHqlA1subnS+qkzg8H25u666wGDK04YDyRjfX2tH81qABXpb+xKTObANK veYA== 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=VxKJs/6ndKqV4bAMj6Gsg2R5aK27w2TRYhY4Pwf+dB4=; b=r9xZyamZVosTZNsGS4iHVbO1oup5010OT7sYYr/3kDYYDE8Rl9zTRhi95wlKaq0qrx 5NUpN3qMvoWctgKxXYjQ6z72FJIrcGoolUSVSkwEsEMXKS/iK7Qw/2LuQ0t4zLTij+SA p0K+8NMmNHGElhk1F4ob7iowPskvvIgTUWuBqSPF0mid2GR93CIRndQ/zWNHhlwV17jo jw4nurie/oE/7HaWwjbHKSQ1RIqQOMJBPQ2+mXsX9JT62dEbu05AT8EjnXZwqHXZOroR uPxc+8Tjs7hXLUzMLfesol2ZW5BgCvWqYozK+5e97fXj2QMov8oMExriInAt/JXI9VAW hJsw== X-Gm-Message-State: AOAM531RkrhMEJLijcvfJHTXPYjRROdhsMSVZTJozGwGOtjQPrF330+A 7KLzivVlr2fxKhfsUbF+EG0Y9RaHuAoYhWnx X-Google-Smtp-Source: ABdhPJw6oo1n5IsBZpC9SyOiMVcjrsXXyqkDu2U+kKdpM3S0x/XWTivM9pj2qivyZ39ur6t/8mIgFw== X-Received: by 2002:a17:90a:9483:b0:1dc:5fb2:9b89 with SMTP id s3-20020a17090a948300b001dc5fb29b89mr1063138pjo.235.1652206004631; Tue, 10 May 2022 11:06: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 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:43 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 17/18] cache: correctly handle file names containing colons Date: Tue, 10 May 2022 08:05:42 -1000 Message-Id: <11460a5b887762b946eb11e847c1ce70f83f74f7.1652205806.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 ; Tue, 10 May 2022 18:06:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13697 From: Roland Hieber File names containing colons cause split() to return a list with more than two elements, which will lead to a stack trace ending in: ValueError: too many values to unpack (expected 2) Split only once at the last colon, thereby making sure that only two elements are returned. Signed-off-by: Roland Hieber Signed-off-by: Richard Purdie (cherry picked from commit a70a7376a8708bde07959deb5d5842d7f84ee5f8) Signed-off-by: Steve Sakoman --- lib/bb/cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/cache.py b/lib/bb/cache.py index fcb15796..92e9a3ce 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -619,7 +619,7 @@ class Cache(NoCache): for f in flist: if not f: continue - f, exist = f.split(":") + f, exist = f.rsplit(":", 1) if (exist == "True" and not os.path.exists(f)) or (exist == "False" and os.path.exists(f)): self.logger.debug2("%s's file checksum list file %s changed", fn, f) From patchwork Tue May 10 18:05:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7869 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 A04F7C433EF for ; Tue, 10 May 2022 18:06:53 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web08.657.1652206008515745564 for ; Tue, 10 May 2022 11:06:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=GP4a+DUp; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id p12so15603462pfn.0 for ; Tue, 10 May 2022 11:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=T7eeSUrNVKzuMM1AZ/HIwS8sZVbN1XhrIFB4l2C5grw=; b=GP4a+DUplk5rZeg8a4NYK6SHwFXnYTwrqmPM7pbHUYiMmH+Biz1Wfy19SMiE7tlEnl 8sPTECAwpQG6enBKCJCwZq4qeNaORqO7y+MHUN+q0LLhwdk/ZRiiQex09wKhS7b8f2nJ OY6wCDnwf1kRFam9vP/Uk/83J3on7iyBu3r9Loa2AI5LYmmCSZwYNITT5CeuB6WWXEzE 1ZiPHRNMJGqmgxHjH0hsRX7mhXsWZOCP0+bGbbxeNxPin5p8SDy9RQAkSPJTHd4cMmwG lsTDH9Hm8xBS/DLBxGy4QSnuY/IuEk8I47KNi6Jy5JXMLEkL39y7JPCrtzEK0Folqt3C ovRw== 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=T7eeSUrNVKzuMM1AZ/HIwS8sZVbN1XhrIFB4l2C5grw=; b=sa2yw4/WBeWtuIv2ENM36421R6u8xzMobTRWvU6THtHhyrLCfatumOqOgIf6vfeINL y3zvfj84G7+ODhUylvg39Tfl4ByvuM0ZCFcOD6yiREr1omdQ5ofFpYeVV+r+0R3WSZuI zS8vXSLH4Qsp+oW3yuN9APuYo+9RxAgpcvkXLacTFjGcBfQj4D9dDp3w3wJmZET3GxDU 3tbJ0ruyfScx1lB4RsQRDr6Y/rkk2zm+8Xq43c9R+YANAbV4G6h+Sp/gxWUM8fS0QhSq kj+gVOvZaxyPphtn1aDB3QHGvAhuuoIEO5//vigjcf9BivcmCGjLmlCpoL71xhtizRQi H60Q== X-Gm-Message-State: AOAM533vrpZBAJbuSr1NVfeTNnd69dOR2HB2rqzs3KalgugqNDR08Alg Ncdu4oU0o/YlpQsMAMKSgSUSeJzX3cuOoS8f X-Google-Smtp-Source: ABdhPJwljjZMR1CzirCRINUA7b3lgmOe0tqT+Oujj2y7vTNpqBjAqbDero2YPp/qVJFa3UfjCVpxvQ== X-Received: by 2002:a65:604a:0:b0:3c2:fe7:a14e with SMTP id a10-20020a65604a000000b003c20fe7a14emr17443952pgp.156.1652206007325; Tue, 10 May 2022 11:06:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 12-20020aa7910c000000b0050dc76281c4sm10846777pfh.158.2022.05.10.11.06.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 11:06:46 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 18/18] fetch/git : Use cat as pager Date: Tue, 10 May 2022 08:05:43 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 10 May 2022 18:06:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13698 From: Richard Purdie We don't have less in HOSTTOOLS in OE and this can confuse git. Force the pager to cat to be consistent and minimal everywhere. Signed-off-by: Richard Purdie (cherry picked from commit d3d406e8552fdd865dc58b419a84411736475ad2) Signed-off-by: Steve Sakoman --- lib/bb/fetch2/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index b3eb8248..f0df6fb6 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -240,7 +240,7 @@ class Git(FetchMethod): for name in ud.names: ud.unresolvedrev[name] = 'HEAD' - ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0 -c gc.autoDetach=false" + ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0 -c gc.autoDetach=false -c core.pager=cat" write_tarballs = d.getVar("BB_GENERATE_MIRROR_TARBALLS") or "0" ud.write_tarballs = write_tarballs != "0" or ud.rebaseable