Verified Commit 26b37482 authored by Roman Ondráček's avatar Roman Ondráček
Browse files

iqrf-gateway-daemon: update version to 2.3.6


Signed-off-by: Roman Ondráček's avatarRoman Ondráček <ondracek.roman@centrum.cz>
parent fa179934
...@@ -24,7 +24,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ...@@ -24,7 +24,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a65905..12af75f 100644 index 2a65905..12af75f 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -2,6 +2,13 @@ cmake_minimum_required(VERSION 3.0) @@ -17,6 +17,13 @@ cmake_minimum_required(VERSION 3.0)
project(iqrf-gateway-daemon) project(iqrf-gateway-daemon)
...@@ -38,7 +38,7 @@ index 2a65905..12af75f 100644 ...@@ -38,7 +38,7 @@ index 2a65905..12af75f 100644
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -81,13 +88,28 @@ endif() @@ -96,13 +103,28 @@ endif()
set_directory_properties(PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG>) set_directory_properties(PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG>)
...@@ -74,8 +74,8 @@ diff --git a/buildMake.sh b/buildMake.sh ...@@ -74,8 +74,8 @@ diff --git a/buildMake.sh b/buildMake.sh
index a8ccb37..31223dc 100755 index a8ccb37..31223dc 100755
--- a/buildMake.sh --- a/buildMake.sh
+++ b/buildMake.sh +++ b/buildMake.sh
@@ -1,12 +1,14 @@ @@ -17,12 +17,14 @@
#!/bin/bash
# Script for building IQRF daemon on Linux machine # Script for building IQRF daemon on Linux machine
+rm -rf build +rm -rf build
...@@ -90,18 +90,18 @@ index a8ccb37..31223dc 100755 ...@@ -90,18 +90,18 @@ index a8ccb37..31223dc 100755
LIB_DIRECTORY=.. LIB_DIRECTORY=..
currentdir=$PWD currentdir=$PWD
@@ -14,24 +16,14 @@ builddir=./${buildexp} @@ -29,24 +31,14 @@ builddir=./${buildexp}
mkdir -p ${builddir} mkdir -p ${builddir}
-#get path to shape libs -#get path to shape libs
-shape=../../shape/${buildexp} -shape=../shape/${buildexp}
-pushd ${shape} -pushd ${shape}
-shape=$PWD -shape=$PWD
-popd -popd
- -
-#get path to shapeware libs -#get path to shapeware libs
-shapeware=../../shapeware/${buildexp} -shapeware=../shapeware/${buildexp}
-pushd ${shapeware} -pushd ${shapeware}
-shapeware=$PWD -shapeware=$PWD
-popd -popd
...@@ -335,7 +335,7 @@ diff --git a/src/BufferedMqttMessaging/CMakeLists.txt b/src/BufferedMqttMessagin ...@@ -335,7 +335,7 @@ diff --git a/src/BufferedMqttMessaging/CMakeLists.txt b/src/BufferedMqttMessagin
index c928c00..998989b 100644 index c928c00..998989b 100644
--- a/src/BufferedMqttMessaging/CMakeLists.txt --- a/src/BufferedMqttMessaging/CMakeLists.txt
+++ b/src/BufferedMqttMessaging/CMakeLists.txt +++ b/src/BufferedMqttMessaging/CMakeLists.txt
@@ -1,6 +1,6 @@ @@ -16,6 +6,6 @@
project(BufferedMqttMessaging) project(BufferedMqttMessaging)
-FIND_PACKAGE(shapeware REQUIRED) -FIND_PACKAGE(shapeware REQUIRED)
...@@ -347,7 +347,7 @@ diff --git a/src/JsCache/CMakeLists.txt b/src/JsCache/CMakeLists.txt ...@@ -347,7 +347,7 @@ diff --git a/src/JsCache/CMakeLists.txt b/src/JsCache/CMakeLists.txt
index f466cf2..f50dfb6 100644 index f466cf2..f50dfb6 100644
--- a/src/JsCache/CMakeLists.txt --- a/src/JsCache/CMakeLists.txt
+++ b/src/JsCache/CMakeLists.txt +++ b/src/JsCache/CMakeLists.txt
@@ -3,7 +3,7 @@ project(JsCache) @@ -18,7 +18,7 @@ project(JsCache)
find_package(Boost REQUIRED COMPONENTS filesystem ) find_package(Boost REQUIRED COMPONENTS filesystem )
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
find_package(LIBZIP REQUIRED) find_package(LIBZIP REQUIRED)
...@@ -360,7 +360,7 @@ diff --git a/src/MonitorService/CMakeLists.txt b/src/MonitorService/CMakeLists.t ...@@ -360,7 +360,7 @@ diff --git a/src/MonitorService/CMakeLists.txt b/src/MonitorService/CMakeLists.t
index 8a3ea14..5d766d7 100644 index 8a3ea14..5d766d7 100644
--- a/src/MonitorService/CMakeLists.txt --- a/src/MonitorService/CMakeLists.txt
+++ b/src/MonitorService/CMakeLists.txt +++ b/src/MonitorService/CMakeLists.txt
@@ -1,7 +1,5 @@ @@ -16,7 +16,5 @@
project(MonitorService) project(MonitorService)
-FIND_PACKAGE(shapeware REQUIRED) -FIND_PACKAGE(shapeware REQUIRED)
...@@ -372,7 +372,7 @@ diff --git a/src/SchedulerMessaging/CMakeLists.txt b/src/SchedulerMessaging/CMak ...@@ -372,7 +372,7 @@ diff --git a/src/SchedulerMessaging/CMakeLists.txt b/src/SchedulerMessaging/CMak
index 9ca2983..3602d27 100644 index 9ca2983..3602d27 100644
--- a/src/SchedulerMessaging/CMakeLists.txt --- a/src/SchedulerMessaging/CMakeLists.txt
+++ b/src/SchedulerMessaging/CMakeLists.txt +++ b/src/SchedulerMessaging/CMakeLists.txt
@@ -1,7 +1,5 @@ @@ -16,7 +16,5 @@
project(SchedulerMessaging) project(SchedulerMessaging)
-FIND_PACKAGE(shapeware REQUIRED) -FIND_PACKAGE(shapeware REQUIRED)
...@@ -384,7 +384,7 @@ diff --git a/src/WebsocketMessaging/CMakeLists.txt b/src/WebsocketMessaging/CMak ...@@ -384,7 +384,7 @@ diff --git a/src/WebsocketMessaging/CMakeLists.txt b/src/WebsocketMessaging/CMak
index e35de5e..020e027 100644 index e35de5e..020e027 100644
--- a/src/WebsocketMessaging/CMakeLists.txt --- a/src/WebsocketMessaging/CMakeLists.txt
+++ b/src/WebsocketMessaging/CMakeLists.txt +++ b/src/WebsocketMessaging/CMakeLists.txt
@@ -1,6 +1,6 @@ @@ -16,6 +16,6 @@
project(WebsocketMessaging) project(WebsocketMessaging)
-FIND_PACKAGE(shapeware REQUIRED) -FIND_PACKAGE(shapeware REQUIRED)
......
[Unit] [Unit]
Description=IQRF Gateway Daemon Description=IQRF Gateway Daemon
Documentation=man:iqrfgd2(1) https://docs.iqrf.org/iqrf-gateway/
After=network.target ntp.service After=network.target ntp.service
[Service] [Service]
...@@ -7,9 +8,9 @@ Type=simple ...@@ -7,9 +8,9 @@ Type=simple
User=root User=root
Group=root Group=root
WorkingDirectory=/usr/bin WorkingDirectory=/usr/bin
ExecStart=/usr/bin/iqrfgd2 /etc/iqrf-gateway-daemon/config.json ExecStart=/usr/bin/iqrfgd2 -c /etc/iqrf-gateway-daemon/config.json
StandardOutput=syslog StandardOutput=journal
StandardError=syslog StandardError=journal
RestartSec=5 RestartSec=5
Restart=always Restart=always
......
LICENSE = "Apache-2.0" LICENSE = "Apache-2.0"
HOMEPAGE = "https://gitlab.iqrf.org/open-source/iqrf-gateway-daemon" HOMEPAGE = "https://gitlab.iqrf.org/open-source/iqrf-gateway-daemon"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" LIC_FILES_CHKSUM = "file://LICENSE;md5=d48c120b6d5a80de1e5836ba755d8b1f"
inherit cmake systemd python3native inherit cmake systemd python3native
...@@ -46,7 +46,7 @@ do_install_append() { ...@@ -46,7 +46,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/iqrf-gateway-daemon/certs install -d ${D}${sysconfdir}/iqrf-gateway-daemon/certs
install -d ${D}${sysconfdir}/iqrf-gateway-daemon/certs/core install -d ${D}${sysconfdir}/iqrf-gateway-daemon/certs/core
install -d ${D}/var/cache/iqrf-gateway-daemon install -d ${D}/var/cache/iqrf-gateway-daemon
install -d ${D}/var/cache/iqrf-gateway-daemon/upload install -d ${D}/var/cache/iqrf-gateway-daemon/upload
# run update cache # run update cache
......
Markdown is supported
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