From cefc28a2aa1e5703119dacfd885c8c159a1e47a3 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 23 Nov 2010 20:08:06 -0700 Subject: [PATCH] cache: ensure 'pn' is included in the pkgvars Signed-off-by: Chris Larson --- lib/bb/cache.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 92b55039359..7c024c75205 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -99,7 +99,10 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)): @classmethod def from_metadata(cls, filename, metadata): + pn = cls.getvar('PN', metadata) packages = cls.listvar('PACKAGES', metadata) + if not pn in packages: + packages.append(pn) return RecipeInfo( file_depends = metadata.getVar('__depends', False), task_deps = metadata.getVar('_task_deps', False) or @@ -107,8 +110,8 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)): variants = cls.listvar('__VARIANTS', metadata) + [''], skipped = cls.getvar('__SKIPPED', metadata), timestamp = bb.parse.cached_mtime(filename), - packages = packages, - pn = cls.getvar('PN', metadata), + packages = cls.listvar('PACKAGES', metadata), + pn = pn, pe = cls.getvar('PE', metadata), pv = cls.getvar('PV', metadata), pr = cls.getvar('PR', metadata), @@ -547,20 +550,16 @@ class CacheData(object): self.packages[package].append(fn) rprovides += info.rprovides_pkg[package] - for package in info.packages_dynamic: - self.packages_dynamic[package].append(fn) - for rprovide in rprovides: self.rproviders[rprovide].append(fn) + for package in info.packages_dynamic: + self.packages_dynamic[package].append(fn) + # Build hash of runtime depends and rececommends for package in info.packages + [info.pn]: - rundeps, runrecs = list(info.rdepends), list(info.rrecommends) - if package in info.packages: - rundeps += info.rdepends_pkg[package] - runrecs += info.rrecommends_pkg[package] - self.rundeps[fn][package] = rundeps - self.runrecs[fn][package] = runrecs + self.rundeps[fn][package] = list(info.rdepends) + info.rdepends_pkg[package] + self.runrecs[fn][package] = list(info.rrecommends) + info.rrecommends_pkg[package] # Collect files we may need for possible world-dep # calculations -- 2.47.3