Skip to content
Snippets Groups Projects
Commit 6a5eef44 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Merge branch 'master' of gitlab.demlabs.net:cellframe/cellframe-node into bugs-4158 

Keep up-to-date
parents b6cd9fb9 f6788f4e
No related branches found
No related tags found
4 merge requests!169features-4402,!168Bugs-4158,!167Bugs-4158,!164bugs-4158
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ 6a5eef44
...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11) ...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 3) SET( CPACK_PACKAGE_VERSION_MAJOR 3)
SET( CPACK_PACKAGE_VERSION_MINOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 5)
SET( CPACK_PACKAGE_VERSION_PATCH 9) SET( CPACK_PACKAGE_VERSION_PATCH 14)
# init CellFrame SDK # init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
prod_build/general/chroot_wrap.sh
+ 1
− 2
View file @ 6a5eef44
...@@ -5,8 +5,7 @@ CHROOT_PREFIX="builder" ...@@ -5,8 +5,7 @@ CHROOT_PREFIX="builder"
CHROOTS_PATH=$1 CHROOTS_PATH=$1
PLATFORMS="" PLATFORMS=""
PKG_FORMAT=$3 PKG_FORMAT=$3
SRC_PATH=$4 JOB=$4
JOB=$5
cd $SRC_PATH cd $SRC_PATH
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment