Skip to content
Snippets Groups Projects
Commit 04dc263f authored by Aleksandr Vodianov's avatar Aleksandr Vodianov Committed by Roman Khlopkov
Browse files

Hotfix 5526

parent 5abd5d23
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,10 @@ DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg" ...@@ -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 # 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 [ -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
......
...@@ -32,6 +32,8 @@ tar xf $CONTROL ...@@ -32,6 +32,8 @@ tar xf $CONTROL
VERSION=$(cat control | grep Version | cut -d ':' -f2) VERSION=$(cat control | grep Version | cut -d ':' -f2)
echo "Version is $VERSION" echo "Version is $VERSION"
sed -i "s/$VERSION/${VERSION}-${DISTR_CODENAME}/" control 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 * rm $CONTROL && tar zcf $CONTROL *
ar r ../$DEBNAME $CONTROL ar r ../$DEBNAME $CONTROL
cd .. cd ..
...@@ -62,10 +64,11 @@ if [[ $ARCH_VERSION == "arm" ]]; then ...@@ -62,10 +64,11 @@ if [[ $ARCH_VERSION == "arm" ]]; then
fi fi
if [[ $ARCH_VERSION == "amd64" ]]; then 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 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 ../ && 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=$? && ${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=$? 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 ../ && 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=$? && ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
......
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
echo "Deploying to $PACKAGE_PATH" echo "Deploying to $PACKAGE_PATH"
echo $wd echo $wd
CELLFRAME_REPO_CREDS="admin@debian.pub.demlabs.net"
CELLFRAME_REPO_KEY="~/.ssh/demlabs_publish" CELLFRAME_REPO_KEY="~/.ssh/demlabs_publish"
CELLFRAME_REPO_PATH="~/web/debian.pub.demlabs.net/public_html"
REPO_PORT=34768 REPO_PORT=34768
CELLFRAME_PUB_REPO_CREDS="admin@debian.pub.demlabs.net"
CELLFRAME_PUB_CREDS="admin@pub.cellframe.net" CELLFRAME_PUB_CREDS="admin@pub.cellframe.net"
CELLFRAME_PUB_PATH="~/web/pub.cellframe.net/public_html/linux" CELLFRAME_PUB_PATH="~/web/pub.cellframe.net/public_html/linux"
CELLFRAME_PVT_CREDS="admin@pvt.demlabs.net" CELLFRAME_PVT_CREDS="admin@pvt.demlabs.net"
...@@ -24,9 +23,11 @@ for pkgfile in $PKGFILES; do ...@@ -24,9 +23,11 @@ for pkgfile in $PKGFILES; do
if [[ $(echo $pkgfile | grep "pgsql") == "" ]]; then if [[ $(echo $pkgfile | grep "pgsql") == "" ]]; then
CELLFRAME_FILESERVER_CREDS=$CELLFRAME_PUB_CREDS CELLFRAME_FILESERVER_CREDS=$CELLFRAME_PUB_CREDS
CELLFRAME_FILESERVER_PATH=$CELLFRAME_PUB_PATH CELLFRAME_FILESERVER_PATH=$CELLFRAME_PUB_PATH
CELLFRAME_REPO_CREDS=$CELLFRAME_PUB_REPO_CREDS
else else
CELLFRAME_FILESERVER_CREDS=$CELLFRAME_PVT_CREDS CELLFRAME_FILESERVER_CREDS=$CELLFRAME_PVT_CREDS
CELLFRAME_FILESERVER_PATH=$CELLFRAME_PVT_PATH CELLFRAME_FILESERVER_PATH=$CELLFRAME_PVT_PATH
CELLFRAME_REPO_CREDS=$CELLFRAME_PVT_CREDS
fi fi
pkgname=$(echo $pkgfile | sed 's/.deb$//') pkgname=$(echo $pkgfile | sed 's/.deb$//')
pkgname_public=$(echo $pkgname | cut -d '-' -f1-4,7,9-) #cutting away Debian-9.12 pkgname_public=$(echo $pkgname | cut -d '-' -f1-4,7,9-) #cutting away Debian-9.12
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment