From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master

Blacklist python2x and python3x site-packages and dist-packages

This patch filters out files from site-packages and dist-packages python
installation subdirectories as they interfere and cause crash
on OSv.

Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>

---
diff --git a/python2x/GET b/python2x/GET
--- a/python2x/GET
+++ b/python2x/GET
@@ -38,7 +38,7 @@ install_shlibs
 for dir in ${PYTHON_PREFIX_DIR}/lib*/python${PYTHON_VERSION}/
 do
rsync -a "$dir" $ROOTFS/lib/python${PYTHON_VERSION}/ --safe-links --exclude test --exclude unittest \
-    --exclude '*.pyc' --exclude '*.pyo' --exclude '*.egg-info'
+ --exclude '*.pyc' --exclude '*.pyo' --exclude '*.egg-info' --exclude 'site-packages' --exclude 'dist-packages'
 done

 SHLIBS_COUNT4=`install_shlibs`
diff --git a/python2x/README b/python2x/README
--- a/python2x/README
+++ b/python2x/README
@@ -1,5 +1,5 @@
 This app builds an image containing the already-compiled Python shared
-object for Python 2.x (libpython2.7.so for example) installed on the build macine, +object for Python 2.x (libpython2.7.so for example) installed on the build machine,
 and some of the required libraries from the build machine.

 In order to build this app you need to have Python development package
@@ -10,6 +10,8 @@ sudo dnf install python-devel   # On Fedora
 The python home directory is assumed to be installed under
 <sys.prefix>/lib/python<sys.version_info.major>.<sys.version_info.minor>/
 where sys is Python package this script reads the sys.* values from.
+Please note that any extra modules found under site-packages or dist-packages
+directories are filtered out from the image.

 Example usage:

diff --git a/python3x/GET b/python3x/GET
--- a/python3x/GET
+++ b/python3x/GET
@@ -38,7 +38,7 @@ install_shlibs
 for dir in ${PYTHON_PREFIX_DIR}/lib*/python${PYTHON_VERSION}/
 do
rsync -a "$dir" $ROOTFS/lib/python${PYTHON_VERSION}/ --safe-links --exclude test --exclude unittest \
-    --exclude '*.pyc' --exclude '*.pyo' --exclude '*.egg-info'
+ --exclude '*.pyc' --exclude '*.pyo' --exclude '*.egg-info' --exclude 'site-packages' --exclude 'dist-packages'
 done

 SHLIBS_COUNT4=`install_shlibs`
diff --git a/python3x/README b/python3x/README
--- a/python3x/README
+++ b/python3x/README
@@ -1,5 +1,5 @@
 This app builds an image containing the already-compiled Python shared
-object for Python 3.x (libpython3.7.so for example) installed on the build macine, +object for Python 3.x (libpython3.7.so for example) installed on the build machine,
 and some of the required libraries from the build machine.

 In order to build this app you need to have Python development package
@@ -9,7 +9,9 @@ sudo dnf install python3-devel   # On Fedora

 The python home directory is assumed to be installed under
 <sys.prefix>/lib/python<sys.version_info.major>.<sys.version_info.minor>/
-where sys is Python package this script reads the sys.* values from.
+where sys is Python package this script reads the sys.* values from. Please
+note that any extra modules found under site-packages or dist-packages
+directories are filtered out from the image.

 Example usage:

--
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to