diff options
| -rw-r--r-- | meta/classes/package_deb.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 6db69332e2..4e5dc12850 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
| @@ -52,6 +52,7 @@ python do_package_deb () { | |||
| 52 | import re, copy | 52 | import re, copy |
| 53 | import textwrap | 53 | import textwrap |
| 54 | import subprocess | 54 | import subprocess |
| 55 | import collections | ||
| 55 | 56 | ||
| 56 | oldcwd = os.getcwd() | 57 | oldcwd = os.getcwd() |
| 57 | 58 | ||
| @@ -247,6 +248,7 @@ python do_package_deb () { | |||
| 247 | debian_cmp_remap(rsuggests) | 248 | debian_cmp_remap(rsuggests) |
| 248 | # Deliberately drop version information here, not wanted/supported by deb | 249 | # Deliberately drop version information here, not wanted/supported by deb |
| 249 | rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) | 250 | rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) |
| 251 | rprovides = collections.OrderedDict(sorted(rprovides.items(), key=lambda x: x[0])) | ||
| 250 | debian_cmp_remap(rprovides) | 252 | debian_cmp_remap(rprovides) |
| 251 | rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") | 253 | rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") |
| 252 | debian_cmp_remap(rreplaces) | 254 | debian_cmp_remap(rreplaces) |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 1b5f4f59e3..e32b9cb5fd 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
| @@ -20,6 +20,7 @@ python do_package_ipk () { | |||
| 20 | import re, copy | 20 | import re, copy |
| 21 | import textwrap | 21 | import textwrap |
| 22 | import subprocess | 22 | import subprocess |
| 23 | import collections | ||
| 23 | 24 | ||
| 24 | oldcwd = os.getcwd() | 25 | oldcwd = os.getcwd() |
| 25 | 26 | ||
| @@ -192,6 +193,7 @@ python do_package_ipk () { | |||
| 192 | debian_cmp_remap(rsuggests) | 193 | debian_cmp_remap(rsuggests) |
| 193 | # Deliberately drop version information here, not wanted/supported by ipk | 194 | # Deliberately drop version information here, not wanted/supported by ipk |
| 194 | rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) | 195 | rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) |
| 196 | rprovides = collections.OrderedDict(sorted(rprovides.items(), key=lambda x: x[0])) | ||
| 195 | debian_cmp_remap(rprovides) | 197 | debian_cmp_remap(rprovides) |
| 196 | rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") | 198 | rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") |
| 197 | debian_cmp_remap(rreplaces) | 199 | debian_cmp_remap(rreplaces) |
