From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 4 Apr 2020 00:32:32 +0000 (-0400)
Subject: src/script/cpatch: include cython libs and cephadm
X-Git-Tag: v16.1.0~2537^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d5c6b6cc081737395dd4a1f34535ea796097618;p=ceph.git

src/script/cpatch: include cython libs and cephadm

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/script/cpatch b/src/script/cpatch
index b780a1f0440..53ede05ec28 100755
--- a/src/script/cpatch
+++ b/src/script/cpatch
@@ -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