[oe-commits] Yasir-Khan : python-native: disable user site support

git at git.openembedded.org git at git.openembedded.org
Wed Sep 10 10:34:11 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: c448bf3629ab5d930ed845d4ba48e37e4a85d2a3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c448bf3629ab5d930ed845d4ba48e37e4a85d2a3

Author: Yasir-Khan <yasir_khan at mentor.com>
Date:   Mon Sep  8 12:58:41 2014 +0100

python-native: disable user site support

The user site-packages gets inserted into sys.path ahead of the
system site directories, so a site package installed there will
be used in preference to what's in our sysroot, causing less
deterministic builds, and potential build breakage, depending
on what the user has installed there. Disable it for our native
python, so they don't affect our builds.

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Yasir-Khan <yasir_khan at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/python/python-native_2.7.3.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 827654d..e55f5fe 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -58,4 +58,8 @@ do_install() {
 	# (these often end up too long for the #! parser in the kernel as the
 	# buffer is 128 bytes long).
 	ln -s python-native/python ${D}${bindir}/nativepython
+	
+	# We don't want modules in ~/.local being used in preference to those
+	# installed in the native sysroot, so disable user site support.
+	sed -i -e 's,^\(ENABLE_USER_SITE = \).*,\1False,' ${D}${libdir}/python${PYTHON_MAJMIN}/site.py
 }



More information about the Openembedded-commits mailing list