]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
src/script/cpatch: include cython libs and cephadm
authorJosh Durgin <jdurgin@redhat.com>
Sat, 4 Apr 2020 00:32:32 +0000 (20:32 -0400)
committerSage Weil <sage@redhat.com>
Fri, 17 Apr 2020 22:05:44 +0000 (18:05 -0400)
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
src/script/cpatch

index b780a1f0440d31979bc94a22bb6df7d9bf5f5d26..53ede05ec281377f6288f0d69009cc8366693da1 100755 (executable)
@@ -135,6 +135,20 @@ if [ $py -eq 1 ] || [ $all -eq 1 ]; then
     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'
+
+    pushd lib/cython_modules/lib.3
+    CYTHONLIBS="*.cpython-36m*.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'
+
+    # cephadm
+    pushd ../src/cephadm > /dev/null
+    cp cephadm $TMP/cephadm
+    dockerfile+=$'ADD cephadm /usr/sbin/cephadm\n'
+    popd > /dev/null
 fi
 
 if [ $core -eq 1 ] || [ $all -eq 1 ]; then