Commit Graph

1042 Commits

Author SHA1 Message Date
Luca Boccassi
6e21f8ad83 python*-setuptools: add separate packages for pkg_resources module
The pkg_resources Python module is useful by itself, for example for
automatic loading of resources shipped in a Python package.
Add separate packages for it, so that users can depend on them
individually and avoid pulling in the entire setuptools, which
include scripts to download other packages, which might not be
desired on minimal images.

Other distributions like Debian and Ubuntu already split setuptools
and pkg-resources in this way.

The setuptools packages now depend on the new pkg-resources packages,
to avoid regressions for other packages that depend on them
already.

(From OE-Core rev: 4316d9afe920460e5d2236f217027cce37ed7bf5)

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-27 17:06:34 +01:00
Alexander Kanavin
3cad5ae0fe python3-pbr: upgrade 5.1.3 -> 5.2.0
(From OE-Core rev: 414231e9cd75e4d845997b2c5d17d350034747b3)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-22 07:24:52 +01:00
Alexander Kanavin
0aa2e9368c python3-pip: upgrade 19.0.3 -> 19.1.1
(From OE-Core rev: e5d6709f3d2da93dee740fd8ed6102ab80e8cbab)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-22 07:24:52 +01:00
Alexander Kanavin
c076bdc1ba python3-mako: upgrade 1.0.9 -> 1.0.10
(From OE-Core rev: d081fd6b04788da7ed8eb46c0bc79e725a9acb2c)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-22 07:24:52 +01:00
Martin Jansa
e5f6e0853e python: add a fix for CVE-2019-9948 and CVE-2019-9636
(From OE-Core rev: 9d23b982fa4e0290761b3d15f6959779fed72ad6)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-21 12:56:34 +01:00
Changqing Li
34b35a1275 python3: fix do_install fail for parallel buiild
When using make -j with the 'install' target, it's possible for altbininstall
(which normally creates BINDIR) and libainstall (which doesn't, though it
installs python-config there) to race, resulting in a failure due to
attempting to install python-config into a nonexistent BINDIR. Ensure it also
exists in the libainstall target.

(From OE-Core rev: 07aeaa4f3f88f575e4674145a7faab3ba8e97fad)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-08 23:00:32 +01:00
Richard Purdie
ed5198463f openssh/systemd/python/qemu: Fix patch Upstream-Status
Fix some missing or corrupted patch Upstream-Status values.

(From OE-Core rev: 07bc5a5367e0dec45253fd849e0157094152fd31)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-08 12:15:17 +01:00
Alex Kiernan
c499f55303 python3: Add ntpath.py to python core
The newer python3 recipe no longer includes ntpath.py in core, leading
to failures in pkg_resources:

  Traceback (most recent call last):
    File "/usr/bin/bmaptool", line 6, in <module>
      from pkg_resources import load_entry_point
    File "/usr/lib/python3.7/site-packages/pkg_resources/__init__.py", line 42, in <module>
      import ntpath
  ModuleNotFoundError: No module named 'ntpath'

(From OE-Core rev: 9ff61fa83a0a4f2a7b5b0376b6c48fb1173c9ac7)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-08 12:15:17 +01:00
Alexander Kanavin
0a19dacb6b python3-pycairo: update to 1.18.1
Switch over to meson build, as it does not attempt to install
headers into /usr/share and pkg-config files into /usr/share/$libdir.

(From OE-Core rev: 0e2858bd7d6f013bb31b64552a9ea5873c4f7ced)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-05-01 09:08:58 +01:00
Richard Purdie
120c082cc1 python3: Drop ptest hack
With the kernel TCP backlog queue coalescing bug fixed in the 5.0 kernels
we don't need this patch anymore and can run the tests.

(From OE-Core rev: 21bfbef23e1f4c90070017e19f70e488e6ff64be)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-29 14:16:31 +01:00
Jaewon Lee
4a42d6907a Adding back wrapper and using OEPYTHON3HOME variable for python3
Adding back the python wrapper and adding a patch to use OEPYTHON3HOME
instead of PYTHONHOME if set, for python3.

If we add back the wrapper as is, we would see the following error that
we also see in Thud:

