summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-19 10:13:10 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-20 17:57:16 +0000
commit1a6a15e568dbcae6876bbe823c9d23d74f16bcad (patch)
tree378f397a78067c2d60093799dc4a4c5710c8a7d5
parentc7edcc03169bc9b8a40afe645b3bca9956eb3682 (diff)
downloadpoky-1a6a15e568dbcae6876bbe823c9d23d74f16bcad.tar.gz
package.bbclass: Fix runtime_maping_rename so version information isn't removed
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/package.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 523d7aeaee..d492b1004a 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -210,12 +210,12 @@ def runtime_mapping_rename (varname, d):
210 #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True))) 210 #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True)))
211 211
212 new_depends = [] 212 new_depends = []
213 for depend in bb.utils.explode_deps(bb.data.getVar(varname, d, True) or ""): 213 deps = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
214 for depend in deps:
214 # Have to be careful with any version component of the depend 215 # Have to be careful with any version component of the depend
215 split_depend = depend.split(' (') 216 new_depend = get_package_mapping(depend, d)
216 new_depend = get_package_mapping(split_depend[0].strip(), d) 217 if deps[depend]:
217 if len(split_depend) > 1: 218 new_depends.append("%s (%s)" % (new_depend, deps[depend]))
218 new_depends.append("%s (%s" % (new_depend, split_depend[1]))
219 else: 219 else:
220 new_depends.append(new_depend) 220 new_depends.append(new_depend)
221 221