diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 11:37:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 11:40:53 +0100 |
commit | 5fdbda6922327d963d4fe1c597fed8f0dfd20ed1 (patch) | |
tree | 98e3a58efeaead2fa76110b571cfda3f63414277 /meta/classes/package_ipk.bbclass | |
parent | 0bfb2094e3eadc85358a354d12b211ff69612a61 (diff) | |
download | poky-5fdbda6922327d963d4fe1c597fed8f0dfd20ed1.tar.gz |
classes: Update to use corrected bb.utils.explode_dep_versions2 API
The bb.utils.explode_dep_versions function has issues where dependency information
can be lost. The API doesn't support maintaining the correct information so this
changes to use a new function which correctly handles the data.
This patch also fixes various points in the code to ensure that we do not have any
duplicates in things that use explode_dep_versions.
A new sanity test to test the contents of the R* variables is also added.
[Some changes from Mark Hatle <mark.hatle@windriver.com>]
(From OE-Core rev: 16a892431d0c0d03f8b561b92909cf2f11af4918)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 281ce596d5..019bd7cc19 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -379,22 +379,23 @@ python do_package_ipk () { | |||
379 | # adjust these to the '<<' and '>>' equivalents | 379 | # adjust these to the '<<' and '>>' equivalents |
380 | # | 380 | # |
381 | for dep in var: | 381 | for dep in var: |
382 | if (var[dep] or "").startswith("< "): | 382 | for i, v in enumerate(var[dep]): |
383 | var[dep] = var[dep].replace("< ", "<< ") | 383 | if (v or "").startswith("< "): |
384 | elif (var[dep] or "").startswith("> "): | 384 | var[dep][i] = var[dep][i].replace("< ", "<< ") |
385 | var[dep] = var[dep].replace("> ", ">> ") | 385 | elif (v or "").startswith("> "): |
386 | var[dep][i] = var[dep][i].replace("> ", ">> ") | ||
386 | 387 | ||
387 | rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "") | 388 | rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS", True) or "") |
388 | debian_cmp_remap(rdepends) | 389 | debian_cmp_remap(rdepends) |
389 | rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "") | 390 | rrecommends = bb.utils.explode_dep_versions2(localdata.getVar("RRECOMMENDS", True) or "") |
390 | debian_cmp_remap(rrecommends) | 391 | debian_cmp_remap(rrecommends) |
391 | rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "") | 392 | rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "") |
392 | debian_cmp_remap(rsuggests) | 393 | debian_cmp_remap(rsuggests) |
393 | rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "") | 394 | rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "") |
394 | debian_cmp_remap(rprovides) | 395 | debian_cmp_remap(rprovides) |
395 | rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "") | 396 | rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") |
396 | debian_cmp_remap(rreplaces) | 397 | debian_cmp_remap(rreplaces) |
397 | rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "") | 398 | rconflicts = bb.utils.explode_dep_versions2(localdata.getVar("RCONFLICTS", True) or "") |
398 | debian_cmp_remap(rconflicts) | 399 | debian_cmp_remap(rconflicts) |
399 | 400 | ||
400 | if rdepends: | 401 | if rdepends: |