mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

cache: ensure 'pn' is included in the pkgvars

Browse Source 
(Bitbake rev: cefc28a2aa1e5703119dacfd885c8c159a1e47a3)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Chris Larson
2010-11-23 20:08:06 -07:00
committed by Richard Purdie
parent a92caf45c8
commit 8a938d567f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bitbake/lib/bb/cache.py
View File

@@ -106,9 +106,13 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)):
@classmethod @classmethod
def from_metadata(cls, filename, metadata): def from_metadata(cls, filename, metadata):
pn = cls.getvar('PN', metadata)
packages = cls.listvar('PACKAGES', metadata)
if not pn in packages:
packages.append(pn)
tasks = metadata.getVar('__BBTASKS', False) tasks = metadata.getVar('__BBTASKS', False)
packages = cls.listvar('PACKAGES', metadata)
return RecipeInfo( return RecipeInfo(
tasks = tasks, tasks = tasks,
basetaskhashes = cls.taskvar('BB_BASEHASH', tasks, metadata), basetaskhashes = cls.taskvar('BB_BASEHASH', tasks, metadata),
@@ -121,8 +125,8 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)):
skipped = cls.getvar('__SKIPPED', metadata), skipped = cls.getvar('__SKIPPED', metadata),
timestamp = bb.parse.cached_mtime(filename), timestamp = bb.parse.cached_mtime(filename),
packages = packages, packages = cls.listvar('PACKAGES', metadata),
pn = cls.getvar('PN', metadata), pn = pn,
pe = cls.getvar('PE', metadata), pe = cls.getvar('PE', metadata),
pv = cls.getvar('PV', metadata), pv = cls.getvar('PV', metadata),
pr = cls.getvar('PR', metadata), pr = cls.getvar('PR', metadata),
@@ -563,20 +567,16 @@ class CacheData(object):
self.packages[package].append(fn) self.packages[package].append(fn)
rprovides += info.rprovides_pkg[package] rprovides += info.rprovides_pkg[package]
for package in info.packages_dynamic:
self.packages_dynamic[package].append(fn)
for rprovide in rprovides: for rprovide in rprovides:
self.rproviders[rprovide].append(fn) self.rproviders[rprovide].append(fn)
for package in info.packages_dynamic:
self.packages_dynamic[package].append(fn)
# Build hash of runtime depends and rececommends # Build hash of runtime depends and rececommends
for package in info.packages + [info.pn]: for package in info.packages + [info.pn]:
rundeps, runrecs = list(info.rdepends), list(info.rrecommends) self.rundeps[fn][package] = list(info.rdepends) + info.rdepends_pkg[package]
if package in info.packages: self.runrecs[fn][package] = list(info.rrecommends) + info.rrecommends_pkg[package]
rundeps += info.rdepends_pkg[package]
runrecs += info.rrecommends_pkg[package]
self.rundeps[fn][package] = rundeps
self.runrecs[fn][package] = runrecs
# Collect files we may need for possible world-dep # Collect files we may need for possible world-dep
# calculations # calculations