ImportError: No module named site
OpenEmbedded requires 'python' to be python v2 (>= 2.7.3), not python
v3.
Please upgrade your python v2

This is because python3 would've set PYTHONHOME to use nativesdk
python3 libraries but when the oe-buildenv-internal script tries to call
python2 for the py_v27_check, there will be no python2 libraries in the
PYTHONHOME directory.
In other words, bitbake needs host python2 and the env variable set from
the wrapper contaminates the env and host python2 won't be able to find
its libraries

Creating another variable OEPYTHON3HOME and using this in the python3
wrapper to allow for a way to set a different paths for python3 and
python2

[YOCTO #13208]

(From OE-Core rev: 75d2a85e24ef9a2bf0e218521944523f0ff281e0)

Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-29 14:16:30 +01:00
Oleksandr Kravchuk
08c0268aaa python3-pygobject: update to 3.32.1
(From OE-Core rev: f3f37a0360cedc2dded3ddd34d190ea76eade5cd)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-26 10:09:08 +01:00
Alexander Kanavin
3772725a45 python3-pip: update to 19.0.3
(From OE-Core rev: dd71c3a9c8e1bf004526bb6103870399ed9528e1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-25 00:05:20 +01:00
Alexander Kanavin
3eb2e93485 python3-pbr: update to 5.1.3
(From OE-Core rev: e3f9fe611cfba8519364279c55daecc6f04a65bc)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-25 00:05:20 +01:00
Alexander Kanavin
0c3e846938 python3-mako: update to 1.0.9
(From OE-Core rev: ab1018987b70039b12269224038af75521566f28)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-25 00:05:20 +01:00
Alexander Kanavin
281ee0ccd1 python-setuptools: update to 41.0.1
(From OE-Core rev: 2ec3ca096f7a6c6ac8a3bfaa71a60d5903d29b9f)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-25 00:05:20 +01:00
Alexander Kanavin
37c3eda54b python-scons: update to 3.0.5
Do not use the latest pypi tarball, as it lacks several files (the LICENSE, for instance).

License-update: copyright years.

(From OE-Core rev: dd45da1c226bc87b4be5e9f065595aed316175a2)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-25 00:05:20 +01:00
Alexander Kanavin
66ecad10ae python3-pygobject: update to 3.32.0
Switch to meson build system.

Add a patch to disable tests.

Add "introspection" to unknown configure option whitelist, as
this recipe needs g-i unconditionally.

(From OE-Core rev: 890a460d2ad9bce8f6a1df055e040f334f958673)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-23 23:30:20 +01:00
Alexander Kanavin
47f4ad9ff0 python3: add another multilib fix
(From OE-Core rev: 60502aa366f860b4f056da1bcd8fd5ee8f4495f5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-23 23:30:20 +01:00
Alexander Kanavin
77e39cf412 python: update to 3.7.3
License-update: copyright years

(From OE-Core rev: a215296bb1b6a87da3692ef0e6176e56310b05f2)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-16 11:10:02 +01:00
Alexander Kanavin
0ee1b6d0c9 python: update to 2.7.16
Drop backported patches

License-update: copyright years

(From OE-Core rev: 061dfcdf062d64e4e1e50e28edfacb14e41b7d74)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-16 11:10:02 +01:00
Alexander Kanavin
cc5654b870 python3: add a tr-tr locale for test_locale ptest
With this change, the ptests do not fail anymore,
except for the three failures caused by the 5.0 kernel regression:

- test_ssl and test_httplib lock up, and are skipped
(there is a separate patch for it)

- test_asyncio fails but does not lock up

(From OE-Core rev: 49720e6d680d0041850c00ce6dc859d557825595)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-12 09:29:06 +01:00
Richard Purdie
890e0ab069 python3: Fix ptest output parsing
A previous fix to python added -W and removed -v. This reverts that part of the change
since we're no longer getting ptest results at all. This change back to more
verbose output means we start getting test results again.

(From OE-Core rev: d70c77e4d5ec1d7cb4f134377df11e6475f31062)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-11 21:12:48 +01:00
Richard Purdie
fb852a81fc python3: Avoid hanging tests
There are python tests which hang with recent kernels, 5.0 onwards. This causes
ptest to timeout for python3. Disable the problematic test until we better understand
the real cause and fix of the issue (discussions are happening with upstream).

See the patch for details/links.

(From OE-Core rev: 2a48df02a2871635f8235645bfd7f7a3ff0aef31)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-11 21:12:48 +01:00
Richard Purdie
57933bd958 openssh/util-linux/python*: Ensure ptest output is unbuffered
We need to run sed with the -u option to ensure the output is unbuffered else
ptest-runner may timeout thinkig things were idle. Busybox doesn't have the -u
option so we need to RDEPEND on sed (which is a good thing to do if we use it
anyway).

Alex Kanavin should get credit for discovering the problem.

(From OE-Core rev: d3ffbebf43c23faa43af81c9ecf6fcaef36d675b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-09 13:44:39 +01:00
Ross Burton
9dec37ceef python: improve ptest
Add missing runtime dependencies: the test suite needs proper chmod from
coreutils, and the Europe/Minsk timezone.

Also change run-ptest to use -W (run verbosely on failure) instead of -v (always
verbose) to hopefully reduce the noise in the ptest reports.

(From OE-Core rev: 7574f6850797fb7556d2f8077860b7c1d26ae8ec)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-02 15:24:11 +01:00
Ross Burton
8b86b1d65e python: fix CVE-2018-14647 in python-native too
(From OE-Core rev: d05c79ed46880a7bfdbf166c336a9d83167ddf34)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-03-24 17:00:52 +00:00
Armin Kuster
5220a105a7 python: time.tzset missing
import time
time.tzset()
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
AttributeError: module 'time' has no attribute 'tzset'

enable tzset in both python versions

(From OE-Core rev: 28e631d6dbc0a126253c0a072b8f39ff683bfa3a)

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-03-09 14:43:12 +00:00
Alexander Kanavin
561ff52c51 python3: depend on qemu-native, not qemu-helper-native
qemu-helper-native would erroneously pull in the qemu system
parts, where we only want usermode parts for pgo.

(From OE-Core rev: 9e1f7ebe2529fb7f4728dd67ae60341a61861a50)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-28 13:21:54 +00:00
Richard Purdie
aadf0716ed python3-six: upgrade 1.11.0 -> 1.12.0
The license checksum changed due to a change in copyright years only.

(From OE-Core rev: f45e890838544bcb77cf2e8503994ef894d3071e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-20 21:22:49 +00:00
Richard Purdie
806de34fda python3-setuptools: upgrade 40.0.0 -> 40.8.0
(From OE-Core rev: dceac54e05bb786e19de8db33982a8d54e41a915)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-20 21:22:49 +00:00
Richard Purdie
4e0adf6840 python3-pip: upgrade 18.0 -> 19.0.2
The license checksum changed due to copyright year changes.

(From OE-Core rev: a50aa22a229e8c13d36528a9e5a776688a5133a7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-20 21:22:49 +00:00
Richard Purdie
d8a76d141f python3-pbr: upgrade 5.1.1 -> 5.1.2
(From OE-Core rev: 5aa11b42509ae74364f07c5aa30ff6758caffe2f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-20 21:22:49 +00:00
Richard Purdie
97e68f42bb python3-gitdb: upgrade 2.0.4 -> 2.0.5
(From OE-Core rev: 50b87d78a3c1193315ccf7cd08f31a99a6950f56)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-20 21:22:49 +00:00
Changqing Li
541e1e4e78 python3: fix INCLDIRSTOMAKE in _sysconfigdata.py
recipe glade do_configure failed after python upgrade
to 3.7.2, it will do runtime check of python headers
with native python3 under recipe-sysroot-native, it will check under
path INCLDIRSTOMAKE, but this value is '/usr/include /usr/include
/usr/include/python3.7m /usr/include/python3.7m', which will cause
below error:

ERROR: This autoconf log indicates errors, it looked at host include and/or
library paths while determining system capabilities.

fix it by replace /usr/include to STAGING_INCDIR

(From OE-Core rev: 4975a283478ec3cbde813a1b27ab318de4aa8051)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-20 11:30:35 +00:00
Alexander Kanavin
c92e780c85 python3: tweaks to achieve 100% pass rate in ptest
(From OE-Core rev: 22f4f1ef17219448416b7cf2a570c7acd7149a64)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-08 10:57:19 +00:00
Alexander Kanavin
d772d8bb1b python: make the python 3.x version of 2to3 utility the default one
(From OE-Core rev: 98ba7ba8c5bc091f5cc590299f1a636c9b8dc1f5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-08 10:57:19 +00:00
Alexander Kanavin
e2c3247c23 python3: upgrade to 3.7.2
I took the same approach as the recent perl upgrade: write recipe from scratch,
taking the pieces from the old recipe only when they were proven to be necessary.

The pgo, manifest and ptest features are all preserved.

New features:

- native and target recipes are now unified into one recipe

- check_build_completeness.py runs right after do_compile() and verifies that
all optional modules have been built (a notorious source of regressions)

- a new approach to sysconfig.py and distutils/sysconfig.py returning values
appropriate for native or target builds: we copy the configuration file to a
separate folder, add that folder to sys.path (through environment variable
that differs between native and target builds), and point python to the file
through another environment variable.

There were a few other patches where it was difficult to decide if the patch
is still relevant, and how to test that it works correctly; please add those
as-needed by testing the new python.

(From OE-Core rev: 02714c105426b0d687620913c1a7401b386428b6)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-08 10:57:19 +00:00
Richard Purdie
9fe8b85f20 python2-manifest: Add missing xmlrpclib.py
The manifest creation bug that was masking this file was fixed, rerun and add
the missing file to fix:

  File "/usr/lib64/python2.7/SimpleXMLRPCServer.py", line 102, in <module>
    import xmlrpclib
ImportError: No module named xmlrpclib

[YOCTO #12814]

(From OE-Core rev: e203b71b06df1e7d73fa300d45c428008a190d00)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-02 11:05:59 +00:00
Alexander Kanavin
2daede4aa8 python3: use ncursesw, not ncurses
So that wide-char functions are accssible.

[YOCTO #13142]

(From OE-Core rev: 042187a65d0622fbd721346b4e55146616c87fd8)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-21 23:44:22 +00:00
André Draszik
dfd833725d meta: remove True option to getVar calls (again)
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).

Search & replace made using the following command:
    sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
        -i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
             | cut -d':' -f1 \
             | sort -u)

(From OE-Core rev: 9f551d588693328e4d99d33be94f26684eafcaba)

Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-14 11:35:56 +00:00
Khem Raj
7f45768254 python3-pbr: Move src uri checksums out of .inc file
python2 version of pbr is in meta-python and uses the same inc file but
is not updated synchronously, which ends up breaking it, either we move
py2 version into OE-core as well and then ensure that both recipes are
updated atomically, or we move the checksums into recipe files

Fixes errors like
http://errors.yoctoproject.org/Errors/Details/216253/

(From OE-Core rev: b020a7139a6fd9efd052a3dc3c02a41f621ae952)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-14 11:35:56 +00:00
Ross Burton
1b15b02b11 python3-smmap: upgrade to 2.0.5
The maintainer lost access to the smmap PyPi account so as with gitdb, set the
PyPi name to smmap2.

(From OE-Core rev: c526576a319307388b31521ff560f1a93066188c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-14 11:35:56 +00:00
Hong Liu
fbc8f2fb66 python3-pbr:Upgrade to 5.1.1
Upgrade python3-pbr from 4.2.0 to 5.1.1.

(From OE-Core rev: 11a8980fbe0f1ec063062fd0c6c4879fb8903481)

Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-11 10:39:09 +00:00
Changqing Li
fd045373e0 python-native: fix one do_populate_sysroot warning
Fix below warning:
WARNING: Skipping RPATH /usr/lib64 as is a standard search path for
work/x86_64-linux/python-native/2.7.15-r1.1/recipe-sysroot-native/
usr/lib/python2.7/lib-dynload/_bsddb.so

setup.py will check db.h under include_dirs, for native build,
/usr/lib64 will be insert to postion 0 of include_dirs, so
it's priority is higher then our sysroot, cause db.h sysroot
is ignored, and rpath set to /usr/lib64. and this cause warning
when do_populate_sysroot. use append to fix it.

(From OE-Core rev: cf994752b69083aaa4f0b873357d6c873b32d7be)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-07 14:38:39 +00:00
Changqing Li
82315924b7 python/python3: use cc_basename to replace CC for checking compiler
When working path contains "clang"/"gcc"/"icc", it might be part of $CC
because of the "--sysroot" parameter. That could cause judgement error
about clang/gcc/icc compilers.

eg: if build under /yocto/builds/xicc/,  bitbake python,  $CC will contains
xicc, will make $CC match *icc, but actuall xicc just folder name.

When "*icc" is matched, below errors are reported when
compiling python/python3:
x86_64-wrs-linux-gcc: error: strict: No such file or directory
x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model'

Here use cc_basename to replace CC for checking compiler to avoid such
kind of issue.

(From OE-Core rev: 96383efa2726ed1bf7893332d726112a8552fc24)

Signed-off-by: Li Zhou <li.zhou@windriver.com>

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-07 14:38:39 +00:00
Serhey Popovych
9d2ea1ea50 python3: Fix do_configure check platform triplet error (2)
When building for powerpc 32bit with musl following error triggered
from do_configure:

checking for the platform triplet based on compiler characteristics... powerpc-linux-gnu
configure: error: internal configure error for the platform triplet, please file a bug report

This is caused by PLATFORM_TRIPLET != MULTIARCH mismatch since MULTIARCH
in case of musl is powerpc-linux-musl. Since triplet is used as part
module name as described in PEP-3149 to make fix less intrusive alias
powerpc-linux-musl to powerpc-linux-gnu to avoid possible runtime
(e.g. tests) incompatibilities later.

Fix was inspired by commit cda0ef61d373 ("python3: fix do_configure
check platform triplet error").

(From OE-Core rev: b2ec91e12088afa0560aecede587d0970fc64110)

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-12-15 17:10:52 +00:00
Alejandro Enedino Hernandez Samaniego
d0c2395db3 create_manifest2: Dont match filenames which contain the directory name for new manifest
When creating a new python2 manifest, there is a corner case on which
the filepath for a certain dependency that was found, could contain
the path of an existing folder, e.g. ${libdir}/python2.7/xmlrpclib.py
module path contains ${libdir}/python2.7/xml, this causes an issue where
the dependency doesnt get eventually added on FILES for that module.

This patch checks if the dependency that was found is a directory, if it
is, it checks if it matches one of the existing directories on the
manifest, if it is not, then it checks if the dependency's path (without
the filename) matches one of the directories.

Also some misc indentation fixes.

(From OE-Core rev: a1c1253b44eb2000de55b7fa3836e5cdaa28a508)

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-12-13 16:32:21 +00:00
Alejandro Enedino Hernandez Samaniego
55553c2477 create_manifest3: Dont match filenames which contain the directory name for new manifest
When creating a new python3 manifest, there is a corner case on which
the filepath for a certain dependency that was found, could contain
the path of an existing folder, e.g. ${libdir}/python3/xmlrpclib.py
module path contains ${libdir}/python3/xml, this causes an issue where
the dependency doesnt get eventually added on FILES for that module.

This patch checks if the dependency that was found is a directory, if it
is, it checks if it matches one of the existing directories on the
manifest, if it is not, then it checks if the dependency's path (without
the filename) matches one of the directories.

(From OE-Core rev: 59db12fdf294cfab5c1730337d092a75867658f7)

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-12-09 11:08:11 +00:00
Ross Burton
ba89e87d8e python3: drop redundant patch
This patch altered the clean target's behaviour to skip the ipkg-install
directory.  However this directory isn't created by opkg, opkg-utils, or the
package_ipk class; and we don't invoke the clean target as we perform
out-of-tree builds.

(From OE-Core rev: 9f8bd475701e5d797d3ffc1ba97647101ba0b9b0)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-12-05 12:37:02 +00:00