diff options
| -rw-r--r-- | bitbake/lib/bb/cache.py | 9 | ||||
| -rw-r--r-- | bitbake/lib/bb/cache_extra.py | 3 | ||||
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 6b7fa6f1a2..99e0f34956 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
| @@ -137,9 +137,6 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
| 137 | self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) | 137 | self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) |
| 138 | self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata) | 138 | self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata) |
| 139 | self.inherits = self.getvar('__inherit_cache', metadata) | 139 | self.inherits = self.getvar('__inherit_cache', metadata) |
| 140 | self.summary = self.getvar('SUMMARY', metadata) | ||
| 141 | self.license = self.getvar('LICENSE', metadata) | ||
| 142 | self.section = self.getvar('SECTION', metadata) | ||
| 143 | self.fakerootenv = self.getvar('FAKEROOTENV', metadata) | 140 | self.fakerootenv = self.getvar('FAKEROOTENV', metadata) |
| 144 | self.fakerootdirs = self.getvar('FAKEROOTDIRS', metadata) | 141 | self.fakerootdirs = self.getvar('FAKEROOTDIRS', metadata) |
| 145 | self.fakerootnoenv = self.getvar('FAKEROOTNOENV', metadata) | 142 | self.fakerootnoenv = self.getvar('FAKEROOTNOENV', metadata) |
| @@ -174,9 +171,6 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
| 174 | 171 | ||
| 175 | cachedata.basetaskhash = {} | 172 | cachedata.basetaskhash = {} |
| 176 | cachedata.inherits = {} | 173 | cachedata.inherits = {} |
| 177 | cachedata.summary = {} | ||
| 178 | cachedata.license = {} | ||
| 179 | cachedata.section = {} | ||
| 180 | cachedata.fakerootenv = {} | 174 | cachedata.fakerootenv = {} |
| 181 | cachedata.fakerootnoenv = {} | 175 | cachedata.fakerootnoenv = {} |
| 182 | cachedata.fakerootdirs = {} | 176 | cachedata.fakerootdirs = {} |
| @@ -240,9 +234,6 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
| 240 | cachedata.basetaskhash[identifier] = taskhash | 234 | cachedata.basetaskhash[identifier] = taskhash |
| 241 | 235 | ||
| 242 | cachedata.inherits[fn] = self.inherits | 236 | cachedata.inherits[fn] = self.inherits |
| 243 | cachedata.summary[fn] = self.summary | ||
| 244 | cachedata.license[fn] = self.license | ||
| 245 | cachedata.section[fn] = self.section | ||
| 246 | cachedata.fakerootenv[fn] = self.fakerootenv | 237 | cachedata.fakerootenv[fn] = self.fakerootenv |
| 247 | cachedata.fakerootnoenv[fn] = self.fakerootnoenv | 238 | cachedata.fakerootnoenv[fn] = self.fakerootnoenv |
| 248 | cachedata.fakerootdirs[fn] = self.fakerootdirs | 239 | cachedata.fakerootdirs[fn] = self.fakerootdirs |
diff --git a/bitbake/lib/bb/cache_extra.py b/bitbake/lib/bb/cache_extra.py index 4c8841f857..40ba304c43 100644 --- a/bitbake/lib/bb/cache_extra.py +++ b/bitbake/lib/bb/cache_extra.py | |||
| @@ -40,6 +40,7 @@ class HobRecipeInfo(RecipeInfoCommon): | |||
| 40 | self.summary = self.getvar('SUMMARY', metadata) | 40 | self.summary = self.getvar('SUMMARY', metadata) |
| 41 | self.license = self.getvar('LICENSE', metadata) | 41 | self.license = self.getvar('LICENSE', metadata) |
| 42 | self.section = self.getvar('SECTION', metadata) | 42 | self.section = self.getvar('SECTION', metadata) |
| 43 | self.description = self.getvar('DESCRIPTION', metadata) | ||
| 43 | 44 | ||
| 44 | @classmethod | 45 | @classmethod |
| 45 | def init_cacheData(cls, cachedata): | 46 | def init_cacheData(cls, cachedata): |
| @@ -47,8 +48,10 @@ class HobRecipeInfo(RecipeInfoCommon): | |||
| 47 | cachedata.summary = {} | 48 | cachedata.summary = {} |
| 48 | cachedata.license = {} | 49 | cachedata.license = {} |
| 49 | cachedata.section = {} | 50 | cachedata.section = {} |
| 51 | cachedata.description = {} | ||
| 50 | 52 | ||
| 51 | def add_cacheData(self, cachedata, fn): | 53 | def add_cacheData(self, cachedata, fn): |
| 52 | cachedata.summary[fn] = self.summary | 54 | cachedata.summary[fn] = self.summary |
| 53 | cachedata.license[fn] = self.license | 55 | cachedata.license[fn] = self.license |
| 54 | cachedata.section[fn] = self.section | 56 | cachedata.section[fn] = self.section |
| 57 | cachedata.description[fn] = self.description | ||
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 7dab38e287..492cf6e3a2 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -455,6 +455,7 @@ class BBCooker: | |||
| 455 | summary = self.status.summary[fn] | 455 | summary = self.status.summary[fn] |
| 456 | lic = self.status.license[fn] | 456 | lic = self.status.license[fn] |
| 457 | section = self.status.section[fn] | 457 | section = self.status.section[fn] |
| 458 | description = self.status.description[fn] | ||
| 458 | if pn not in depend_tree["pn"]: | 459 | if pn not in depend_tree["pn"]: |
| 459 | depend_tree["pn"][pn] = {} | 460 | depend_tree["pn"][pn] = {} |
| 460 | depend_tree["pn"][pn]["filename"] = fn | 461 | depend_tree["pn"][pn]["filename"] = fn |
| @@ -462,6 +463,7 @@ class BBCooker: | |||
| 462 | depend_tree["pn"][pn]["summary"] = summary | 463 | depend_tree["pn"][pn]["summary"] = summary |
| 463 | depend_tree["pn"][pn]["license"] = lic | 464 | depend_tree["pn"][pn]["license"] = lic |
| 464 | depend_tree["pn"][pn]["section"] = section | 465 | depend_tree["pn"][pn]["section"] = section |
| 466 | depend_tree["pn"][pn]["description"] = description | ||
| 465 | 467 | ||
| 466 | if fnid not in seen_fnids: | 468 | if fnid not in seen_fnids: |
| 467 | seen_fnids.append(fnid) | 469 | seen_fnids.append(fnid) |
