diff options
-rw-r--r-- | meta/recipes-devtools/python/python3_3.5.6.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb index 605ea6abfe..6085e36b7d 100644 --- a/meta/recipes-devtools/python/python3_3.5.6.bb +++ b/meta/recipes-devtools/python/python3_3.5.6.bb | |||
@@ -252,7 +252,7 @@ RPROVIDES_${PN} += "${PN}-modules" | |||
252 | INCLUDE_PYCS ?= "1" | 252 | INCLUDE_PYCS ?= "1" |
253 | 253 | ||
254 | python(){ | 254 | python(){ |
255 | import json | 255 | import collections, json |
256 | 256 | ||
257 | filename = os.path.join(d.getVar('THISDIR'), 'python3', 'python3-manifest.json') | 257 | filename = os.path.join(d.getVar('THISDIR'), 'python3', 'python3-manifest.json') |
258 | # This python changes the datastore based on the contents of a file, so mark | 258 | # This python changes the datastore based on the contents of a file, so mark |
@@ -260,7 +260,7 @@ python(){ | |||
260 | bb.parse.mark_dependency(d, filename) | 260 | bb.parse.mark_dependency(d, filename) |
261 | 261 | ||
262 | with open(filename) as manifest_file: | 262 | with open(filename) as manifest_file: |
263 | python_manifest=json.load(manifest_file) | 263 | python_manifest=json.load(manifest_file, object_pairs_hook=collections.OrderedDict) |
264 | 264 | ||
265 | include_pycs = d.getVar('INCLUDE_PYCS') | 265 | include_pycs = d.getVar('INCLUDE_PYCS') |
266 | 266 | ||
@@ -294,8 +294,6 @@ python(){ | |||
294 | d.appendVar('RDEPENDS_' + pypackage, ' ' + pn + '-' + value) | 294 | d.appendVar('RDEPENDS_' + pypackage, ' ' + pn + '-' + value) |
295 | d.setVar('SUMMARY_' + pypackage, python_manifest[key]['summary']) | 295 | d.setVar('SUMMARY_' + pypackage, python_manifest[key]['summary']) |
296 | 296 | ||
297 | # We need to ensure staticdev packages match for files first so we sort in reverse | ||
298 | newpackages.sort(reverse=True) | ||
299 | # Prepending so to avoid python-misc getting everything | 297 | # Prepending so to avoid python-misc getting everything |
300 | packages = newpackages + packages | 298 | packages = newpackages + packages |
301 | d.setVar('PACKAGES', ' '.join(packages)) | 299 | d.setVar('PACKAGES', ' '.join(packages)) |