mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-11 03:03:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

python3: respect package order in manifest

Browse Source 
Don't sort the manifest when using it to generate packaging rules, so ordering
can be used to have complex packaging rules.

(From OE-Core rev: 80dae6218efd25c92b9c43360e0846bb0af56c7e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-09-14 12:09:34 +01:00
committed by Richard Purdie
parent 2ac291af1f
commit aaf110e874
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-devtools/python/python3_3.5.6.bb
View File

@@ -252,7 +252,7 @@ RPROVIDES_${PN} += "${PN}-modules"
INCLUDE_PYCS ?= "1"
python(){
import json
import collections, json
filename = os.path.join(d.getVar('THISDIR'), 'python3', 'python3-manifest.json')
# This python changes the datastore based on the contents of a file, so mark
@@ -260,7 +260,7 @@ python(){
bb.parse.mark_dependency(d, filename)
with open(filename) as manifest_file:
python_manifest=json.load(manifest_file)
python_manifest=json.load(manifest_file, object_pairs_hook=collections.OrderedDict)
include_pycs = d.getVar('INCLUDE_PYCS')
@@ -294,8 +294,6 @@ python(){
d.appendVar('RDEPENDS_' + pypackage, ' ' + pn + '-' + value)
d.setVar('SUMMARY_' + pypackage, python_manifest[key]['summary'])
# We need to ensure staticdev packages match for files first so we sort in reverse
newpackages.sort(reverse=True)
# Prepending so to avoid python-misc getting everything
packages = newpackages + packages
d.setVar('PACKAGES', ' '.join(packages))