summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_deb.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-06-30 09:48:59 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-30 09:48:59 +0100
commit99d883f81a2e7a4c5c69541cb229c0f699fcb22a (patch)
tree91980c6b815c71adae0e556529f9cd8f87f31aa2 /meta/classes/package_deb.bbclass
parent9a543b75cab2daf6536afce100cb5d6031fca9e0 (diff)
downloadpoky-99d883f81a2e7a4c5c69541cb229c0f699fcb22a.tar.gz
classes/package_ipk|_deb.bbclass: Make sure versions correctly make it into output packages
The version information part of package dependency strings was not ending up in the output packages correctly. This patch fixes this and ensures the version information isn't lost. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
-rw-r--r--meta/classes/package_deb.bbclass20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 94a07b3481..560b7bc9c9 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -196,22 +196,22 @@ python do_package_deb () {
196 rdepends = [dep for dep in rdepends if not '*' in dep] 196 rdepends = [dep for dep in rdepends if not '*' in dep]
197 rrecommends = bb.utils.explode_deps(unicode(bb.data.getVar("RRECOMMENDS", localdata, 1) or "")) 197 rrecommends = bb.utils.explode_deps(unicode(bb.data.getVar("RRECOMMENDS", localdata, 1) or ""))
198 rrecommends = [rec for rec in rrecommends if not '*' in rec] 198 rrecommends = [rec for rec in rrecommends if not '*' in rec]
199 rsuggests = (unicode(bb.data.getVar("RSUGGESTS", localdata, 1) or "")).split() 199 rsuggests = bb.utils.explode_deps(unicode(bb.data.getVar("RSUGGESTS", localdata, 1) or ""))
200 rprovides = (unicode(bb.data.getVar("RPROVIDES", localdata, 1) or "")).split() 200 rprovides = bb.utils.explode_deps(unicode(bb.data.getVar("RPROVIDES", localdata, 1) or ""))
201 rreplaces = (unicode(bb.data.getVar("RREPLACES", localdata, 1) or "")).split() 201 rreplaces = bb.utils.explode_deps(unicode(bb.data.getVar("RREPLACES", localdata, 1) or ""))
202 rconflicts = (unicode(bb.data.getVar("RCONFLICTS", localdata, 1) or "")).split() 202 rconflicts = bb.utils.explode_deps(unicode(bb.data.getVar("RCONFLICTS", localdata, 1) or ""))
203 if rdepends: 203 if rdepends:
204 ctrlfile.write(u"Depends: %s\n" % ", ".join(rdepends)) 204 ctrlfile.write(u"Depends: %s\n" % bb.utils.join_deps(rdepends))
205 if rsuggests: 205 if rsuggests:
206 ctrlfile.write(u"Suggests: %s\n" % ", ".join(rsuggests)) 206 ctrlfile.write(u"Suggests: %s\n" % bb.utils.join_deps(rsuggests))
207 if rrecommends: 207 if rrecommends:
208 ctrlfile.write(u"Recommends: %s\n" % ", ".join(rrecommends)) 208 ctrlfile.write(u"Recommends: %s\n" % bb.utils.join_deps(rrecommends))
209 if rprovides: 209 if rprovides:
210 ctrlfile.write(u"Provides: %s\n" % ", ".join(rprovides)) 210 ctrlfile.write(u"Provides: %s\n" % bb.utils.join_deps(rprovides))
211 if rreplaces: 211 if rreplaces:
212 ctrlfile.write(u"Replaces: %s\n" % ", ".join(rreplaces)) 212 ctrlfile.write(u"Replaces: %s\n" % bb.utils.join_deps(rreplaces))
213 if rconflicts: 213 if rconflicts:
214 ctrlfile.write(u"Conflicts: %s\n" % ", ".join(rconflicts)) 214 ctrlfile.write(u"Conflicts: %s\n" % bb.utils.join_deps(rconflicts))
215 ctrlfile.close() 215 ctrlfile.close()
216 216
217 for script in ["preinst", "postinst", "prerm", "postrm"]: 217 for script in ["preinst", "postinst", "prerm", "postrm"]: