Patchwork [bitbake-devel,1/1,V2] bitbake: add description cache into cache_extra

login
register
mail settings
Submitter Shane Wang
Date Feb. 2, 2012, 6:05 a.m.
Message ID <213886d7dc877c93686c896fe4584011bb4ce2ec.1328162622.git.shane.wang@intel.com>
Download mbox | patch
Permalink /patch/20555/
State New
Headers show

Comments

Shane Wang - Feb. 2, 2012, 6:05 a.m.
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 <shane.wang@intel.com>
---
 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(-)
Richard Purdie - Feb. 2, 2012, 3:28 p.m.
On Thu, 2012-02-02 at 14:05 +0800, Shane Wang wrote:
> 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 <shane.wang@intel.com>
> ---
>  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
Shane Wang - Feb. 3, 2012, 4:38 a.m.
OK, thanks. Sorry for that, will keep in mind.

--
Shane

Richard Purdie wrote onĀ 2012-02-02:

> On Thu, 2012-02-02 at 14:05 +0800, Shane Wang wrote:

>> 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 <shane.wang@intel.com>

>> ---

>>  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

Patch

diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 6b7fa6f..99e0f34 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -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
diff --git a/bitbake/lib/bb/cache_extra.py b/bitbake/lib/bb/cache_extra.py
index 4c8841f..40ba304 100644
--- a/bitbake/lib/bb/cache_extra.py
+++ b/bitbake/lib/bb/cache_extra.py
@@ -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
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7dab38e..492cf6e 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -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)