diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-11-16 13:01:51 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:40 +0000 |
| commit | 9c7c18d06fcee628a847ad696be596383e168378 (patch) | |
| tree | ebac0af68e5fdbf6d573e96bad7d9326f3463970 | |
| parent | 3a2176fe7383278503dcf732d98e10c520b29935 (diff) | |
| download | openembedded-core-9c7c18d06fcee628a847ad696be596383e168378.tar.gz openembedded-core-9c7c18d06fcee628a847ad696be596383e168378.tar.bz2 openembedded-core-9c7c18d06fcee628a847ad696be596383e168378.zip | |
Pre-explode rundeps/runrecs in CacheData
(Bitbake rev: 0c8e0f3191252ccedb83c431c48e5c7d905e2717)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | bitbake/lib/bb/cache.py | 10 | ||||
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/taskdata.py | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 51eb3b82f7..9756ada960 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -440,16 +440,18 @@ class Cache: if not file_name in cacheData.runrecs: cacheData.runrecs[file_name] = {} - rdepends = self.getVar('RDEPENDS', file_name, True) or "" - rrecommends = self.getVar('RRECOMMENDS', file_name, True) or "" + rdepends = bb.utils.explode_deps(self.getVar('RDEPENDS', file_name, True) or "") + rrecommends = bb.utils.explode_deps(self.getVar('RRECOMMENDS', file_name, True) or "") for package in packages + [pn]: if not package in cacheData.rundeps[file_name]: cacheData.rundeps[file_name][package] = [] if not package in cacheData.runrecs[file_name]: cacheData.runrecs[file_name][package] = [] - cacheData.rundeps[file_name][package] = rdepends + " " + (self.getVar("RDEPENDS_%s" % package, file_name, True) or "") - cacheData.runrecs[file_name][package] = rrecommends + " " + (self.getVar("RRECOMMENDS_%s" % package, file_name, True) or "") + rdeps_pkg = bb.utils.explode_deps(self.getVar('RDEPENDS_%s' % package, file_name, True) or "") + cacheData.rundeps[file_name][package] = rdepends + rdeps_pkg + rrecs_pkg = bb.utils.explode_deps(self.getVar('RDEPENDS_%s' % package, file_name, True) or "") + cacheData.runrecs[file_name][package] = rrecommends + rrecs_pkg # Collect files we may need for possible world-dep # calculations diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 77646cd069..33b9201e6f 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -323,14 +323,14 @@ class BBCooker: rdepends = self.status.rundeps[fn] for package in rdepends: depend_tree["rdepends-pkg"][package] = [] - for rdepend in bb.utils.explode_deps(rdepends[package]): + for rdepend in rdepends[package]: depend_tree["rdepends-pkg"][package].append(rdepend) packages.append(package) rrecs = self.status.runrecs[fn] for package in rrecs: depend_tree["rrecs-pkg"][package] = [] - for rdepend in bb.utils.explode_deps(rrecs[package]): + for rdepend in rrecs[package]: depend_tree["rrecs-pkg"][package].append(rdepend) if not package in packages: packages.append(package) diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 8a8924120f..dc8d0668c1 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py @@ -195,11 +195,11 @@ class TaskData: rdepends = dataCache.rundeps[fn] rrecs = dataCache.runrecs[fn] for package in rdepends: - for rdepend in bb.utils.explode_deps(rdepends[package]): + for rdepend in rdepends[package]: logger.debug(2, "Added runtime dependency %s for %s", rdepend, fn) rdependids[self.getrun_id(rdepend)] = None for package in rrecs: - for rdepend in bb.utils.explode_deps(rrecs[package]): + for rdepend in rrecs[package]: logger.debug(2, "Added runtime recommendation %s for %s", rdepend, fn) rdependids[self.getrun_id(rdepend)] = None self.rdepids[fnid] = rdependids.keys() |