| Message ID | 20191009112656.21232-6-heiko.thiery@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add netopeer2 package (and dependencies) | expand |
Hello Heiko, On Wed, 9 Oct 2019 13:26:52 +0200 heiko.thiery@gmail.com wrote: > diff --git a/package/libnetconf2/Config.in b/package/libnetconf2/Config.in > new file mode 100644 > index 0000000000..986e49fac5 > --- /dev/null > +++ b/package/libnetconf2/Config.in > @@ -0,0 +1,37 @@ > +config BR2_PACKAGE_LIBNETCONF2 > + bool "libnetconf2" > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS > + depends on BR2_USE_MMU > + select BR2_PACKAGE_LIBYANG > + select BR2_PACKAGE_LIBSSH > + select BR2_PACKAGE_LIBSSH_SERVER I thought libssh was now an optional dependency ? > + help > + libnetconf2 is a NETCONF library in C intended for building > + NETCONF clients and servers. > + > + https://github.com/CESNET/libnetconf2 > + > +config BR2_PACKAGE_LIBNETCONF2_SSH > + bool > + help > + SSH support for libnetconf2 > + > +config BR2_PACKAGE_LIBNETCONF2_TLS > + bool > + help > + TLS support for libnetconf2 Do we need configurable options for this ? In general, we prefer to have automatic dependencies, i.e just rely on whether a dependent package is enabled or not. This would give in your .mk file: +ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON +LIBNETCONF2_DEPENDENCIES += libssh +else +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF +endif > +config BR2_PACKAGE_HOST_LIBNETCONF2_SSH > + bool > + help > + SSH support for host-libnetconf2 > + > +config BR2_PACKAGE_HOST_LIBNETCONF2_TLS > + bool > + help > + TLS support for host-libnetconf2 We generally don't make host packages configurable, and if they are, certainly not with options in Config.in, but in Config.in.host. Do you really need the host variant of libnetconf2 to have SSL/TLS support ? Thanks! Thomas
Hi Thomas, > > +config BR2_PACKAGE_LIBNETCONF2 > > + bool "libnetconf2" > > + depends on BR2_TOOLCHAIN_HAS_THREADS > > + depends on !BR2_STATIC_LIBS > > + depends on BR2_USE_MMU > > + select BR2_PACKAGE_LIBYANG > > + select BR2_PACKAGE_LIBSSH > > + select BR2_PACKAGE_LIBSSH_SERVER > > I thought libssh was now an optional dependency ? This has to be removed from here and has to be added to the sysrepo package that enables it. Is the normal way to make it configurable at the place where it is needed. In this example the sysrepo has to be select the dependencies? > > + help > > + libnetconf2 is a NETCONF library in C intended for building > > + NETCONF clients and servers. > > + > > + https://github.com/CESNET/libnetconf2 > > + > > +config BR2_PACKAGE_LIBNETCONF2_SSH > > + bool > > + help > > + SSH support for libnetconf2 > > + > > +config BR2_PACKAGE_LIBNETCONF2_TLS > > + bool > > + help > > + TLS support for libnetconf2 > > Do we need configurable options for this ? In general, we prefer to > have automatic dependencies, i.e just rely on whether a dependent > package is enabled or not. This would give in your .mk file: I will remove this since it is not required here. This is just a leftover because I tested each package separatly with the test-pkg script. > +ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) > +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON > +LIBNETCONF2_DEPENDENCIES += libssh > +else > +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF > +endif > > > +config BR2_PACKAGE_HOST_LIBNETCONF2_SSH > > + bool > > + help > > + SSH support for host-libnetconf2 > > + > > +config BR2_PACKAGE_HOST_LIBNETCONF2_TLS > > + bool > > + help > > + TLS support for host-libnetconf2 > > We generally don't make host packages configurable, and if they are, > certainly not with options in Config.in, but in Config.in.host. Do you > really need the host variant of libnetconf2 to have SSL/TLS support ? I will remove that .. just thought it has to be selectable.
On Wed, 9 Oct 2019 14:54:33 +0200 Heiko Thiery <heiko.thiery@gmail.com> wrote: > > I thought libssh was now an optional dependency ? > > This has to be removed from here and has to be added to the sysrepo > package that enables it. Correct, if sysrepo needs libnetconf2 with libssh support, then sysrepo should select BR2_PACKAGE_LIBSSH and BR2_PACKAGE_LIBSSH_SERVER. > Is the normal way to make it configurable at the place where it is > needed. In this example the sysrepo has to be select the dependencies? From the point of view of netconf2, libssh and openssl are optional, so they be treated as such in the netconf2 package. However, if sysrepo's use of netconf2 requires some specific features in netconf2 that are normally optional, then indeed, it is up to sysrepo's package to forcefully select the necessary options. A quick word: thanks for your patience and persistence in working on this patch series. For your first (?) Buildroot contribution, you are definitely not doing the easiest possible new package! Thanks! Thomas
diff --git a/DEVELOPERS b/DEVELOPERS index 3a7b5f3bbc..56b92cf82a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1039,6 +1039,7 @@ F: package/python-remi/ F: package/python-sip/ N: Heiko Thiery <heiko.thiery@gmail.com> +F: package/libnetconf2/ F: package/libyang/ N: Henrique Camargo <henrique@henriquecamargo.com> diff --git a/package/Config.in b/package/Config.in index ca3d4d5d33..c091ad2bd8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1608,6 +1608,7 @@ menu "Networking" source "package/libnatpmp/Config.in" source "package/libndp/Config.in" source "package/libnet/Config.in" + source "package/libnetconf2/Config.in" source "package/libnetfilter_acct/Config.in" source "package/libnetfilter_conntrack/Config.in" source "package/libnetfilter_cthelper/Config.in" diff --git a/package/libnetconf2/0001-Add-support-for-musl-libc.patch b/package/libnetconf2/0001-Add-support-for-musl-libc.patch new file mode 100644 index 0000000000..44023a391d --- /dev/null +++ b/package/libnetconf2/0001-Add-support-for-musl-libc.patch @@ -0,0 +1,65 @@ +From 153fe40bd60499677e825e66501e8601536e0323 Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Mon, 15 Jul 2019 18:15:28 -0700 +Subject: [PATCH] Add support for musl libc + +musl does not support pthread_rwlockattr_setkind_np. Don't use it if it is +not available. + +Patch comes from upstream commit: +https://github.com/CESNET/libnetconf2/commit/153fe40bd60499677e825e66501e8601536e0323 + +Signed-of-by: Heiko Thiery <heiko.thiery@kontron.com> +--- + CMakeLists.txt | 1 + + src/config.h.in | 3 +++ + src/session_server.c | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 624b8c8..c05cd03 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -176,6 +176,7 @@ target_link_libraries(netconf2 ${CMAKE_THREAD_LIBS_INIT}) + set(CMAKE_REQUIRED_LIBRARIES pthread) + check_include_file(stdatomic.h HAVE_STDATOMIC) + 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) +diff --git a/src/config.h.in b/src/config.h.in +index 96d33c5..30dd8a3 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -73,4 +73,7 @@ + */ + #define NC_PS_QUEUE_SIZE @MAX_PSPOLL_THREAD_COUNT@ + ++/* Portability feature-check macros. */ ++#cmakedefine HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP ++ + #endif /* NC_CONFIG_H_ */ +diff --git a/src/session_server.c b/src/session_server.c +index 636b1a2..3b747ed 100644 +--- a/src/session_server.c ++++ b/src/session_server.c +@@ -560,6 +560,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)); +@@ -570,6 +571,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)); +-- +2.20.1 + diff --git a/package/libnetconf2/Config.in b/package/libnetconf2/Config.in new file mode 100644 index 0000000000..986e49fac5 --- /dev/null +++ b/package/libnetconf2/Config.in @@ -0,0 +1,37 @@ +config BR2_PACKAGE_LIBNETCONF2 + bool "libnetconf2" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_LIBSSH + select BR2_PACKAGE_LIBSSH_SERVER + help + libnetconf2 is a NETCONF library in C intended for building + NETCONF clients and servers. + + https://github.com/CESNET/libnetconf2 + +config BR2_PACKAGE_LIBNETCONF2_SSH + bool + help + SSH support for libnetconf2 + +config BR2_PACKAGE_LIBNETCONF2_TLS + bool + help + TLS support for libnetconf2 + +config BR2_PACKAGE_HOST_LIBNETCONF2_SSH + bool + help + SSH support for host-libnetconf2 + +config BR2_PACKAGE_HOST_LIBNETCONF2_TLS + bool + help + TLS support for host-libnetconf2 + +comment "libnetconf2 needs a toolchain w/ threads, dynamic libraray" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash new file mode 100644 index 0000000000..c6d1f5185d --- /dev/null +++ b/package/libnetconf2/libnetconf2.hash @@ -0,0 +1,2 @@ +sha256 760061fb1c1fe87a2a068d5a9e5affcef280044c5940ef344854e9ea7ec26452 libnetconf2-v0.12-r2.tar.gz +sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk new file mode 100644 index 0000000000..0b44d8e44d --- /dev/null +++ b/package/libnetconf2/libnetconf2.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# libnetconf2 +# +################################################################################ + +LIBNETCONF2_VERSION = v0.12-r2 +LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,$(LIBNETCONF2_VERSION)) +LIBNETCONF2_INSTALL_STAGING = YES +LIBNETCONF2_LICENSE = BSD-3-Clause +LIBNETCONF2_LICENSE_FILES = LICENSE +LIBNETCONF2_DEPENDENCIES = libyang +HOST_LIBNETCONF2_DEPENDENCIES = host-libyang + +LIBNETCONF2_CONF_OPTS = \ + -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF + +ifeq ($(BR2_PACKAGE_LIBNETCONF2_SSH), y) +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON +LIBNETCONF2_DEPENDENCIES += libssh +else +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBNETCONF2_TLS), y) +LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=ON +LIBNETCONF2_DEPENDENCIES += openssl +else +LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=OFF +endif + +HOST_LIBNETCONF2_CONF_OPTS = \ + -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF + +ifeq ($(BR2_PACKAGE_HOST_LIBNETCONF2_SSH), y) +HOST_LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON +HOST_LIBNETCONF2_DEPENDENCIES += host-libssh +else +HOST_LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF +endif + +ifeq ($(BR2_PACKAGE_HOST_LIBNETCONF2_TLS), y) +HOST_LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=ON +HOST_LIBNETCONF2_DEPENDENCIES += host-openssl +else +HOST_LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=OFF +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package))