]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cpatch: python 3.6 -> 3.8 39212/head
authorSage Weil <sage@newdream.net>
Mon, 1 Feb 2021 19:12:16 +0000 (13:12 -0600)
committerSage Weil <sage@newdream.net>
Mon, 1 Feb 2021 21:52:14 +0000 (15:52 -0600)
Signed-off-by: Sage Weil <sage@newdream.net>
src/script/cpatch

index 1618115a62f0af532eaf77cc44e1a802e8b5fd6b..3372ef3a23f32a9965056c867715ed1b2e640317 100755 (executable)
@@ -134,15 +134,15 @@ if [ $py -eq 1 ] || [ $all -eq 1 ]; then
     # Exclude node_modules because it's the huge sources in dashboard/frontend
     tar --exclude=node_modules --exclude=tests --exclude-backups -cf $TMP/python_common.tar *
     popd > /dev/null
-    dockerfile+=$'ADD python_common.tar /usr/lib/python3.6/site-packages\n'
+    dockerfile+=$'ADD python_common.tar /usr/lib/python3.8/site-packages\n'
 
     pushd lib/cython_modules/lib.3
-    CYTHONLIBS="*.cpython-36m*.so"
+    CYTHONLIBS="*.cpython-38*.so"
     mkdir -p $TMP/cythonlib
     for f in $CYTHONLIBS; do cp $f $TMP/cythonlib ; done
     [ $strip -eq 1 ] && strip $TMP/cythonlib/*
     popd > /dev/null
-    dockerfile+=$'ADD cythonlib /usr/lib64/python3.6/site-packages\n'
+    dockerfile+=$'ADD cythonlib /usr/lib64/python3.8/site-packages\n'
 
     # cephadm
     pushd ../src/cephadm > /dev/null