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)
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>
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)
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>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A remote user can send specially crafted data to trigger a buffer overflow
in socket.recvfrom_into() and execute arbitrary code on the target system.
The code will run with the privileges of the target service.
This back-ported patch fixes CVE-2014-1912
(From OE-Core rev: 344049ccfa59ae489c35fe0fb7592f7d34720b51)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport two patches from upstream:
use new readline function types (closes#20374)
Issue #20374: Avoid compiler warnings when compiling readline with libedit.
[YOCTO #6107]
(From OE-Core rev: a6b91ae7dec2edebc0eaea0592c42b1c455ad4d7)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
The multiprocessing module needs the mmap module. We got away with not
having this for the build appliance because python-mmap was added to
packagegroup-self-hosted, but this is the proper place to have it.
(From OE-Core rev: 1c031c627a362b3f18ffa2e9caeb6cfb299b9948)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building python-numpy for qemumips or qemuppc, the following error
appeared.
cp: cannot stat `xxx/python-numpy/1.7.0-r1/*config.h': No such file or directory
This is because for qemumips or qemuppc, there are no such files in SRC_URI.
This patch fixes this compiling error by adding necessary files to the SRC_URI.
(From OE-Core rev: 15582a25f964e53d28ca0b5c94df3a803c366fed)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python-native doesn't use sitecustomize.py and there is another
duplicated one in meta/recipes-devtools/python/python.
(From OE-Core rev: 591d488bb4600daf586385311505083e9eb227d5)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.
This doesn't introduce any change in behaviour in its own right.
(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
This back ported patch fixes CVE-2013-1752 for smtplib
(From OE-Core rev: 4af111e94edc93657c94de6b584c099571b4cf40)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Reviewed-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Completes previous commit b5292d4115a4555a66b5e35acdc67dd71fb8577f.
Updates SUMMARY[doc] (meta/conf/documentation.conf).
Changes:
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line
Note: don't bump PR
(From OE-Core rev: ad17dfd31a2b97b3e610a0ea0889f5ecb2a63b97)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The virtclass overrides will go away at some point (apart from the multilib one).
Change them all to class-xxx instead since people enjoy copy and pasting them.
(From OE-Core rev: d1c073d2813bd913617990cd047507353ea0c09e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The original patch added in OE-Core commit
bdf07b1698d228dc7ff555199a269b1ff8ceca19 was supposed to ignore
conflicts, but it was unable to do so because it wasn't raising errors
in the right place. When the --attempt option is used (as is done in
complementary package installation for RPM), raise errors immediately
on conflicts, catch errors at the right point so that requested packages
and their dependencies can be ignored, and print appropriate warnings
when doing so.
Fixes [YOCTO #5313].
(From OE-Core rev: 210a426584b77ad2331332059af85bb9f4e2081f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changes:
* Refreshed no-static-link.patch;
* LGPL&MIT license files changed names;
* MIT license file added a contributor to the list;
* README.rst license snippet changed to reflect the filename changes
and the new contributor;
(From OE-Core rev: b5b4898cd409036161c62891e9618d9ab3f891f9)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use python-distribute-native in packagegroup-toolset-native
Also fixes warnings like
WARNING: The recipe python-setuptools is trying to install files into a
shared area when those files already exist. Those files and their
manifest location are:
/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/setuptools.pth
Matched in manifest-qemux86-64-python-distribute
/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/site.pyc
Matched in manifest-qemux86-64-python-distribute
/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/site.py
Matched in manifest-qemux86-64-python-distribute
Conflicts:
meta/recipes-devtools/python/python-setuptools_1.4.bb
(From OE-Core rev: ddb0c70a7d4d51a1f404c194a562325137222146)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
So it can get the correct python direcotries for python2
(From OE-Core rev: cfc780ec26474a61bd52a8f6a66c7280fa12a075)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
The build process hard-codes searches of various directories in /usr when
looking for libraries, delete this to avoid host contamination.
(From OE-Core rev: 9febe2d184ef76b7cacace15cbe17968e8c37617)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Nose is installed as an Egg by default which we don't want, so change the
inherit to setuptools from distutils to disable the eggification.
(From OE-Core rev: 47a07c42f5f67dcf69f844531f7a527029e6280e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python-numpy is needed for Piglit. This recipe is taken directly from meta-oe.
(From OE-Core rev: 9bf355cceaec6ebacdcbcc35f9713ff73e1c85da)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python-nose is a build dependecy for python-numpy, needed for Piglit. This
recipe is taken directly from meta-oe.
(From OE-Core rev: 6b0c3e9955292d2ea13c6871c686824cd04150f1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python-mako is needed for Piglit. This recipe is taken from meta-oe, and
upgraded to the latest upstream version.
Checksums updated as the upstream LICENSE file contains the copyright dates.
(From OE-Core rev: 1ad759508d834f3bcb3bb8542ae2012a2b6ef2e0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bluetooth.h is autodetected from sysroot and influences 2 python files:
/usr/include/python2.7/pyconfig-32.h
/usr/lib/python2.7/lib-dynload/_socket.so
* it doesn't link with bluez, so it wasn't detected by
test-dependencies.sh, but still causes undeterministic builds and
should be fixed
* we can use PACKAGECONFIG, but I don't expect many people to use bt
support in python-socket
(From OE-Core rev: 46fc4d6b7c17e19088917ec46234bafc76f5655f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The -with-cxx changed to with-cxx-main sometime around the 2.5 time frame
It appears that there never was a with-cyclic-gc configure option, or if
there was it was from some past patch we no longer have.
(From OE-Core rev: 3bfadeb3d86dc2b51525b7650567c42df0d0abcb)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These recipes all had a long DESCRIPTION but no SUMMARY; since the
SUMMARY is often displayed alone by package managers and the default
value ("${PN} version ${PV}") isn't particularly useful, we should
always try to set SUMMARY.
(From OE-Core rev: db02edd2e9d7645592933cbb25ea0ca4d6561392)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.
(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Take a patch from the Pillow "friendly fork" to fix compilation with Freetype
2.5.1.
(From OE-Core rev: bedaf81dc045c4b222cdf586a4ec901c4e1d08f8)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After installing python-unittest, the following errors occur when executing
"import unittest" from a python commandline:
ImportError: No module named StringIO
ImportError: No module named pprint
ImportError: No module named difflib
ImportError: No module named pprint
ImportError: No module named fnmatch
Fix this by adding the missing dependencies to the generator script and run
the generator.
(From OE-Core rev: 496adfe84ef05d031444988d41451a018133f5a8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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: 54da47f3ddc1c009594744793060ffd09db3ad11)
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Python recipe did a sed s/ccache/$(CCACHE) on the Makefile, which
replaces all "ccache" including ones that consist of a full path.
This leads to build error when building in a project path with
"ccache" in its name. Fix it by only replacing "ccache " with
"$(CCACHE) ".
(From OE-Core rev: 1181112cf65bc0186807fc59399c5dddcb9f9449)
Signed-off-by: Lei Liu <lei.liu2@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The run-ptest contained in python uses a Makefile. The path of the
Makefile is changed to ${libdir}/python/ptest in do_install_ptest.
However, the directory is wrong when the project is configured with
"--enable-multilib=lib32"
In addition, do_install_ptest is defined before "inherit ptest", so
it is overriden by the one in ptest.bbclass. do_install_ptest is
moved down.
(From OE-Core rev: 0eb947454e1c92467283e6f1adeca67c7c57698b)
Signed-off-by: Zhangle Yang <zhangle.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Refreshed no-static-link.patch to work with this release and changed the
lines/checksum (and the file) where the license can be found.
(From OE-Core rev: beaa98867954898f75c8a0987218a2caffb8daba)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The license line moved to another line.
(From OE-Core rev: 8712d24a6f3d687786eca770b7072bbc38ff88aa)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
At the start of install, python swizzles the makefiles around, leading
to chunks of do_compile running again. These race against the install
target, leading to errors if pieces are being recompiled whilst others
are being installed.
For now, workaround this by running the compile target with the new
makefile, then running install ensuring a parallel make race doesn't
happen.
(From OE-Core rev: 72938a8631cfe5be5ac88ad67f2db595e2487e86)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is a "File name too long" error when len(TMPDIR) = 410, this is
because the function getLocalPath() converts the filepath into the
filename, so there would be the error when len(filename)
> NAME_MAX, truncate the filename to meet NAME_MAX will fix the problem.
[YOCTO #5201]
(From OE-Core rev: 9f0427edee6bf62d3fe7cdceb07f59a5776c8c4f)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
