Skip to contentSkip to conversation

bitbake: add description cache into cache_extra

PATCH Applied Shane Wang 2 participants 4 messages Feb 2, 2012 – Feb 3, 2012

lore
Share & tools
lore

Shane Wang

author
#0 lore raw

v2 cover bitbake: add description cache into cache_extra

Enable bitbake to cache description into the extra cache file and Hob2 will get its value for core-image-foo.

The following changes since commit 8d4d9a15c4947e55ed217c6035e76fcff724e544:

package bbclass: allow per package PRIVATE_LIBS (2012-02-01 15:15:15 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib shane/desc-bitbake-change
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=shane/desc-bitbake-change

Shane Wang (1):
[V2] bitbake: add description cache into cache_extra

 bitbake/lib/bb/cache.py       |    9 ---------
 bitbake/lib/bb/cache_extra.py |    3 +++
 bitbake/lib/bb/cooker.py      |    2 ++
 3 files changed, 5 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH v2 1/1 bitbake: add description cache into cache_extra

Enable bitbake to cache description into the extra cache file and Hob2 will get its value for core-image-foo.

Signed-off-by Shane Wang <[email protected]>
---
 bitbake/lib/bb/cache.py       |    9 ---------
 bitbake/lib/bb/cache_extra.py |    3 +++
 bitbake/lib/bb/cooker.py      |    2 ++
 3 files changed, 5 insertions(+), 9 deletions(-)
bitbake/lib/bb/cache.py +0 -9
index 6b7fa6f..99e0f34 100644
@@ -137,9 +137,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
         self.rdepends_pkg     = self.pkgvar('RDEPENDS', self.packages, metadata)
         self.rrecommends_pkg  = self.pkgvar('RRECOMMENDS', self.packages, metadata)
         self.inherits         = self.getvar('__inherit_cache', metadata)
-        self.summary          = self.getvar('SUMMARY', metadata)
-        self.license          = self.getvar('LICENSE', metadata)
-        self.section          = self.getvar('SECTION', metadata)
         self.fakerootenv      = self.getvar('FAKEROOTENV', metadata)
         self.fakerootdirs     = self.getvar('FAKEROOTDIRS', metadata)
         self.fakerootnoenv    = self.getvar('FAKEROOTNOENV', metadata)

@@ -174,9 +171,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
 
         cachedata.basetaskhash = {}
         cachedata.inherits = {}
-        cachedata.summary = {}
-        cachedata.license = {}
-        cachedata.section = {}
         cachedata.fakerootenv = {}
         cachedata.fakerootnoenv = {}
         cachedata.fakerootdirs = {}

@@ -240,9 +234,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
             cachedata.basetaskhash[identifier] = taskhash
 
         cachedata.inherits[fn] = self.inherits
-        cachedata.summary[fn] = self.summary
-        cachedata.license[fn] = self.license
-        cachedata.section[fn] = self.section
         cachedata.fakerootenv[fn] = self.fakerootenv
         cachedata.fakerootnoenv[fn] = self.fakerootnoenv
         cachedata.fakerootdirs[fn] = self.fakerootdirs
bitbake/lib/bb/cache_extra.py +3 -0
index 4c8841f..40ba304 100644
@@ -40,6 +40,7 @@ class HobRecipeInfo(RecipeInfoCommon):
         self.summary = self.getvar('SUMMARY', metadata)
         self.license = self.getvar('LICENSE', metadata)
         self.section = self.getvar('SECTION', metadata)
+        self.description = self.getvar('DESCRIPTION', metadata)
 
     @classmethod
     def init_cacheData(cls, cachedata):

@@ -47,8 +48,10 @@ class HobRecipeInfo(RecipeInfoCommon):
         cachedata.summary = {}
         cachedata.license = {}
         cachedata.section = {}
+        cachedata.description = {}
 
     def add_cacheData(self, cachedata, fn):
         cachedata.summary[fn] = self.summary
         cachedata.license[fn] = self.license
         cachedata.section[fn] = self.section
+        cachedata.description[fn] = self.description
bitbake/lib/bb/cooker.py +2 -0
index 7dab38e..492cf6e 100644
@@ -455,6 +455,7 @@ class BBCooker:
             summary = self.status.summary[fn]
             lic = self.status.license[fn]
             section = self.status.section[fn]
+            description = self.status.description[fn]
             if pn not in depend_tree["pn"]:
                 depend_tree["pn"][pn] = {}
                 depend_tree["pn"][pn]["filename"] = fn

@@ -462,6 +463,7 @@ class BBCooker:
                 depend_tree["pn"][pn]["summary"] = summary
                 depend_tree["pn"][pn]["license"] = lic
                 depend_tree["pn"][pn]["section"] = section
+                depend_tree["pn"][pn]["description"] = description
 
             if fnid not in seen_fnids:
                 seen_fnids.append(fnid)
Signature · 1 line
1.7.6
Applied
#2 lore raw
Quoted 9 lines · Shane Wang

Enable bitbake to cache description into the extra cache file and Hob2 will get its value for core-image-foo.

Signed-off-by Shane Wang <[email protected]>
---
 bitbake/lib/bb/cache.py       |    9 ---------
 bitbake/lib/bb/cache_extra.py |    3 +++
 bitbake/lib/bb/cooker.py      |    2 ++
 3 files changed, 5 insertions(+), 9 deletions(-)

I've merged this patch thanks.

In future please work on better commit messages since this one doesn't mention the removal of the duplicate cache entries. When I took the patch I've tweaked the commit message in this case.

Cheers,

Richard

author
#3 lore raw

OK, thanks. Sorry for that, will keep in mind.

--
Shane

Richard Purdie wrote on 2012-02-02:

Quoted 20 lines · Shane Wang
Quoted 9 lines

Enable bitbake to cache description into the extra cache file and Hob2 will get its value for core-image-foo.

Signed-off-by Shane Wang <[email protected]>
---
 bitbake/lib/bb/cache.py       |    9 ---------
 bitbake/lib/bb/cache_extra.py |    3 +++
 bitbake/lib/bb/cooker.py      |    2 ++
 3 files changed, 5 insertions(+), 9 deletions(-)

I've merged this patch thanks.

In future please work on better commit messages since this one doesn't mention the removal of the duplicate cache entries. When I took the patch I've tweaked the commit message in this case.

Cheers,

Richard