From 31fcfefbfdaa7c4c1061c5204302fb9d6fa0d1b0 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 29 Sep 2012 19:19:11 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'meta/classes/package_deb.bbclass') diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 3b42d3b194..a25e5d783e 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -334,18 +334,36 @@ python do_package_deb () { mapping_rename_hook(localdata) + def debian_cmp_remap(var): + # In debian '>' and '<' do not mean what it appears they mean + # '<' = less or equal + # '>' = greater or equal + # adjust these to the '<<' and '>>' equivalents + # + for dep in var: + if (var[dep] or "").startswith("< "): + var[dep] = var[dep].replace("< ", "<< ") + elif (var[dep] or "").startswith("> "): + var[dep] = var[dep].replace("> ", ">> ") + rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "") + debian_cmp_remap(rdepends) for dep in rdepends: if '*' in dep: del rdepends[dep] rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "") + debian_cmp_remap(rrecommends) for dep in rrecommends: if '*' in dep: del rrecommends[dep] rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "") + debian_cmp_remap(rsuggests) rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "") + debian_cmp_remap(rprovides) rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "") + debian_cmp_remap(rreplaces) rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "") + debian_cmp_remap(rconflicts) if rdepends: ctrlfile.write("Depends: %s\n" % unicode(bb.utils.join_deps(rdepends))) if rsuggests: -- cgit v1.2.3-54-g00ecf