summaryrefslogtreecommitdiffstats
path: root/meta
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-19 10:13:10 +0000
commit5716a14bf4366d0c8fe2526759ca3500b4985bc5 (patch)
tree155b85844e878909ae93598f7cf62b424c20d227 /meta
parent0846d1f4981cba477ccc36a3cbd9c5766b5dbe0f (diff)
downloadpoky-5716a14bf4366d0c8fe2526759ca3500b4985bc5.tar.gz
package.bbclass: Fix runtime_maping_rename so version information isn't removed
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-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 a1e369e0e3..890cacee10 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -202,12 +202,12 @@ def runtime_mapping_rename (varname, d):
202 #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True))) 202 #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True)))
203 203
204 new_depends = [] 204 new_depends = []
205 for depend in bb.utils.explode_deps(bb.data.getVar(varname, d, True) or ""): 205 deps = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
206 for depend in deps:
206 # Have to be careful with any version component of the depend 207 # Have to be careful with any version component of the depend
207 split_depend = depend.split(' (') 208 new_depend = get_package_mapping(depend, d)
208 new_depend = get_package_mapping(split_depend[0].strip(), d) 209 if deps[depend]:
209 if len(split_depend) > 1: 210 new_depends.append("%s (%s)" % (new_depend, deps[depend]))
210 new_depends.append("%s (%s" % (new_depend, split_depend[1]))
211 else: 211 else:
212 new_depends.append(new_depend) 212 new_depends.append(new_depend)
213 213