bitbake-devel.lists.openembedded.org archive mirror
 help / color / mirror / Atom feed
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>,
	"bitbake-devel@lists.openembedded.org"
	<bitbake-devel@lists.openembedded.org>
Subject: RE: [bitbake-devel] [PATCH] cooker: Fix/improve collections handling
Date: Thu, 11 May 2023 14:43:19 +0000	[thread overview]
Message-ID: <DB5PR02MB1021331281BCA5B9A6C5C77A9EF749@DB5PR02MB10213.eurprd02.prod.outlook.com> (raw)
In-Reply-To: <20230510203459.1758249-1-richard.purdie@linuxfoundation.org>

> -----Original Message-----
> From: bitbake-devel@lists.openembedded.org <bitbake-devel@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: den 10 maj 2023 22:35
> To: bitbake-devel@lists.openembedded.org
> Subject: [bitbake-devel] [PATCH] cooker: Fix/improve collections handling
> 
> Code changes for FILE_LAYERNAME exposed lifecycle issues around the collections
> objection in Cooker which only appeared in devtool usage in eSDK. Move

Should that be "object" or "objects", rather than "objection"?

> the collections setup to an earlier stage after parsing compeltes to

compeltes -> completes

> avoid any kind of race around it.
> 
> Also stop overwriting the code variable in MatchFiles. Ultimately we
> need to combine these codepaths but that is for another patch.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  lib/bb/cooker.py | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
> index 3e298c478b..0a21f1c2f8 100644
> --- a/lib/bb/cooker.py
> +++ b/lib/bb/cooker.py
> @@ -504,6 +504,9 @@ class BBCooker:
>              self.recipecaches[mc] = bb.cache.CacheData(self.caches_array)
> 
>          self.handleCollections(self.data.getVar("BBFILE_COLLECTIONS"))
> +        self.collections = {}
> +        for mc in self.multiconfigs:
> +            self.collections[mc] = CookerCollectFiles(self.bbfile_config_priorities, mc)
> 
>          self._parsecache_set(False)
> 
> @@ -1379,8 +1382,8 @@ class BBCooker:
>          if bf.startswith("/") or bf.startswith("../"):
>              bf = os.path.abspath(bf)
> 
> -        self.collections = {mc: CookerCollectFiles(self.bbfile_config_priorities, mc)}
> -        filelist, masked, searchdirs = self.collections[mc].collect_bbfiles(self.databuilder.mcdata[mc], self.databuilder.mcdata[mc])
> +        collections = {mc: CookerCollectFiles(self.bbfile_config_priorities, mc)}
> +        filelist, masked, searchdirs = collections[mc].collect_bbfiles(self.databuilder.mcdata[mc], self.databuilder.mcdata[mc])
>          try:
>              os.stat(bf)
>              bf = os.path.abspath(bf)
> @@ -1678,13 +1681,10 @@ class BBCooker:
>                  for dep in self.configuration.extra_assume_provided:
>                      self.recipecaches[mc].ignored_dependencies.add(dep)
> 
> -            self.collections = {}
> -
>              mcfilelist = {}
>              total_masked = 0
>              searchdirs = set()
>              for mc in self.multiconfigs:
> -                self.collections[mc] = CookerCollectFiles(self.bbfile_config_priorities, mc)
>                  (filelist, masked, search) = self.collections[mc].collect_bbfiles(self.databuilder.mcdata[mc], self.databuilder.mcdata[mc])
> 
>                  mcfilelist[mc] = filelist
> --
> 2.39.2

//Peter




      reply	other threads:[~2023-05-11 14:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-10 20:34 [PATCH] cooker: Fix/improve collections handling Richard Purdie
2023-05-11 14:43 ` Peter Kjellerstedt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DB5PR02MB1021331281BCA5B9A6C5C77A9EF749@DB5PR02MB10213.eurprd02.prod.outlook.com \
    --to=peter.kjellerstedt@axis.com \
    --cc=bitbake-devel@lists.openembedded.org \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).