From: Nadav Har'El <n...@scylladb.com>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master
python2x: also copy stuff from /usr/lib64
On Fedora 28, there is both /usr/lib/python2.7 and /usr/lib64/python2.7,
and stuff from both directories need to be copied to the image to work.
So change the script to loop over
${PYTHON_PREFIX_DIR}/lib*/python${PYTHON_VERSION}/
instead of just the one directory
${PYTHON_PREFIX_DIR}/lib/python${PYTHON_VERSION}/
All these files are copied by the current script into one directory, /lib.
This seems to be fine also on Fedora 28 - it finds the files even though
they are in the wrong directory - so I didn't change this aspect of the
script.
Signed-off-by: Nadav Har'El <n...@scylladb.com>
---
diff --git a/python2x/GET b/python2x/GET
--- a/python2x/GET
+++ b/python2x/GET
@@ -35,9 +35,11 @@ mkdir -p "$ROOTFS/lib/python${PYTHON_VERSION}"
cp build/python.so "$ROOTFS"
install_shlibs
-PY_LIB1="${PYTHON_PREFIX_DIR}/lib/python${PYTHON_VERSION}/"
-rsync -a $PY_LIB1 $ROOTFS/lib/python${PYTHON_VERSION}/ --safe-links
--exclude test --exclude unittest \
+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'
+done
SHLIBS_COUNT4=`install_shlibs`
echo "Python SHLIBS_COUNT4=$SHLIBS_COUNT4"
--
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.
