diff options
| author |   Shane Wang <shane.wang@intel.com> | 2012-02-02 14:05:27 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-02 16:55:50 +0000 |
| commit | 74994e1f45c776a02e7e228e1204ab54d677da0a (patch) | |
| tree | b4938382b96e801223eb82b6cbafe741f47b4507 | |
| parent | 9d06f6cd534fe1814a3f027709b5d2b6c5f68ff2 (diff) | |
| download | bitbake-74994e1f45c776a02e7e228e1204ab54d677da0a.tar.gz | |
bitbake: Add description into the cache and clean up cache duplication
With the addition of new cache domains, the summary, license and section
information is no longer requred in the core cache since its only used by
the hob UI. This patch removes the duplicated entries.
It also adds the DESCRIPTION field to the cache for the benefit of hob2.
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/cache.py | 9 | ||||
| -rw-r--r-- | lib/bb/cache_extra.py | 3 | ||||
| -rw-r--r-- | lib/bb/cooker.py | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 6b7fa6f1a..99e0f3495 100644 --- a/lib/bb/cache.py +++ b/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/lib/bb/cache_extra.py b/lib/bb/cache_extra.py index 4c8841f85..40ba304c4 100644 --- a/lib/bb/cache_extra.py +++ b/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/lib/bb/cooker.py b/lib/bb/cooker.py index 7dab38e28..492cf6e3a 100644 --- a/lib/bb/cooker.py +++ b/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) |