Particularly:
[ERROR|FAIL] was matching characters rather than strings.
Using (ERROR|FAIL) requires -r option.
(From OE-Core rev: c041c326a1dbf1b128fc32d887acd73c6f5fb415)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop backports, rebase other patches.
0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
is removed as the use case (allowing python 2 and 3 to coexist
in SDKs) is no longer relevant with Python 2.x reaching end of line
and upstream has refactored the code making a rebase difficult.
If needed, please re-add the patch to py2, rather than py3.
Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes
and classes accordingly.
The manifest for the 3.8.0 version is updated; particularly pkgutil
module is now packaged in -core (as other things in core need it);
this also necessitates allowing empty -pkgutil package to avoid
breakage across layers.
(From OE-Core rev: e6ab9f16b92aa1abdae82c535c1a452a1341b0e2)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Python 2 ceased being maintained on the 1st January 2020. We've already
removed all users of it from oe-core so the final step is to move the
recipe and supporting classes to meta-python2.
The following are removed in this commit:
- python and python-native 2.7.17
- python-setuptools
- The classes pythonnative, pythondir, distutils, setuptools
(From OE-Core rev: 390f3edabfb1f68ed9766245291c5f44ea00cc38)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is not exploitable when glibc has CVE-2016-10739 fixed,
which is fixed in the upstream version since warrior.
(From OE-Core rev: 0da6e0a232019fe7eccfbdf33a13c1fe0a35cddd)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update to account for review feedback on list.
(From OE-Core rev: ec788594f3f6a47687c6eb321437f2d2b58b1518)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
One Windows-only CVE that cannot be fixed, and two CVEs
where upstream agreement is that they are not vulnerabilities.
(From OE-Core rev: 56d5b181f3b119f2bbd310dedd6d3b26e76f5944)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There's already a variable for "the host python to use during the build
when cross-compiling", so there's no need to add another.
(From OE-Core rev: 1ede9777478469fbdb633782e0ffb2ae68b1a578)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use EXTRA_OECONF and CACHED_CONFIGUREVARS as nature intended.
(From OE-Core rev: 260804462766116941a1d9100ef8be3e66b93300)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The upgrade from 2.7.3 to 2.7.9 in oe-core cb02ecb introduced some
copy-paste errors which inadvertandly disabled the generation of
optimised bytecode (.pyo files).
Restore the intended behaviour and bring back .pyo files.
(From OE-Core rev: f49077af44969212530a7f1b5cb9370fefb85434)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The manifest parsing code was only adding .py and .pyc paths to FILES,
generalise the latter to .py? so it catches .pyo files too.
(From OE-Core rev: 1e0ef76dcccfa10cdf473670acd2c52332bb3412)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of passing the same five variables to oe_runmake repeatedly, add them to
EXTRA_OEMAKE once.
(From OE-Core rev: c4ae09134732e4e95f17d6e572756bec49a9e3d0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There's no need to patch in HOSTPGEN when we can just override PGEN directly.
(From OE-Core rev: d274a3d3bd90d8726752c3a18bc15fdf6bc2f37d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The package python3-misc is not in the manifest file
so it needs to be added explicitely to RPROVIDES_class-native.
(From OE-Core rev: 95c6a1180f14e1db815ff92f7a1dce8506bdb294)
Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The package python-misc is not in the manifest file
so it needs to be added explicitely to RPROVIDES for native class.
(From OE-Core rev: f6164cc210d584efb702445dcd2167aa352b40af)
Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
traceback2 adds traceback for python2. Rather than depend on traceback2, we're
python3 only so just use traceback.
This caused breakage in oe-selftest -j which uses testtools on the autobuilder
using buildtools-tarball.
[YOCTO #13652]
(From OE-Core rev: ee80a06c107375e3cf0d246ea17c09dda4536dab)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When cross-compiling Python 2 you need a native pgen binary, but the cross
recipe can't do this on it's own so we build it in python-native and install it.
The rule to build pgen was also causing a complete rebuild of all of the
generated sources, which meant that building Python 2 needs a *host* Python 2.
This can be fixed by simply building pgen, as this is all we need to install.
[ YOCTO #13645 ]
(From OE-Core rev: 04f7e28963b413b88724c80f67787b440793570e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop backports, rebase a couple of patches.
This is the second last release of py 2.x; upstream support ends on
1 January 2020, there will be one final 2.x afterwards.
Note that the only thing that still needs python 2.x in oe-core is
u-boot; when the next u-boot update arrives, we should find out
where the py3 migration is for that component before merging the
update.
(From OE-Core rev: 184b60eb905bb75ecc7a0c29a175e624d8555fac)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Import issues are encountered for the python3 aifc module,
on images with python3-misc installed:
|>>> import aifc
|Traceback (most recent call last):
|File "<stdin>", line 1, in <module>
|File "/usr/lib64/python3.7/aifc.py", line 254, in <module>
|from chunk import Chunk
|ModuleNotFoundError: No module named 'chunk'
|>>>
The chunk module is part of python3-audio. Add python3-audio
to RDEPENDS for python3-misc to fix the error.
(From OE-Core rev: 9f0e61f6ce1d945226b706f4376a762fcc636703)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In multilib builds python3-config gets renamed to eg python3-config-lib64 but
this ends up being packaged in python3-core not python3-dev.
The manifest uses an extended glob to package all python* binaries that are not
python-config into python3-core:
"${bindir}/python*[!-config]",
However, this doesn't do what was intended, as [] is a range match.
Replace the globs with more verbose but precise matches, and clear out
FILES_${PN} to ensure that new binaries don't end up in ${PN} (which shouldn't
exist).
[ YOCTO #13592 ]
(From OE-Core rev: c780f21c33b0684dafff3421600cd1c11ddd0c48)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With python3-config using the 'python-config' name, it's possible for
python-config to point at python3-config, which is obviously wrong.
(From OE-Core rev: 80a4a44d4d9da1cacda5f50ea955017502829c6d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python3-config uses distutils:
Traceback (most recent call last):
File "/usr/bin/python3-config", line 9, in <module>
from distutils import sysconfig
ModuleNotFoundError: No module named 'distutils'
Add the dependency so that distutils is always present.
[ YOCTO #13592 ]
(From OE-Core rev: 04136dbac48986dce5b2b872b2c0b46c673c44f2)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously the readline module would have been built regardless of
readline's presence in the sysroot, and the recipe would
fail at package_qa.
(From OE-Core rev: 79ebbca6943bc66b619671f93ac283ed2cfc8e5c)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The use case is building a gpl3-free image, without having
to rely on outdated recipes from meta-gplv2 layer.
(From OE-Core rev: 02eb487c8145e0f3d957c39cf16f6f805e95e536)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The runpy module is used to implement 'python3 -m foo', so move it to
python3-core as it's an essential part of the CLI.
(From OE-Core rev: eba857d3e52f83d426e95fa8373799da058f9484)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes:
ERROR: python-2.7.16-r0 do_package_qa: QA Issue:
/usr/lib/python2.7/lib-dynload/_tkinter.so contained in package
python-tkinter requires libtk8.6.so, but no providers found in
RDEPENDS_python-tkinter? [file-rdeps]
(From OE-Core rev: f78248a2380bbbbf271b5bb02c762f5bc7a3a92e)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
pip3 depends on pickle, so add python3-pickle to RDEPENDS.
Without it, errors such as the following occur:
>>> import pip._internal
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib64/python3.7/site-packages/pip/internal/init_.py", line 40, in <module>
from pip._internal.cli.autocompletion import autocomplete
File "/usr/lib64/python3.7/site-packages/pip/_internal/cli/autocompletion.py", line 8, in <module>
from pip._internal.cli.main_parser import create_main_parser
File "/usr/lib64/python3.7/site-packages/pip/_internal/cli/main_parser.py", line 7, in <module>
from pip._internal.cli import cmdoptions
File "/usr/lib64/python3.7/site-packages/pip/_internal/cli/cmdoptions.py", line 29, in <module>
from pip._internal.utils.ui import BAR_TYPES
File "/usr/lib64/python3.7/site-packages/pip/_internal/utils/ui.py", line 16, in <module>
from pip._internal.utils.logging import get_indentation
File "/usr/lib64/python3.7/site-packages/pip/_internal/utils/logging.py", line 6, in <module>
import logging.handlers
File "/usr/lib64/python3.7/logging/handlers.py", line 26, in <module>
import logging, socket, os, pickle, struct, time, re
ModuleNotFoundError: No module named 'pickle'
(From OE-Core rev: 39f53aae947f08284bf4864934f62c33e4e9be3c)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without access to unittest, subunit cannot be imported in python3:
root@qemux86-64:~# python3
Python 3.7.4 (default, Sep 20 2019, 13:38:31)
[GCC 9.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import subunit
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python3.7/site-packages/subunit/__init__.py", line 123, in <module>
import unittest
ModuleNotFoundError: No module named 'unittest'
>>>
Adding python3-testtools to python3-subunit's RDEPENDS fixes the
issue. This also implicitly provides the functionality found in
the python3-extras module.
(From OE-Core rev: 7ed7dc39e379c18f757e3c326ec1466c8ab27b41)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
