summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_deb.bbclass20
-rw-r--r--meta/classes/package_ipk.bbclass25
2 files changed, 23 insertions, 22 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"]:
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 04b117b75d..da195a99e1 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -248,24 +248,25 @@ python do_package_ipk () {
248 248
249 bb.build.exec_func("mapping_rename_hook", localdata) 249 bb.build.exec_func("mapping_rename_hook", localdata)
250 250
251 rdepends = bb.utils.explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "") 251 rdepends = bb.utils.explode_dep_versions(bb.data.getVar("RDEPENDS", localdata, 1) or "")
252 rrecommends = bb.utils.explode_deps(bb.data.getVar("RRECOMMENDS", localdata, 1) or "") 252 rrecommends = bb.utils.explode_dep_versions(bb.data.getVar("RRECOMMENDS", localdata, 1) or "")
253 rsuggests = (bb.data.getVar("RSUGGESTS", localdata, 1) or "").split() 253 rsuggests = bb.utils.explode_dep_versions(bb.data.getVar("RSUGGESTS", localdata, 1) or "")
254 rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split() 254 rprovides = bb.utils.explode_dep_versions(bb.data.getVar("RPROVIDES", localdata, 1) or "")
255 rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() 255 rreplaces = bb.utils.explode_dep_versions(bb.data.getVar("RREPLACES", localdata, 1) or "")
256 rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() 256 rconflicts = bb.utils.explode_dep_versions(bb.data.getVar("RCONFLICTS", localdata, 1) or "")
257
257 if rdepends: 258 if rdepends:
258 ctrlfile.write("Depends: %s\n" % ", ".join(rdepends)) 259 ctrlfile.write("Depends: %s\n" % bb.utils.join_deps(rdepends))
259 if rsuggests: 260 if rsuggests:
260 ctrlfile.write("Suggests: %s\n" % ", ".join(rsuggests)) 261 ctrlfile.write("Suggests: %s\n" % bb.utils.join_deps(rsuggests))
261 if rrecommends: 262 if rrecommends:
262 ctrlfile.write("Recommends: %s\n" % ", ".join(rrecommends)) 263 ctrlfile.write("Recommends: %s\n" % bb.utils.join_deps(rrecommends))
263 if rprovides: 264 if rprovides:
264 ctrlfile.write("Provides: %s\n" % ", ".join(rprovides)) 265 ctrlfile.write("Provides: %s\n" % bb.utils.join_deps(rprovides))
265 if rreplaces: 266 if rreplaces:
266 ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces)) 267 ctrlfile.write("Replaces: %s\n" % bb.utils.join_deps(rreplaces))
267 if rconflicts: 268 if rconflicts:
268 ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts)) 269 ctrlfile.write("Conflicts: %s\n" % bb.utils.join_deps(rconflicts))
269 src_uri = bb.data.getVar("SRC_URI", localdata, 1) 270 src_uri = bb.data.getVar("SRC_URI", localdata, 1)
270 if src_uri: 271 if src_uri:
271 src_uri = re.sub("\s+", " ", src_uri) 272 src_uri = re.sub("\s+", " ", src_uri)