summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-11-16 13:01:51 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:40 +0000
commit9c7c18d06fcee628a847ad696be596383e168378 (patch)
treeebac0af68e5fdbf6d573e96bad7d9326f3463970 /bitbake/lib/bb
parent3a2176fe7383278503dcf732d98e10c520b29935 (diff)
downloadpoky-9c7c18d06fcee628a847ad696be596383e168378.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cache.py10
-rw-r--r--bitbake/lib/bb/cooker.py4
-rw-r--r--bitbake/lib/bb/taskdata.py4
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:
440 if not file_name in cacheData.runrecs: 440 if not file_name in cacheData.runrecs:
441 cacheData.runrecs[file_name] = {} 441 cacheData.runrecs[file_name] = {}
442 442
443 rdepends = self.getVar('RDEPENDS', file_name, True) or "" 443 rdepends = bb.utils.explode_deps(self.getVar('RDEPENDS', file_name, True) or "")
444 rrecommends = self.getVar('RRECOMMENDS', file_name, True) or "" 444 rrecommends = bb.utils.explode_deps(self.getVar('RRECOMMENDS', file_name, True) or "")
445 for package in packages + [pn]: 445 for package in packages + [pn]:
446 if not package in cacheData.rundeps[file_name]: 446 if not package in cacheData.rundeps[file_name]:
447 cacheData.rundeps[file_name][package] = [] 447 cacheData.rundeps[file_name][package] = []
448 if not package in cacheData.runrecs[file_name]: 448 if not package in cacheData.runrecs[file_name]:
449 cacheData.runrecs[file_name][package] = [] 449 cacheData.runrecs[file_name][package] = []
450 450
451 cacheData.rundeps[file_name][package] = rdepends + " " + (self.getVar("RDEPENDS_%s" % package, file_name, True) or "") 451 rdeps_pkg = bb.utils.explode_deps(self.getVar('RDEPENDS_%s' % package, file_name, True) or "")
452 cacheData.runrecs[file_name][package] = rrecommends + " " + (self.getVar("RRECOMMENDS_%s" % package, file_name, True) or "") 452 cacheData.rundeps[file_name][package] = rdepends + rdeps_pkg
453 rrecs_pkg = bb.utils.explode_deps(self.getVar('RDEPENDS_%s' % package, file_name, True) or "")
454 cacheData.runrecs[file_name][package] = rrecommends + rrecs_pkg
453 455
454 # Collect files we may need for possible world-dep 456 # Collect files we may need for possible world-dep
455 # calculations 457 # 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:
323 rdepends = self.status.rundeps[fn] 323 rdepends = self.status.rundeps[fn]
324 for package in rdepends: 324 for package in rdepends:
325 depend_tree["rdepends-pkg"][package] = [] 325 depend_tree["rdepends-pkg"][package] = []
326 for rdepend in bb.utils.explode_deps(rdepends[package]): 326 for rdepend in rdepends[package]:
327 depend_tree["rdepends-pkg"][package].append(rdepend) 327 depend_tree["rdepends-pkg"][package].append(rdepend)
328 packages.append(package) 328 packages.append(package)
329 329
330 rrecs = self.status.runrecs[fn] 330 rrecs = self.status.runrecs[fn]
331 for package in rrecs: 331 for package in rrecs:
332 depend_tree["rrecs-pkg"][package] = [] 332 depend_tree["rrecs-pkg"][package] = []
333 for rdepend in bb.utils.explode_deps(rrecs[package]): 333 for rdepend in rrecs[package]:
334 depend_tree["rrecs-pkg"][package].append(rdepend) 334 depend_tree["rrecs-pkg"][package].append(rdepend)
335 if not package in packages: 335 if not package in packages:
336 packages.append(package) 336 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:
195 rdepends = dataCache.rundeps[fn] 195 rdepends = dataCache.rundeps[fn]
196 rrecs = dataCache.runrecs[fn] 196 rrecs = dataCache.runrecs[fn]
197 for package in rdepends: 197 for package in rdepends:
198 for rdepend in bb.utils.explode_deps(rdepends[package]): 198 for rdepend in rdepends[package]:
199 logger.debug(2, "Added runtime dependency %s for %s", rdepend, fn) 199 logger.debug(2, "Added runtime dependency %s for %s", rdepend, fn)
200 rdependids[self.getrun_id(rdepend)] = None 200 rdependids[self.getrun_id(rdepend)] = None
201 for package in rrecs: 201 for package in rrecs:
202 for rdepend in bb.utils.explode_deps(rrecs[package]): 202 for rdepend in rrecs[package]:
203 logger.debug(2, "Added runtime recommendation %s for %s", rdepend, fn) 203 logger.debug(2, "Added runtime recommendation %s for %s", rdepend, fn)
204 rdependids[self.getrun_id(rdepend)] = None 204 rdependids[self.getrun_id(rdepend)] = None
205 self.rdepids[fnid] = rdependids.keys() 205 self.rdepids[fnid] = rdependids.keys()