diff options
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 18 |
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)) |