On Wed, Sep 19, 2018 at 6:08 AM Burton, Ross <[email protected]> wrote: > > Close, but: > > ERROR: python-2.7.15-r1 do_package_qa: QA Issue: non -staticdev > package contains static .a library: python-distutils path > '/work/corei7-64-poky-linux/python/2.7.15-r1/packages-split/python-distutils/usr/lib/python2.7/config/libpython2.7.a' > [staticdev]
Ahh shoot, I missed that reorder change in your patch set 1 changes. I'll get an update up. > > Ross > On Fri, 14 Sep 2018 at 22:33, Andrew Geissler <[email protected]> wrote: > > > > 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 > > > > Signed-off-by: Andrew Geissler <[email protected]> > > --- > > meta/recipes-devtools/python/python_2.7.15.bb | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/meta/recipes-devtools/python/python_2.7.15.bb > > b/meta/recipes-devtools/python/python_2.7.15.bb > > index 43d9ff5..472c1da 100644 > > --- a/meta/recipes-devtools/python/python_2.7.15.bb > > +++ b/meta/recipes-devtools/python/python_2.7.15.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)) > > -- > > 2.7.4 > > -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
