mirror of https://github.com/OpenIPC/firmware.git
[no ci] Package: update nabto sdk (#1625)
parent
861a97cf0b
commit
016680e0f4
|
@ -0,0 +1,57 @@
|
||||||
|
diff --git a/apps/tcp_tunnel_device/src/tcp_tunnel_main.c b/apps/tcp_tunnel_device/src/tcp_tunnel_main.c
|
||||||
|
index cbc6b8a..0eb63d7 100644
|
||||||
|
--- a/apps/tcp_tunnel_device/src/tcp_tunnel_main.c
|
||||||
|
+++ b/apps/tcp_tunnel_device/src/tcp_tunnel_main.c
|
||||||
|
@@ -41,8 +41,8 @@
|
||||||
|
#define NEWLINE "\r\n"
|
||||||
|
#else
|
||||||
|
#include <sys/stat.h>
|
||||||
|
-#define HOMEDIR_ENV_VARIABLE "HOME"
|
||||||
|
-#define HOMEDIR_NABTO_FOLDER ".nabto"
|
||||||
|
+#define HOMEDIR_ENV_VARIABLE "/etc"
|
||||||
|
+#define HOMEDIR_NABTO_FOLDER "nabto"
|
||||||
|
#define NEWLINE "\n"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -416,7 +416,7 @@ bool handle_main(struct args* args, struct tcp_tunnel* tunnel)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
- const char* homeEnv = getenv(HOMEDIR_ENV_VARIABLE);
|
||||||
|
+ const char* homeEnv = HOMEDIR_ENV_VARIABLE;
|
||||||
|
if (args->homeDir != NULL) {
|
||||||
|
// perfect just using the homeDir
|
||||||
|
make_directory(args->homeDir);
|
||||||
|
diff --git a/src/modules/libevent/CMakeLists.txt b/src/modules/libevent/CMakeLists.txt
|
||||||
|
index 8818d06..aed9682 100644
|
||||||
|
--- a/src/modules/libevent/CMakeLists.txt
|
||||||
|
+++ b/src/modules/libevent/CMakeLists.txt
|
||||||
|
@@ -11,5 +11,5 @@ set(src
|
||||||
|
|
||||||
|
add_library(nm_libevent ${src})
|
||||||
|
|
||||||
|
-target_link_libraries(nm_libevent nm_communication_buffer 3rdparty_libevent)
|
||||||
|
+target_link_libraries(nm_libevent nm_communication_buffer event event_pthreads mbedcrypto)
|
||||||
|
#target_link_libraries(nm_libevent ${LIBEVENT_STATIC_LIBRARIES})
|
||||||
|
diff --git a/src/modules/mbedtls/CMakeLists.txt b/src/modules/mbedtls/CMakeLists.txt
|
||||||
|
index 6855154..e4e31c7 100644
|
||||||
|
--- a/src/modules/mbedtls/CMakeLists.txt
|
||||||
|
+++ b/src/modules/mbedtls/CMakeLists.txt
|
||||||
|
@@ -25,13 +25,13 @@ set(dtls_srv_src
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library( nm_mbedtls_srv STATIC ${dtls_srv_src})
|
||||||
|
-target_link_libraries(nm_mbedtls_srv 3rdparty_mbedtls nn np_platform)
|
||||||
|
+target_link_libraries(nm_mbedtls_srv mbedtls nn np_platform)
|
||||||
|
|
||||||
|
add_library( nm_mbedtls_cli STATIC ${dtls_cli_src})
|
||||||
|
add_library( nm_mbedtls_random STATIC ${mbedtls_random_src})
|
||||||
|
add_library( nm_mbedtls_spake2 STATIC ${mbedtls_spake2_src})
|
||||||
|
|
||||||
|
|
||||||
|
-target_link_libraries(nm_mbedtls_cli 3rdparty_mbedtls nn np_platform)
|
||||||
|
-target_link_libraries(nm_mbedtls_random 3rdparty_mbedtls np_platform)
|
||||||
|
-target_link_libraries(nm_mbedtls_spake2 3rdparty_mbedtls np_platform)
|
||||||
|
+target_link_libraries(nm_mbedtls_cli mbedtls mbedx509 nn np_platform)
|
||||||
|
+target_link_libraries(nm_mbedtls_random mbedtls np_platform)
|
||||||
|
+target_link_libraries(nm_mbedtls_spake2 mbedtls np_platform)
|
|
@ -1,8 +1,10 @@
|
||||||
config BR2_PACKAGE_NABTO
|
config BR2_PACKAGE_NABTO
|
||||||
bool "nabto embedded sdk"
|
bool "nabto embedded sdk"
|
||||||
help
|
help
|
||||||
The Nabto Edge platform makes it possible to communicate directly between two entities:
|
The Nabto Edge platform makes it possible to communicate
|
||||||
Instead of interacting indirectly with a device through a cloud service, the platform makes
|
directly between two entities: Instead of interacting
|
||||||
it simple to communicate directly with the actual device to invoke services or transfer data - also through firewalls.
|
indirectly with a device through a cloud service, the platform
|
||||||
|
makes it simple to communicate directly with the actual device
|
||||||
|
to invoke services or transfer data - also through firewalls.
|
||||||
|
|
||||||
https://github.com/nabto/nabto-embedded-sdk
|
https://github.com/nabto/nabto-embedded-sdk
|
||||||
|
|
|
@ -1,23 +1,25 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
# nabto embedded sdk
|
# nabto
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
NABTO_VERSION = 5.12.0
|
NABTO_VERSION = 5.13.0
|
||||||
NABTO_SOURCE = nabto-embedded-sdk.zip
|
NABTO_SOURCE = nabto-embedded-sdk.zip
|
||||||
NABTO_SITE = https://github.com/nabto/nabto-embedded-sdk/releases/download/v$(NABTO_VERSION)
|
NABTO_SITE = https://github.com/nabto/nabto-embedded-sdk/releases/download/v$(NABTO_VERSION)
|
||||||
|
|
||||||
|
NABTO_DEPENDENCIES += \
|
||||||
|
libevent-openipc \
|
||||||
|
mbedtls-openipc
|
||||||
|
|
||||||
define NABTO_EXTRACT_CMDS
|
define NABTO_EXTRACT_CMDS
|
||||||
$(UNZIP) -d $(@D) $(NABTO_DL_DIR)/$(NABTO_SOURCE)
|
$(UNZIP) -d $(@D) $(NABTO_DL_DIR)/$(NABTO_SOURCE)
|
||||||
mv $(@D)/nabto-embedded-sdk/* $(@D)/
|
mv $(@D)/nabto-embedded-sdk/* $(@D)
|
||||||
rm -rf $(@D)/nabto-embedded-sdk
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
NABTO_CONF_OPTS += \
|
NABTO_CONF_OPTS += \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
-DBUILD_SHARED_LIBS=OFF \
|
||||||
-DDEVICE_BUILD_TESTS=OFF \
|
|
||||||
-DDEVICE_BUILD_EXAMPLES=OFF
|
-DDEVICE_BUILD_EXAMPLES=OFF
|
||||||
|
|
||||||
define NABTO_REMOVE_EXTRA
|
define NABTO_REMOVE_EXTRA
|
||||||
|
|
Loading…
Reference in New Issue