summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_ipk.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-29 19:19:11 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 11:40:51 +0100
commit31fcfefbfdaa7c4c1061c5204302fb9d6fa0d1b0 (patch)
tree98bc00cf149669f3ff95967abcaa6c5d71a946ea /meta/classes/package_ipk.bbclass
parent56c677a338493cca90c1524a04376f21abba2733 (diff)
downloadpoky-31fcfefbfdaa7c4c1061c5204302fb9d6fa0d1b0.tar.gz
package_deb/ipk: Remap < and > to << and >>
In deb and ipk, < means <=, while > means >=... there is a different operator << and >> that means < and >, so we map them when constructing the packages. (From OE-Core rev: bbcc78d8ff03725ce5b3b65ce24025c3da45f2ab) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r--meta/classes/package_ipk.bbclass18
1 files changed, 18 insertions, 0 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 59cb856847..281ce596d5 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -372,12 +372,30 @@ python do_package_ipk () {
372 372
373 mapping_rename_hook(localdata) 373 mapping_rename_hook(localdata)
374 374
375 def debian_cmp_remap(var):
376 # In debian '>' and '<' do not mean what it appears they mean
377 # '<' = less or equal
378 # '>' = greater or equal
379 # adjust these to the '<<' and '>>' equivalents
380 #
381 for dep in var:
382 if (var[dep] or "").startswith("< "):
383 var[dep] = var[dep].replace("< ", "<< ")
384 elif (var[dep] or "").startswith("> "):
385 var[dep] = var[dep].replace("> ", ">> ")
386
375 rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "") 387 rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "")
388 debian_cmp_remap(rdepends)
376 rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "") 389 rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "")
390 debian_cmp_remap(rrecommends)
377 rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "") 391 rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "")
392 debian_cmp_remap(rsuggests)
378 rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "") 393 rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "")
394 debian_cmp_remap(rprovides)
379 rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "") 395 rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "")
396 debian_cmp_remap(rreplaces)
380 rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "") 397 rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "")
398 debian_cmp_remap(rconflicts)
381 399
382 if rdepends: 400 if rdepends:
383 ctrlfile.write("Depends: %s\n" % bb.utils.join_deps(rdepends)) 401 ctrlfile.write("Depends: %s\n" % bb.utils.join_deps(rdepends))