Sysrepo release 0.7.5lilik-openwrt-22.03
@ -0,0 +1,47 @@ | |||
Index: libnetconf2-0.12-r1/CMakeLists.txt | |||
=================================================================== | |||
--- libnetconf2-0.12-r1.orig/CMakeLists.txt | |||
+++ libnetconf2-0.12-r1/CMakeLists.txt | |||
@@ -172,8 +172,10 @@ target_link_libraries(netconf2 ${CMAKE_T | |||
# check availability for some pthread functions | |||
set(CMAKE_REQUIRED_LIBRARIES pthread) | |||
+include(CheckFunctionExists) | |||
check_function_exists(pthread_spin_lock HAVE_SPINLOCK) | |||
check_function_exists(pthread_mutex_timedlock HAVE_PTHREAD_MUTEX_TIMEDLOCK) | |||
+check_function_exists(pthread_rwlockattr_setkind_np HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP) | |||
# dependencies - openssl | |||
if(ENABLE_TLS OR ENABLE_DNSSEC OR ENABLE_SSH) | |||
Index: libnetconf2-0.12-r1/src/config.h.in | |||
=================================================================== | |||
--- libnetconf2-0.12-r1.orig/src/config.h.in | |||
+++ libnetconf2-0.12-r1/src/config.h.in | |||
@@ -65,4 +65,7 @@ | |||
*/ | |||
#define NC_PS_QUEUE_SIZE @MAX_PSPOLL_THREAD_COUNT@ | |||
+/* Portability feature-check macros. */ | |||
+#cmakedefine HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP | |||
+ | |||
#endif /* NC_CONFIG_H_ */ | |||
Index: libnetconf2-0.12-r1/src/session_server.c | |||
=================================================================== | |||
--- libnetconf2-0.12-r1.orig/src/session_server.c | |||
+++ libnetconf2-0.12-r1/src/session_server.c | |||
@@ -520,6 +520,7 @@ nc_server_init(struct ly_ctx *ctx) | |||
errno=0; | |||
if (pthread_rwlockattr_init(&attr) == 0) { | |||
+#if defined(HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP) | |||
if (pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP) == 0) { | |||
if (pthread_rwlock_init(&server_opts.endpt_lock, &attr) != 0) { | |||
ERR("%s: failed to init rwlock(%s).", __FUNCTION__, strerror(errno)); | |||
@@ -530,6 +531,7 @@ nc_server_init(struct ly_ctx *ctx) | |||
} else { | |||
ERR("%s: failed set attribute (%s).", __FUNCTION__, strerror(errno)); | |||
} | |||
+#endif | |||
pthread_rwlockattr_destroy(&attr); | |||
} else { | |||
ERR("%s: failed init attribute (%s).", __FUNCTION__, strerror(errno)); |
@ -0,0 +1,21 @@ | |||
#!/bin/sh /etc/rc.common | |||
START=99 | |||
STOP=11 | |||
USE_PROCD=1 | |||
PROG=/bin/netopeer2-server | |||
start_service() { | |||
procd_open_instance | |||
procd_set_param command $PROG | |||
procd_append_param command -d -v 0 | |||
procd_set_param respawn | |||
procd_close_instance | |||
} | |||
stop_service() | |||
{ | |||
service_stop ${PROG} | |||
rm /var/run/netopeer2-server.pid | |||
} |
@ -0,0 +1,18 @@ | |||
Index: Netopeer2-0.6-r1/keystored/CMakeLists.txt | |||
=================================================================== | |||
--- Netopeer2-0.6-r1.orig/keystored/CMakeLists.txt | |||
+++ Netopeer2-0.6-r1/keystored/CMakeLists.txt | |||
@@ -69,6 +69,8 @@ find_package(SYSREPO REQUIRED) | |||
target_link_libraries(keystored ${SYSREPO_LIBRARIES}) | |||
include_directories(${SYSREPO_INCLUDE_DIRS}) | |||
+# skip step because of cross compiling | |||
+if (FALSE) | |||
# get sysrepo plugins directory | |||
if (NOT SR_PLUGINS_DIR) | |||
if (PKG_CONFIG_FOUND) | |||
@@ -154,3 +156,4 @@ add_custom_target(install-scripts-ide-ke | |||
# plugins should be installed into sysrepo plugins dir | |||
install(TARGETS keystored DESTINATION ${SR_PLUGINS_DIR}) | |||
+endif() |
@ -1,47 +0,0 @@ | |||
#!/bin/sh /etc/rc.common | |||
START=99 | |||
STOP=11 | |||
USE_PROCD=1 | |||
PROG=/bin/netopeer2-server | |||
start_service() { | |||
PERSIST_FILE=/etc/sysrepo/data/ietf-keystore.persist | |||
while [ ! -f $PERSIST_FILE ] | |||
do | |||
echo "no persist file yet" | |||
sleep 3 | |||
done | |||
RETRY_CNT=5 | |||
LAST_LINE=$(tail -n1 $PERSIST_FILE) | |||
while [[ -f $PERSIST_FILE && $LAST_LINE != "</module>" ]] | |||
do | |||
sleep 1 | |||
echo "$RETRY_CNT: $LAST_LINE" | |||
LAST_LINE=$(tail -n1 $PERSIST_FILE) | |||
RETRY_CNT=$(($RETRY_CNT-1)) | |||
if [ $RETRY_CNT -le 0 ]; | |||
then | |||
rm $PERSIST_FILE | |||
RETRY_CNT=5 | |||
fi | |||
done | |||
procd_open_instance | |||
procd_set_param command $PROG | |||
procd_append_param command -d -v 0 | |||
procd_set_param respawn | |||
procd_close_instance | |||
} | |||
stop_service() | |||
{ | |||
service_stop ${PROG} | |||
} |
@ -1,26 +1,26 @@ | |||
Index: sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/CMakeLists.txt | |||
Index: sysrepo-0.7.5/CMakeLists.txt | |||
=================================================================== | |||
--- sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf.orig/CMakeLists.txt | |||
+++ sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/CMakeLists.txt | |||
@@ -280,7 +280,7 @@ install (FILES ${INTERNAL_YANGS} DESTINA | |||
--- sysrepo-0.7.5.orig/CMakeLists.txt | |||
+++ sysrepo-0.7.5/CMakeLists.txt | |||
@@ -303,7 +303,7 @@ install (FILES ${INTERNAL_YANGS} DESTINA | |||
# install NACM YANG module | |||
if(ENABLE_NACM) | |||
- INSTALL_YANG("ietf-netconf-acm" "@2012-02-22" "644") | |||
+ # INSTALL_YANG("ietf-netconf-acm" "@2012-02-22" "644") | |||
- INSTALL_YANG("ietf-netconf-acm" "@2018-02-14" "644") | |||
+ #INSTALL_YANG("ietf-netconf-acm" "@2018-02-14" "644") | |||
endif(ENABLE_NACM) | |||
find_package(PkgConfig QUIET) | |||
@@ -304,9 +304,9 @@ if(WITH_SYSTEMD) | |||
@@ -327,9 +327,9 @@ if(WITH_SYSTEMD) | |||
FILES_MATCHING PATTERN "*.service") | |||
endif() | |||
-INSTALL_YANG("ietf-netconf-notifications" "" "666") | |||
-INSTALL_YANG("nc-notifications" "" "666") | |||
-INSTALL_YANG("notifications" "" "666") | |||
+# INSTALL_YANG("ietf-netconf-notifications" "" "666") | |||
+# INSTALL_YANG("nc-notifications" "" "666") | |||
+# INSTALL_YANG("notifications" "" "666") | |||
+#INSTALL_YANG("ietf-netconf-notifications" "" "666") | |||
+#INSTALL_YANG("nc-notifications" "" "666") | |||
+#INSTALL_YANG("notifications" "" "666") | |||
if(GEN_LANGUAGE_BINDINGS) | |||
add_subdirectory(swig) |
@ -1,12 +0,0 @@ | |||
Index: sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/inc/sysrepo.h | |||
=================================================================== | |||
--- sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf.orig/inc/sysrepo.h | |||
+++ sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/inc/sysrepo.h | |||
@@ -51,6 +51,7 @@ | |||
* @ref xp_page "XPath Addressing" is used for node identification in data-related calls. | |||
*/ | |||
+#include <time.h> | |||
#include <stdbool.h> | |||
#include <stdint.h> | |||
#include <stdlib.h> |