From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Feb 2021 19:12:16 +0000 (-0600)
Subject: cpatch: python 3.6 -> 3.8
X-Git-Tag: v17.1.0~3088^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a1ce980d6d59b6736b16912ab0b0337ceef08a9;p=ceph.git

cpatch: python 3.6 -> 3.8

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/script/cpatch b/src/script/cpatch
index 1618115a62f0a..3372ef3a23f32 100755
--- a/src/script/cpatch
+++ b/src/script/cpatch
@@ -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