diff options
| author | Andrew Geissler <geissonator@gmail.com> | 2018-09-19 09:22:28 -0700 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-24 15:39:25 -0400 |
| commit | 9f6e94186d0bd6ce3c6c0079e36d7a8a578a026b (patch) | |
| tree | 3b3b1de129ec29e28dd041510bfcc55cc09bec52 /poky | |
| parent | 730fed8278b2092d2b0079dff74d81131438cb76 (diff) | |
| download | talos-openbmc-9f6e94186d0bd6ce3c6c0079e36d7a8a578a026b.tar.gz talos-openbmc-9f6e94186d0bd6ce3c6c0079e36d7a8a578a026b.zip | |
python: respect package order in manifest
Don't sort the manifest when using it to generate packaging rules, so
ordering can be used to have complex packaging rules.
This is a backport of the same changes done by Ross Burton for python3
Changes since v1:
- Rebase
(From OE-Core rev: 5a5a97b1c3914ad4a3e94981bf53897d0a3f4fb3)
(From poky rev: b0ce2e842a4f36672d2aab424d63b09e31eec048)
Change-Id: I8b2edafc7203015a62c2a2bcfee5a73b3e1239ff
Signed-off-by: Andrew Geissler <geissonator@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky')
| -rw-r--r-- | poky/meta/recipes-devtools/python/python_2.7.14.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/poky/meta/recipes-devtools/python/python_2.7.14.bb b/poky/meta/recipes-devtools/python/python_2.7.14.bb index b923b9237..ea54fb9e7 100644 --- a/poky/meta/recipes-devtools/python/python_2.7.14.bb +++ b/poky/meta/recipes-devtools/python/python_2.7.14.bb @@ -207,7 +207,7 @@ RPROVIDES_${PN} += "${PN}-modules" INCLUDE_PYCS ?= "1" python(){ - import json + import collections, json filename = os.path.join(d.getVar('THISDIR'), 'python', 'python2-manifest.json') # This python changes the datastore based on the contents of a file, so mark @@ -215,7 +215,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') @@ -248,8 +248,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)) |
