summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-02-05 15:59:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-08 11:03:16 (GMT)
commit8927dba785483f71928e0979d9857903ecd451d9 (patch)
treec02e5b6177f12250f501adffc23bd45368f746de
parent18285be0dfcb9cfec786dd79acd27ab4d0838bd2 (diff)
downloadpoky-8927dba785483f71928e0979d9857903ecd451d9.tar.gz
classextend.py: use explode_dep_versions2 in order to preserve versions too
(From OE-Core rev: 8f8c5da07b3431e5a0838034084ce2f8e09762e3) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/classextend.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index a45df3a..259f3a5 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -63,11 +63,12 @@ class ClassExtender(object):
63 deps = self.d.getVar(varname, True) 63 deps = self.d.getVar(varname, True)
64 if not deps: 64 if not deps:
65 return 65 return
66 deps = bb.utils.explode_deps(deps) 66 deps = bb.utils.explode_dep_versions2(deps)
67 newdeps = [] 67 newdeps = {}
68 for dep in deps: 68 for dep in deps:
69 newdeps.append(self.map_depends(dep)) 69 newdeps[self.map_depends(dep)] = deps[dep]
70 self.d.setVar(varname, " ".join(newdeps)) 70
71 self.d.setVar(varname, bb.utils.join_deps(newdeps, False))
71 72
72 def map_packagevars(self): 73 def map_packagevars(self):
73 for pkg in (self.d.getVar("PACKAGES", True).split() + [""]): 74 for pkg in (self.d.getVar("PACKAGES", True).split() + [""]):