python3-native: Fix pip install issue due to unclean build directory
When installing python3-native sometimes pips default build directory (which is on the host and is user dependant) is left unclean, due to this, when python3-core is being installed it tries to use the same directory producing an error, this explicitly removes what the previous installation might have left behind, fixing the issue. (From OE-Core rev: c27a5a9ba649e7fcf681f6ac4575442e252fd29b) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
528a256545
commit
0be72c2fb5
|
@ -26,6 +26,7 @@ file://makerace.patch \
|
|||
${DISTRO_SRC_URI} \
|
||||
file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
|
||||
file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
|
||||
file://pip_build_directory_unclean.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "36fc7327c02c6f12fa24fc9ba78039e3"
|
||||
SRC_URI[sha256sum] = "1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def"
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
Index: Python-3.4.2/Lib/ensurepip/__init__.py
|
||||
===================================================================
|
||||
--- Python-3.4.2.orig/Lib/ensurepip/__init__.py
|
||||
+++ Python-3.4.2/Lib/ensurepip/__init__.py
|
||||
@@ -3,6 +3,7 @@ import os.path
|
||||
import pkgutil
|
||||
import sys
|
||||
import tempfile
|
||||
+import pwd
|
||||
|
||||
|
||||
__all__ = ["version", "bootstrap"]
|
||||
@@ -36,6 +37,15 @@ def _run_pip(args, additional_paths=None
|
||||
if additional_paths is not None:
|
||||
sys.path = additional_paths + sys.path
|
||||
|
||||
+ # Explicitly make sure pip build directory was left clean
|
||||
+ user = pwd.getpwuid(os.getuid())[0]
|
||||
+ if os.path.exists("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt"):
|
||||
+ os.remove("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt")
|
||||
+ try:
|
||||
+ os.rmdir("/tmp/pip_build_" + user + "/")
|
||||
+ except OSError:
|
||||
+ print("Error: Pip build directory (%s) was left unclean, make sure it is clean before continuing\n" % ("/tmp/pip_build_" + user + "/"))
|
||||
+
|
||||
# Install the bundled software
|
||||
import pip
|
||||
pip.main(args)
|
Loading…
Reference in New Issue