diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dc60ba58018c1b4976777158f770581f8fe67d4..6c86d67efc4941a05ce82cf3b47b886e10d2cc34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ option(ADD_UPDATER OFF) # endif() #endif() -if(!LINUX) +if(LINUX) set(BUILD_WITH_PYTHON_ENV ON) set(SUPPORT_PYTHON_PLUGINS ON) endif() @@ -398,7 +398,11 @@ else() INSTALL(FILES ${cpython310static_SOURCE_DIR}/bin/python3.10 DESTINATION ${CMAKE_INSTALL_PREFIX}/python/bin/ ) - + #install python-modules + INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycfhelpers DESTINATION ${CMAKE_INSTALL_PREFIX}/python/lib/python3.10/site-packages USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycftools DESTINATION ${CMAKE_INSTALL_PREFIX}/python/lib/python3.10/site-packages USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY python-cellframe/dists/interfaces DESTINATION ${CMAKE_INSTALL_PREFIX}/python/lib/ USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY ${cpython310static_SOURCE_DIR}/lib/python3.10 DESTINATION ${CMAKE_INSTALL_PREFIX}/python/lib/ USE_SOURCE_PERMISSIONS) endif() endif() diff --git a/cellframe-sdk b/cellframe-sdk index df7e4904d3dd9b54b501cae2b951b9ba241b659d..a5207725ff899296d13cf46e23b7aaf2bbbc4cc5 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit df7e4904d3dd9b54b501cae2b951b9ba241b659d +Subproject commit a5207725ff899296d13cf46e23b7aaf2bbbc4cc5 diff --git a/os/debian/prerm b/os/debian/prerm index b961ff4342a99fd228b18e4b50983163fc3ef8a7..fa56432066a6c99d173a5509bbd63e8dcaa2ab6c 100755 --- a/os/debian/prerm +++ b/os/debian/prerm @@ -14,6 +14,8 @@ case "$1" in upgrade) echo "[*] Stopping cellframe-node.service" systemctl stop cellframe-node || true + echo "[*] Stopping cellframe-diagtool.service" + systemctl stop cellframe-diagtool || true ;; failed-upgrade) diff --git a/python-cellframe b/python-cellframe index 376796fa5ae49e8bb7587ef53de66d17106e9370..cfe6e54416f0d0821a3493a0fc731795cbc826bb 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 376796fa5ae49e8bb7587ef53de66d17106e9370 +Subproject commit cfe6e54416f0d0821a3493a0fc731795cbc826bb diff --git a/version.mk b/version.mk index 84990b32fa95050b397ab6f45e13e77d1c223577..7e49db77255f324ea4d968cde6c54d4d4d183f81 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ VERSION_MAJOR=5 VERSION_MINOR=3 -VERSION_PATCH=119 +VERSION_PATCH=120