mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
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) 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>
This commit is contained in:
committed by
Richard Purdie
parent
b0f5feea01
commit
b0ce2e842a
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user