aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-05-29python3: Revert python-config to distutils.sysconfigTyler Hall
The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in 12-distutils-prefix-is-inside-staging-area.patch makes distutils.sysconfig affect the native runtime as well as cross building. Use the old, patched implementation which returns paths in the staging directory and for the target, as appropriate. This change reverts this upstream patch http://hg.python.org/cpython/diff/712970b019f7/Misc/python-config.in (From OE-Core rev: 7b2ffd68ae8235dcc3ddff9cbe8525e61f3b3d28) (From OE-Core rev: de5797b27a358954eb15318d0d77ad1981981861) Signed-off-by: Tyler Hall <tylerwhall@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-29python3: Substitute correct python version in shebangTyler Hall
If python2 and python3 are both available, scripts that are subject to this substitution can possibly run with the wrong python version. python3-config is one such script. (From OE-Core rev: 23849347d0fe60a01578efdd6c6e23ebb444dcd6) (From OE-Core rev: ae49adc13db10cb39eeb9377eb4c60a4db436e00) Signed-off-by: Tyler Hall <tylerwhall@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-21python3: sync module dependencies from 2.7Paul Eggleton
These have been added recently to 2.7 but were missing in the 3.3 script/inc file. (From OE-Core rev: 4669afac1004a89e6b87ec46136ca3e7448700d4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28python3: Fix make raceRichard Purdie
This fixes a race which was showing up on the autobuilder (see patch header). (From OE-Core rev: 9d796611afc42bea5ad9cab47ba4fb5ac0cb5ddd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28python3: Fix QA warningRichard Purdie
Addresses the warning: WARNING: QA Issue: python3-native: configure was passed unrecognised options: --with-wctype-functions since this option was removed in python 3. (From OE-Core rev: f2879f3831ac86018e9526e34815f99eafe1ba82) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28python3: Fix race condition at high parallelism factorKhem Raj
Backport a patch to fix race condition as reported here https://bugzilla.yoctoproject.org/show_bug.cgi?id=5884 [YOCTO #5884] (From OE-Core rev: 209a019b12f2941f8aefac9f192e9cdf691196e3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02python-distribute: Add recipes for python2 and python3Khem Raj
in python3-distribute rename easy_install to easy3_install (From OE-Core rev: 712d65335b9a92bba427949f8885102d0aefbeb4) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02python3: Add target and native recipesKhem Raj
3.3.3 is latest bugfix release in 3.3 series License text is changed to reflect year and prev releases +++ ../Python-3.3.2/LICENSE 2013-05-15 09:32:54.000000000 -0700 @@ -74,7 +74,9 @@ 3.2.1 3.2 2011 PSF yes 3.2.2 3.2.1 2011 PSF yes 3.2.3 3.2.2 2012 PSF yes + 3.2.4 3.2.3 2013 PSF yes 3.3.0 3.2 2012 PSF yes + 3.3.1 3.3.0 2013 PSF yes Footnotes: @@ -110,8 +112,8 @@ distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012 Python Software Foundation; All Rights Reserved" are retained in Python -alone or in any derivative version prepared by Licensee. +2011, 2012, 2013 Python Software Foundation; All Rights Reserved" are retained +in Python alone or in any derivative version prepared by Licensee. We use native python in disutils bbclass and this needs to peek into target sysroot when building plugins in cross environment. Otherwise anything that inherits distutils3.bbclass will not build. Fix host include contamination issue Let compiler append sysroot to include path if it can Fix the compiler invocation and linker flags when cross compiling The details are in patch header. This should fix the QA errors about host contamination Add virtual/libintl to dep list There is use of libintl.h but we dont express the dependency Add lzma dependency for python3-misc Fixes and from test-dependencies.sh run there is undeterministic lzma dependency: WARN: packages/armv5te-oe-linux-gnueabi/python3/python3-misc/latest lost dependency on liblzma Fix staging warnings due to duplicate install WARNING: The recipe python3 is trying to install files into a shared area when those files already exist. Those files and their manifest location are: builds/world/tmp/sysroots/qemux86-64/usr/include/python3.3m/pyconfig.h builds/world/tmp/sysroots/qemux86-64/usr/lib/libpython3.3m.so.1.0 builds/world/tmp/sysroots/qemux86-64/usr/lib/libpython3.3m.so builds/world/tmp/sysroots/qemux86-64/usr/lib/python3.3/config/Makefile Let compiler search includes relative to sysroot This makes it cross compilable and assumption on hardcoded paths is fixed. Errors like below would appear if ncursesw is installed on build host cc1: warning: include location "/usr/include/ncursesw" is unsafe for cross-compilation [-Wpoison-system-directories] (From OE-Core rev: 185fcfc3286b355394ae89300f22b8cb7aaa43c1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Fix linking not happening issue in modules We need to tweak CONFIGURE_LDFLAGS for python3 instead of LDFLAGS directly Add second compile stage which uses original makefile Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02distutils: Introduce PYTHON_ABI variableKhem Raj
In python3 this has to be taken care of, it defines a variable to denote ABI currently its at 'm' and it uses this to construct the directory names for installing the python headers and library names in sysroot. e.g. it will be something like ../python3.3m/... We need this information when we are using distutils to cross build python extentions and want to know the locations of python headers and libraries install locations (From OE-Core rev: 9a3e4ac4a4eeed64ec80d400130dff3d26daf336) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02classes: Add distutils for python3Khem Raj
In line with python2 add distutils and setuptools classes for handing python3 Use python-distribute instead of python-setuptools in setuptools bbclass Remove --single-version-externally-managed since its setuptools specific and we dont use it anymore Do build_ext as separate step during compile Add DISTUTILS_BUILD_EXT_ARGS for modules to pass flags to build_ext step in setup.py Add build_ext as sepate step during compile and add the cross sysrooted library and headers since we are cross compiling Use ${PYTHON_PN} in place of hardcoding python name Remove the /etc/share if its empty Since OE-Core times we now have machine specific sysroots for targets unlike before when we used arch specific sysroots so reflect that here Use MACHINE for sysroot when not building for build host Python's machinery replaces directories in sysroot path to match OE's staging area sysroots. Earlier we use to have HOST_SYS represent sysroot always but now we use MACHINE to represent target sysroots but HOST_SYS to represent host sysroot. This patch caters to that difference (From OE-Core rev: 8bb0206ed67228c88dd5bc2d8b36ce28f48b78f4) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02classes/distutils: Introduce PYTHON_PNKhem Raj
This is needed to accomodate python3 alongside python2 (From OE-Core rev: ae931c2cf9e48e1fb74b4b727dbf668ea880023f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02python3native.bbclass: Add python3 abstraction classKhem Raj
(From OE-Core rev: ead30aa5e3046f450ee688e14f6d5268d9ed0bd8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02python-3.3-manifest: Add python3 manifest fileKhem Raj
Like python2 mostly except This will package collections into python3-core instead of python3-misc fixes errors like Traceback (most recent call last): File "/usr/lib/python3.3/site.py", line 69, in import os File "/usr/lib/python3.3/os.py", line 659, in <module> from collections.abc import MutableMapping ImportError: No module named 'collections' (From OE-Core rev: e314404876e62c05c7ea5f5e79b2b05c3ed9ab84) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-18xz: Add nativesdk for Python3 nativesdk dependencySaul Wold
(From OE-Core rev: 41a8c1f5fc0b4601af8b5b8b08f641668a39550d) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-20uclibc: Upgrade to latest on gitKhem Raj
It brings fixes needed for python3 to work on uclibc/64bit targets (From OE-Core rev: 01777e78639888d437b103ebafefccd932631bfd) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09useradd: Use modern join syntaxRichard Purdie
string.join() is deprecated syntax and doesn't work under python3 so use the modern sytax instead. (From OE-Core rev: 402d652edf79bcfe1eaf1a3b55ad1177d1e3ee85) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09bitbake.conf: Use casting to ensure valid comparisionRichard Purdie
python3 is stricter about type comparisions so add an explicit cast to int() to ensure this code is portable. (From OE-Core rev: b9a1b9ad55c0f9fec082ffa37e576d8fd664becd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09sanity/patch.py: Remove commands module usageRichard Purdie
The commands module is removed in python3. Use the subprocess module instead and the pipes module to replace the mkargs usage. (From OE-Core rev: e2e1dcd74bc45381baccf507c0309dd792229afe) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09insane: Open file in binary modeRichard Purdie
We open the file we're writing to in binary mode so open the input stream with the same mode so things match. This avoids errors with python3. (From OE-Core rev: 4f47b3a4726dd47e8a6db228fcaf25d1890e3e52) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09meta/lib/oe: Replace StandardError with ExceptionRichard Purdie
StandardError is removed in python3, replace with Exception class instead. (From OE-Core rev: a37ae30b9766df346ca57755530024a0b7d5f86b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09buildstats: Update to ensure files are closedRichard Purdie
python3 doesn't like files being left open. This updates the code style to ensure file are closed. (From OE-Core rev: ec74285bd2108f12f33fc8ac0dc1d124ab48be21) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2010-07-16*: use print() as a functionBernhard Reutner-Fischer
to make python3 happy (Bitbake rev: c82926ccdd4ec4e3ad6e78a381dacb96adf9b409) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>