From 04dc263ffcea9be1adab851efed0226617985692 Mon Sep 17 00:00:00 2001
From: Aleksandr Vodianov <aleksandr.vodianov@demlabs.net>
Date: Fri, 28 Jan 2022 10:47:25 +0000
Subject: [PATCH] Hotfix 5526
---
linux/debian/essentials/postinst | 4 ++++
linux/debian/scripts/compile_and_pack.sh | 5 ++++-
linux/debian/scripts/deploy.sh | 5 +++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/linux/debian/essentials/postinst b/linux/debian/essentials/postinst
index 2f0aab9..56d89a4 100755
--- a/linux/debian/essentials/postinst
+++ b/linux/debian/essentials/postinst
@@ -12,6 +12,10 @@ DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
+#unpack PYTHON_ENV
+tar -C /opt/cellframe-node/etc/ -xf /opt/cellframe-node/etc/cpython.tar.xz
+rm /opt/cellframe-node/etc/cpython.tar.xz
+
# Check profile.d symlink
[ -e "/etc/profile.d/$DAP_APP_NAME.sh" ] || ln -sf $DAP_PREFIX/share/profile.d/$DAP_APP_NAME.sh /etc/profile.d/$DAP_APP_NAME.sh
diff --git a/linux/debian/scripts/compile_and_pack.sh b/linux/debian/scripts/compile_and_pack.sh
index 7f40ebf..6e3534a 100755
--- a/linux/debian/scripts/compile_and_pack.sh
+++ b/linux/debian/scripts/compile_and_pack.sh
@@ -32,6 +32,8 @@ tar xf $CONTROL
VERSION=$(cat control | grep Version | cut -d ':' -f2)
echo "Version is $VERSION"
sed -i "s/$VERSION/${VERSION}-${DISTR_CODENAME}/" control
+#fixed link with python libraries
+sed -i "s/libpython3.5 (>= 3.5.0~b1)/libpython3-dev/" control
rm $CONTROL && tar zcf $CONTROL *
ar r ../$DEBNAME $CONTROL
cd ..
@@ -62,10 +64,11 @@ if [[ $ARCH_VERSION == "arm" ]]; then
fi
if [[ $ARCH_VERSION == "amd64" ]]; then
+ sed -i 's/#set(BUILD_WITH_PYTHON_ENV ON)/set(BUILD_WITH_PYTHON_ENV ON)/' ../CMakeLists.txt || error=$?
+
sed -i 's/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread z util expat )/' ../CMakeLists.txt || error=$?cd
${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \
&& ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
-
sed -ibak 's/#set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/' ../CMakeLists.txt || error=$?
${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \
&& ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
diff --git a/linux/debian/scripts/deploy.sh b/linux/debian/scripts/deploy.sh
index e2abdfa..e4ace1b 100755
--- a/linux/debian/scripts/deploy.sh
+++ b/linux/debian/scripts/deploy.sh
@@ -3,10 +3,9 @@
echo "Deploying to $PACKAGE_PATH"
echo $wd
-CELLFRAME_REPO_CREDS="admin@debian.pub.demlabs.net"
CELLFRAME_REPO_KEY="~/.ssh/demlabs_publish"
-CELLFRAME_REPO_PATH="~/web/debian.pub.demlabs.net/public_html"
REPO_PORT=34768
+CELLFRAME_PUB_REPO_CREDS="admin@debian.pub.demlabs.net"
CELLFRAME_PUB_CREDS="admin@pub.cellframe.net"
CELLFRAME_PUB_PATH="~/web/pub.cellframe.net/public_html/linux"
CELLFRAME_PVT_CREDS="admin@pvt.demlabs.net"
@@ -24,9 +23,11 @@ for pkgfile in $PKGFILES; do
if [[ $(echo $pkgfile | grep "pgsql") == "" ]]; then
CELLFRAME_FILESERVER_CREDS=$CELLFRAME_PUB_CREDS
CELLFRAME_FILESERVER_PATH=$CELLFRAME_PUB_PATH
+ CELLFRAME_REPO_CREDS=$CELLFRAME_PUB_REPO_CREDS
else
CELLFRAME_FILESERVER_CREDS=$CELLFRAME_PVT_CREDS
CELLFRAME_FILESERVER_PATH=$CELLFRAME_PVT_PATH
+ CELLFRAME_REPO_CREDS=$CELLFRAME_PVT_CREDS
fi
pkgname=$(echo $pkgfile | sed 's/.deb$//')
pkgname_public=$(echo $pkgname | cut -d '-' -f1-4,7,9-) #cutting away Debian-9.12
--
GitLab