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>

diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 51eb3b82f7cbb5002b196d7dc6efbe073b341e89..9756ada9605d9ce85b865c87724ee49b554f2a76 100644 (file)
--- 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 77646cd069d9b8732debfe06c4f6f92f67c2f0a7..33b9201e6fd837f87946f2cfe5034905c1690314 100644 (file)
--- 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 8a8924120f76ce5b675e6e1dfaa915a53f15a13e..dc8d0668c12edf516fa573dc31c81e5060d65ddd 100644 (file)
--- 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()