Add netopeer2 package (and dependencies)
v2 cover Add netopeer2 package (and dependencies)
From: Heiko Thiery <[email protected]>
This patchset contains the netopeer2 package and the required dependencies. Netopeer2 is a set of tools implementing network configuration tools based on the NETCONF Protocol.
This includes the packages for libavl, libyang, libnetconf2, sysrepo, netopeer2-server, netopeer2-cli, netopeer2-keystored.
Also add the host target support for libev and libssh. This is needed for the install steps of sysrepo and netopeer2-server and netopeer2-keystored.
---
Changes v1 -> v2:
- replace libredblack with libavl because this is also supported by debian.
- changes all over the place to integrate review comments.
Heiko Thiery (8):
package/libev: use host-autotools-package macro package/libssh: use host-autotools-package macro package/libyang: add package package/libnetconf2: add package package/sysrepo: add package package/netopeer2-keystored: add package package/netopeer2-server: add package package/netopeer2-cli: add package
Michael Walle (1):
package/libavl: add package
DEVELOPERS | 8 +++ package/Config.in | 7 ++ package/libavl/0001-fix-makefile.patch | 49 ++++++++++++++ package/libavl/Config.in | 13 ++++ package/libavl/libavl.hash | 5 ++ package/libavl/libavl.mk | 43 ++++++++++++ package/libev/libev.mk | 1 + .../0001-Add-support-for-musl-libc.patch | 65 +++++++++++++++++++ package/libnetconf2/Config.in | 37 +++++++++++ package/libnetconf2/libnetconf2.hash | 2 + package/libnetconf2/libnetconf2.mk | 52 +++++++++++++++ package/libssh/libssh.mk | 1 + package/libyang/Config.in | 13 ++++ package/libyang/libyang.hash | 2 + package/libyang/libyang.mk | 25 +++++++ package/netopeer2-cli/Config.in | 17 +++++ package/netopeer2-cli/netopeer2-cli.hash | 2 + package/netopeer2-cli/netopeer2-cli.mk | 16 +++++ package/netopeer2-keystored/Config.in | 15 +++++ .../netopeer2-keystored.hash | 2 + .../netopeer2-keystored.mk | 29 +++++++++ package/netopeer2-server/Config.in | 18 +++++ .../netopeer2-server/netopeer2-server.hash | 2 + package/netopeer2-server/netopeer2-server.mk | 26 ++++++++ package/sysrepo/Config.in | 27 ++++++++ package/sysrepo/sysrepo.hash | 2 + package/sysrepo/sysrepo.mk | 37 +++++++++++ 27 files changed, 516 insertions(+) create mode 100644 package/libavl/0001-fix-makefile.patch create mode 100644 package/libavl/Config.in create mode 100644 package/libavl/libavl.hash create mode 100644 package/libavl/libavl.mk create mode 100644 package/libnetconf2/0001-Add-support-for-musl-libc.patch create mode 100644 package/libnetconf2/Config.in create mode 100644 package/libnetconf2/libnetconf2.hash create mode 100644 package/libnetconf2/libnetconf2.mk create mode 100644 package/libyang/Config.in create mode 100644 package/libyang/libyang.hash create mode 100644 package/libyang/libyang.mk create mode 100644 package/netopeer2-cli/Config.in create mode 100644 package/netopeer2-cli/netopeer2-cli.hash create mode 100644 package/netopeer2-cli/netopeer2-cli.mk create mode 100644 package/netopeer2-keystored/Config.in create mode 100644 package/netopeer2-keystored/netopeer2-keystored.hash create mode 100644 package/netopeer2-keystored/netopeer2-keystored.mk create mode 100644 package/netopeer2-server/Config.in create mode 100644 package/netopeer2-server/netopeer2-server.hash create mode 100644 package/netopeer2-server/netopeer2-server.mk create mode 100644 package/sysrepo/Config.in create mode 100644 package/sysrepo/sysrepo.hash create mode 100644 package/sysrepo/sysrepo.mk
Signature · 1 line
2.20.1
PATCH v2 1/9 package/libev: use host-autotools-package macro
From: Heiko Thiery <[email protected]>
Enable host support for the lib because the package host-sysrepo (depends on package libnetconf2) is needed by package netopeer2keystored.
--- package/libev/libev.mk | 1 + 1 file changed, 1 insertion(+)
package/libev/libev.mk +1 -0
@@ -18,3 +18,4 @@ endef LIBEV_POST_PATCH_HOOKS += LIBEV_DISABLE_EVENT_H_INSTALL $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
2.20.1
PATCH v2 2/9 package/libssh: use host-autotools-package macro
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
Enable host support for the lib because the package host-sysrepo (depends on package libnetconf2) is needed by package netopeer2keystored.
--- package/libssh/libssh.mk | 1 + 1 file changed, 1 insertion(+)
package/libssh/libssh.mk +1 -0
@@ -43,3 +43,4 @@ LIBSSH_DEPENDENCIES += openssl endif $(eval $(cmake-package)) +$(eval $(host-cmake-package))
Signature · 1 line
2.20.1
PATCH v2 3/9 package/libavl: add package
In reply to heiko.thiery at gmail.comFrom: Michael Walle <[email protected]>
--- package/Config.in | 1 + package/libavl/0001-fix-makefile.patch | 49 ++++++++++++++++++++++++++ package/libavl/Config.in | 13 +++++++ package/libavl/libavl.hash | 5 +++ package/libavl/libavl.mk | 43 ++++++++++++++++++++++ 5 files changed, 111 insertions(+) create mode 100644 package/libavl/0001-fix-makefile.patch create mode 100644 package/libavl/Config.in create mode 100644 package/libavl/libavl.hash create mode 100644 package/libavl/libavl.mk
package/Config.in +1 -0
@@ -1713,6 +1713,7 @@ menu "Other" source "package/lapack/Config.in" source "package/libargtable2/Config.in" source "package/libatomic_ops/Config.in" + source "package/libavl/Config.in" source "package/libb64/Config.in" source "package/libbsd/Config.in" source "package/libcap/Config.in"
package/libavl/0001-fix-makefile.patch new file +49 -0
49 lines not on this page · raw message
package/libavl/Config.in new file +13 -0
@@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBAVL + bool "libavl" + depends on !BR2_STATIC_LIBS + help + AVLTree is a small implementation of AVL trees for the C + programming language. + + https://packages.debian.org/buster/libavl1 + + This is not the GNU AVL library by Ben Pfaff. + +comment "libavl needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS
package/libavl/libavl.hash new file +5 -0
@@ -0,0 +1,5 @@ +# From http://ftp.debian.org/debian/pool/main/liba/libavl/libavl_0.3.5-4.dsc +sha256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0 libavl_0.3.5.orig.tar.gz + +# Hash for license files: +sha256 767a9accfe3b110153b567983b98889469dfaae02899a632aeadbb81ad611293 COPYING
package/libavl/libavl.mk new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 4/9 package/libyang: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
LibYANG processes YIN and YANG files. It's a dependency of sysrepo which is a dependency of Netopeer, a NETCONF/YANG server.
--- DEVELOPERS | 3 +++ package/Config.in | 1 + package/libyang/Config.in | 13 +++++++++++++ package/libyang/libyang.hash | 2 ++ package/libyang/libyang.mk | 25 +++++++++++++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/libyang/Config.in create mode 100644 package/libyang/libyang.hash create mode 100644 package/libyang/libyang.mk
DEVELOPERS +3 -0
@@ -1038,6 +1038,9 @@ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ +N: Heiko Thiery <[email protected]> +F: package/libyang/ + N: Henrique Camargo <[email protected]> F: package/json-glib/
package/Config.in +1 -0
@@ -1641,6 +1641,7 @@ menu "Networking" source "package/libvncserver/Config.in" source "package/libwebsock/Config.in" source "package/libwebsockets/Config.in" + source "package/libyang/Config.in" source "package/lksctp-tools/Config.in" source "package/mongoose/Config.in" source "package/nanomsg/Config.in"
package/libyang/Config.in new file +13 -0
@@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBYANG + bool "libyang" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UCP + help + Libyang is YANG data modeling language parser and toolkit + written (and providing API) in C. + + https://github.com/CESNET/libyang + +comment "libyang needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS
package/libyang/libyang.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 351f712433d50494aad153bfd4aa92ff50299058428620eabddb7a41d781e756 libyang-v1.0-r3.tar.gz +sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE
package/libyang/libyang.mk new file +25 -0
@@ -0,0 +1,25 @@ +################################################################################ +# +# libyang +# +################################################################################ + +LIBYANG_VERSION = v1.0-r3 +LIBYANG_SITE = $(call github,CESNET,libyang,$(LIBYANG_VERSION)) +LIBYANG_LICENSE = BSD-3-Clause +LIBYANG_LICENSE_FILES = LICENSE +LIBYANG_INSTALL_STAGING = YES +LIBYANG_SUPPORTS_IN_SOURCE_BUILD = NO +LIBYANG_DEPENDENCIES = pcre +HOST_LIBYANG_DEPENDENCIES = host-pcre + +LIBYANG_CONF_OPTS = \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DGEN_PYTHON_BINDINGS=OFF + +HOST_LIBYANG_CONF_OPTS = \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DGEN_PYTHON_BINDINGS=OFF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package))
Signature · 1 line
2.20.1
PATCH v2 5/9 package/libnetconf2: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
libnetconf2 is a NETCONF library in C intended for building NETCONF clients and servers.
--- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-Add-support-for-musl-libc.patch | 65 +++++++++++++++++++ package/libnetconf2/Config.in | 37 +++++++++++ package/libnetconf2/libnetconf2.hash | 2 + package/libnetconf2/libnetconf2.mk | 52 +++++++++++++++ 6 files changed, 158 insertions(+) create mode 100644 package/libnetconf2/0001-Add-support-for-musl-libc.patch create mode 100644 package/libnetconf2/Config.in create mode 100644 package/libnetconf2/libnetconf2.hash create mode 100644 package/libnetconf2/libnetconf2.mk
DEVELOPERS +1 -0
@@ -1039,6 +1039,7 @@ F: package/python-remi/ F: package/python-sip/ N: Heiko Thiery <[email protected]> +F: package/libnetconf2/ F: package/libyang/ N: Henrique Camargo <[email protected]>
package/Config.in +1 -0
@@ -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"
package/libnetconf2/0001-Add-support-for-musl-libc.patch new file +65 -0
65 lines not on this page · raw message
package/libnetconf2/Config.in new file +37 -0
@@ -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
package/libnetconf2/libnetconf2.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 760061fb1c1fe87a2a068d5a9e5affcef280044c5940ef344854e9ea7ec26452 libnetconf2-v0.12-r2.tar.gz +sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE
package/libnetconf2/libnetconf2.mk new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 6/9 package/sysrepo: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
sysrepo is a YANG-based configuration and operational state data store for Unix/Linux applications. It is a dependency of Netopeer, a NETCONF server.
--- DEVELOPERS | 1 + package/Config.in | 1 + package/sysrepo/Config.in | 27 ++++++++++++++++++++++++++ package/sysrepo/sysrepo.hash | 2 ++ package/sysrepo/sysrepo.mk | 37 ++++++++++++++++++++++++++++++++++++ 5 files changed, 68 insertions(+) create mode 100644 package/sysrepo/Config.in create mode 100644 package/sysrepo/sysrepo.hash create mode 100644 package/sysrepo/sysrepo.mk
DEVELOPERS +1 -0
@@ -1041,6 +1041,7 @@ F: package/python-sip/ N: Heiko Thiery <[email protected]> F: package/libnetconf2/ F: package/libyang/ +F: package/sysrepo/ N: Henrique Camargo <[email protected]> F: package/json-glib/
package/Config.in +1 -0
@@ -1668,6 +1668,7 @@ menu "Networking" source "package/slirp/Config.in" source "package/snmppp/Config.in" source "package/sofia-sip/Config.in" + source "package/sysrepo/Config.in" source "package/thrift/Config.in" source "package/usbredir/Config.in" source "package/wampcc/Config.in"
package/sysrepo/Config.in new file +27 -0
@@ -0,0 +1,27 @@ +config BR2_PACKAGE_SYSREPO + bool "sysrepo" + depends on BR2_USE_MMU # libnetconf2 + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # host-protbuf + depends on BR2_HOST_GCC_AT_LEAST_4_8 # host-protobuf + select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBNETCONF2 + select BR2_PACKAGE_LIBNETCONF2_SSH + select BR2_PACKAGE_LIBNETCONF2_TLS + select BR2_PACKAGE_LIBAVL + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_PROTOBUF_C + select BR2_PACKAGE_PCRE + help + Sysrepo is an YANG-based configuration and operational state + data store for Unix/Linux applications. + + https://github.com/sysrepo + +comment "sysrepo needs a toolchain w/ C++, threads, dynamic libraray, host gcc >= 4.8" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_HOST_GCC_AT_LEAST_4_8 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
package/sysrepo/sysrepo.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 d3066c1776a6727b96bbb3517eb646d0bb6037e8e1addcbe873cae590493843e sysrepo-v0.7.8.tar.gz +sha256 28a773bfffa828ec38c030fc8ace5f3aeb90926ec1309bbd135441c4387ce3cd LICENSE
package/sysrepo/sysrepo.mk new file +37 -0
@@ -0,0 +1,37 @@ +################################################################################ +# +# sysrepo +# +################################################################################ + +SYSREPO_VERSION = v0.7.8 +SYSREPO_SITE = $(call github,sysrepo,sysrepo,$(SYSREPO_VERSION)) +SYSREPO_INSTALL_STAGING = YES +SYSREPO_LICENSE = Apache-2.0 +SYSREPO_LICENSE_FILES = LICENSE +SYSREPO_DEPENDENCIES += libev libnetconf2 libavl libyang pcre protobuf-c host-sysrepo +HOST_SYSREPO_DEPENDENCIES += host-libev host-libnetconf2 host-libavl host-libyang host-pcre host-protobuf-c + +SYSREPO_CONF_OPTS += \ + -DGEN_PYTHON2_TESTS=OFF \ + -DENABLE_TESTS=OFF \ + -DCALL_SYSREPOCTL_BIN=$(HOST_DIR)/bin/sysrepoctl \ + -DCALL_SYSREPOCFG_BIN=$(HOST_DIR)/bin/sysrepocfg + +# On ARM, this is needed to prevent unaligned memory access with an optimized +# build .. https://github.com/sysrepo/sysrepo/issues/947 +SYSREPO_CONF_OPTS += -DUSE_SR_MEM_MGMT=OFF + +ifeq ($(BR2_INIT_SYSTEMD),y) +SYSREPO_CONF_OPTS += -DWITH_SYSTEMD=ON +endif + +HOST_SYSREPO_CONF_OPTS += \ + -DGEN_PYTHON2_TESTS=OFF \ + -DENABLE_TESTS=OFF \ + -DCALL_TARGET_BINS_DIRECTLY=OFF \ + -DREPOSITORY_LOC=$(BASE_TARGET_DIR)/etc/sysrepo \ + -DSUBSCRIPTIONS_SOCKET_DIR=$(HOST_DIR)/var/run/sysrepo-subscriptions + +$(eval $(cmake-package)) +$(eval $(host-cmake-package))
Signature · 1 line
2.20.1
PATCH v2 7/9 package/netopeer2-keystored: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
netopeer2 keystored plugin.
--- DEVELOPERS | 1 + package/Config.in | 1 + package/netopeer2-keystored/Config.in | 15 ++++++++++ .../netopeer2-keystored.hash | 2 ++ .../netopeer2-keystored.mk | 29 +++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/netopeer2-keystored/Config.in create mode 100644 package/netopeer2-keystored/netopeer2-keystored.hash create mode 100644 package/netopeer2-keystored/netopeer2-keystored.mk
DEVELOPERS +1 -0
@@ -1041,6 +1041,7 @@ F: package/python-sip/ N: Heiko Thiery <[email protected]> F: package/libnetconf2/ F: package/libyang/ +F: package/netopeer2-keystored/ F: package/sysrepo/ N: Henrique Camargo <[email protected]>
package/Config.in +1 -0
@@ -1647,6 +1647,7 @@ menu "Networking" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/netopeer2-keystored/Config.in" source "package/nghttp2/Config.in" source "package/norm/Config.in" source "package/nss-mdns/Config.in"
package/netopeer2-keystored/Config.in new file +15 -0
@@ -0,0 +1,15 @@ +config BR2_PACKAGE_NETOPEER2_KEYSTORED + bool "netopeer2-keystore daemon" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_SYSREPO + select BR2_PACKAGE_SYSREPO + help + Netopeer2 is a set of tools implementing network + configuration tools based on the NETCONF Protocol. + + https://github.com/CESNET/Netopeer2 + +comment "needs a toolchain w/ threads, dynamic libraray" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
package/netopeer2-keystored/netopeer2-keystored.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 59688271be4fecbbee671fc7eb3dc0538b13b4baab53e923e26eaeb33e6f7ec0 netopeer2-keystored-v0.7-r2.tar.gz +sha256 932b75a8610a5c58e0fe0f70f8e4ebbcf3a2392acc16a88e95aebcdbdb9245e0 LICENSE
package/netopeer2-keystored/netopeer2-keystored.mk new file +29 -0
@@ -0,0 +1,29 @@ +################################################################################ +# +# netopeer2-keystored +# +################################################################################ + +NETOPEER2_KEYSTORED_VERSION = v0.7-r2 +NETOPEER2_KEYSTORED_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2_KEYSTORED_VERSION)) +NETOPEER2_KEYSTORED_LICENSE = BSD-3-Clause +NETOPEER2_KEYSTORED_LICENSE_FILES = LICENSE +NETOPEER2_KEYSTORED_SUBDIR = keystored +NETOPEER2_KEYSTORED_DEPENDENCIES += host-sysrepo sysrepo + +NETOPEER2_KEYSTORED_CONF_OPTS += \ + -DKEYSTORED_DEFER_SSH_KEY=ON \ + -DSSH_KEY_INSTALL=ON \ + -DMODEL_INSTALL=ON \ + -DSYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ + -DSYSREPOCFG_EXECUTABLE=$(HOST_DIR)/bin/sysrepocfg + +define NETOPEER2_KEYSTORED_PERMISSIONS + /etc/sysrepo/data/ietf-keystore.persist f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.running f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.running.lock f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.startup f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.startup.lock f 600 0 0 - - - - - +endef + +$(eval $(cmake-package))
Signature · 1 line
2.20.1
PATCH v2 8/9 package/netopeer2-server: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
Netopeer2 is a set of tools implementing network configuration tools based on the NETCONF Protocol. This is the second generation of the toolset, originally available as the Netopeer project. Netopeer2 is based on the new generation of the NETCONF and YANG libraries - libyang and libnetconf2. The Netopeer server uses sysrepo as a NETCONF datastore implementation.
--- DEVELOPERS | 1 + package/Config.in | 1 + package/netopeer2-server/Config.in | 18 +++++++++++++ .../netopeer2-server/netopeer2-server.hash | 2 ++ package/netopeer2-server/netopeer2-server.mk | 26 +++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/netopeer2-server/Config.in create mode 100644 package/netopeer2-server/netopeer2-server.hash create mode 100644 package/netopeer2-server/netopeer2-server.mk
DEVELOPERS +1 -0
@@ -1042,6 +1042,7 @@ N: Heiko Thiery <[email protected]> F: package/libnetconf2/ F: package/libyang/ F: package/netopeer2-keystored/ +F: package/netopeer2-server/ F: package/sysrepo/ N: Henrique Camargo <[email protected]>
package/Config.in +1 -0
@@ -1648,6 +1648,7 @@ menu "Networking" source "package/nanomsg/Config.in" source "package/neon/Config.in" source "package/netopeer2-keystored/Config.in" + source "package/netopeer2-server/Config.in" source "package/nghttp2/Config.in" source "package/norm/Config.in" source "package/nss-mdns/Config.in"
package/netopeer2-server/Config.in new file +18 -0
@@ -0,0 +1,18 @@ +config BR2_PACKAGE_NETOPEER2_SERVER + bool "netopeer2server" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_LIBNETCONF2 + select BR2_PACKAGE_LIBNETCONF2_SSH + select BR2_PACKAGE_LIBNETCONF2_TLS + select BR2_PACKAGE_SYSREPO + select BR2_PACKAGE_NETOPEER2_KEYSTORED + help + Netopeer2 is a set of tools implementing network + configuration tools based on the NETCONF Protocol. + + https://github.com/CESNET/Netopeer2 + +comment "netopeer2server needs a toolchain w/ threads, dynamic libraray" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
package/netopeer2-server/netopeer2-server.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 59688271be4fecbbee671fc7eb3dc0538b13b4baab53e923e26eaeb33e6f7ec0 netopeer2-server-v0.7-r2.tar.gz +sha256 932b75a8610a5c58e0fe0f70f8e4ebbcf3a2392acc16a88e95aebcdbdb9245e0 LICENSE
package/netopeer2-server/netopeer2-server.mk new file +26 -0
@@ -0,0 +1,26 @@ +################################################################################ +# +# netopeer2-server +# +################################################################################ + +NETOPEER2_SERVER_VERSION = v0.7-r2 +NETOPEER2_SERVER_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2_SERVER_VERSION)) +NETOPEER2_SERVER_LICENSE = BSD-3-Clause +NETOPEER2_SERVER_LICENSE_FILES = LICENSE +NETOPEER2_SERVER_SUBDIR = server +NETOPEER2_SERVER_DEPENDENCIES += libyang sysrepo + +NETOPEER2_SERVER_CONF_OPTS += \ + -DENABLE_CONFIGURATION=ON \ + -DKEYSTORED_KEYS_DIR=/etc/keystored/keys + +define NETOPEER2_SERVER_PERMISSIONS + /etc/sysrepo/data/ietf-netconf-server.persist f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-netconf-server.running f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-netconf-server.running.lock f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-netconf-server.startup f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-netconf-server.startup.lock f 600 0 0 - - - - - +endef + +$(eval $(cmake-package))
Signature · 1 line
2.20.1
PATCH v2 9/9 package/netopeer2-cli: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
netopeer2 CLI - simple command line interface to connect to a NETCONF server (device).
--- DEVELOPERS | 1 + package/Config.in | 1 + package/netopeer2-cli/Config.in | 17 +++++++++++++++++ package/netopeer2-cli/netopeer2-cli.hash | 2 ++ package/netopeer2-cli/netopeer2-cli.mk | 16 ++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/netopeer2-cli/Config.in create mode 100644 package/netopeer2-cli/netopeer2-cli.hash create mode 100644 package/netopeer2-cli/netopeer2-cli.mk
DEVELOPERS +1 -0
@@ -1041,6 +1041,7 @@ F: package/python-sip/ N: Heiko Thiery <[email protected]> F: package/libnetconf2/ F: package/libyang/ +F: package/netopeer2-cli/ F: package/netopeer2-keystored/ F: package/netopeer2-server/ F: package/sysrepo/
package/Config.in +1 -0
@@ -1647,6 +1647,7 @@ menu "Networking" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/netopeer2-cli/Config.in" source "package/netopeer2-keystored/Config.in" source "package/netopeer2-server/Config.in" source "package/nghttp2/Config.in"
package/netopeer2-cli/Config.in new file +17 -0
@@ -0,0 +1,17 @@ +config BR2_PACKAGE_NETOPEER2_CLI + bool "netopeer2cli" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_LIBNETCONF2 + select BR2_PACKAGE_LIBNETCONF2_SSH + select BR2_PACKAGE_LIBNETCONF2_TLS + select BR2_PACKAGE_SYSREPO + help + Netopeer2 CLI is a simple command line interface to + connect to a NETCONF server (device). + + https://github.com/CESNET/Netopeer2 + +comment "netopeer2cli needs a toolchain w/ threads, dynamic libraray" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
package/netopeer2-cli/netopeer2-cli.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 59688271be4fecbbee671fc7eb3dc0538b13b4baab53e923e26eaeb33e6f7ec0 netopeer2-cli-v0.7-r2.tar.gz +sha256 932b75a8610a5c58e0fe0f70f8e4ebbcf3a2392acc16a88e95aebcdbdb9245e0 LICENSE
package/netopeer2-cli/netopeer2-cli.mk new file +16 -0
@@ -0,0 +1,16 @@ +################################################################################ +# +# netopeer2-cli +# +################################################################################ + +NETOPEER2_CLI_VERSION = v0.7-r2 +NETOPEER2_CLI_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2_CLI_VERSION)) +NETOPEER2_CLI_LICENSE = BSD-3-Clause +NETOPEER2_CLI_LICENSE_FILES = LICENSE +NETOPEER2_CLI_SUBDIR = cli +NETOPEER2_CLI_INSTALL_STAGING = YES +NETOPEER2_CLI_DEPENDENCIES += libyang +NETOPEER2_CLI_DEPENDENCIES += sysrepo + +$(eval $(cmake-package))
Signature · 1 line
2.20.1
PATCH v2 7/9 package/netopeer2-keystored: add package
In reply to heiko.thiery at gmail.comHello Heiko,
Sorry I didn't had the chance to review the remainder of your first iteration, but there was one main issue about the netopeer2 package. See below.
package/netopeer2-keystored/Config.in line 7
Quoted 2 lines · On Wed, 9 Oct 2019 13:26:54 +0200 heiko.thiery at gmail.com wrote:
package/netopeer2-keystored/Config.in new file +2
-0+ select BR2_PACKAGE_SYSREPO + select BR2_PACKAGE_SYSREPO
Duplicate select.
Also, sysrepo has plenty of "depends on". They *all* need to be replicated in the netopeer2 package.
Quoted 6 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +0
-0
package/netopeer2-keystored/netopeer2-keystored.mk line 8
Quoted 8 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +8
-0@@ -0,0 +1,29 @@ +################################################################################ +# +# netopeer2-keystored +# +################################################################################ + +NETOPEER2_KEYSTORED_VERSION = v0.7-r2 +NETOPEER2_KEYSTORED_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2_KEYSTORED_VERSION))
This is the exact same source code you are fetching in netopeer2-keystored, netopeer2-server and netopeer2-cli. We do not want 3 separate Buildroot packages, but only one. Of course, it can have sub-options in the Config.in file so that the user can selectively enable keystored, cli and/or server.
But generally speaking in Buildroot, the rule is one upstream project == one package. We do have a few exceptions to this rule for various reasons, but unless there's a good and strong justification, we like to keep this one upstream project == one package rule in place.
package/netopeer2-keystored/netopeer2-keystored.mk line 12
Quoted 4 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +4
-0+NETOPEER2_KEYSTORED_LICENSE = BSD-3-Clause +NETOPEER2_KEYSTORED_LICENSE_FILES = LICENSE +NETOPEER2_KEYSTORED_SUBDIR = keystored +NETOPEER2_KEYSTORED_DEPENDENCIES += host-sysrepo sysrepo
Just = for unconditional assignments.
package/netopeer2-keystored/netopeer2-keystored.mk line 14
Quoted 2 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +2
-0+ +NETOPEER2_KEYSTORED_CONF_OPTS += \
Ditto.
Quoted 5 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +5
-0+ -DKEYSTORED_DEFER_SSH_KEY=ON \ + -DSSH_KEY_INSTALL=ON \ + -DMODEL_INSTALL=ON \ + -DSYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ + -DSYSREPOCFG_EXECUTABLE=$(HOST_DIR)/bin/sysrepocfg
package/netopeer2-keystored/netopeer2-keystored.mk line 29
Quoted 10 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +10
-0+ +define NETOPEER2_KEYSTORED_PERMISSIONS + /etc/sysrepo/data/ietf-keystore.persist f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.running f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.running.lock f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.startup f 600 0 0 - - - - - + /etc/sysrepo/data/ietf-keystore.startup.lock f 600 0 0 - - - - - +endef + +$(eval $(cmake-package))
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 5/9 package/libnetconf2: add package
In reply to heiko.thiery at gmail.comHello Heiko,
Quoted 6 lines · On Wed, 9 Oct 2019 13:26:52 +0200 heiko.thiery at gmail.com wrote:
package/libnetconf2/Config.in new file +0
-0
package/libnetconf2/Config.in line 8
Quoted 8 lines
package/libnetconf2/Config.in new file +8
-0@@ -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 ?
Quoted 5 lines
package/libnetconf2/Config.in new file +5
-0+ help + libnetconf2 is a NETCONF library in C intended for building + NETCONF clients and servers. + + https://github.com/CESNET/libnetconf2
package/libnetconf2/Config.in line 23
Quoted 10 lines
package/libnetconf2/Config.in new file +10
-0+ +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
package/libnetconf2/Config.in line 33
Quoted 9 lines
package/libnetconf2/Config.in new file +9
-0+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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 3/9 package/libavl: add package
In reply to heiko.thiery at gmail.comHello Heiko,
Quoted 4 lines · On Wed, 9 Oct 2019 13:26:50 +0200 heiko.thiery at gmail.com wrote:
From: Michael Walle <[email protected]>
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>
Quoted 11 lines
--- package/Config.in | 1 + package/libavl/0001-fix-makefile.patch | 49 ++++++++++++++++++++++++++ package/libavl/Config.in | 13 +++++++ package/libavl/libavl.hash | 5 +++ package/libavl/libavl.mk | 43 ++++++++++++++++++++++ 5 files changed, 111 insertions(+) create mode 100644 package/libavl/0001-fix-makefile.patch create mode 100644 package/libavl/Config.in create mode 100644 package/libavl/libavl.hash create mode 100644 package/libavl/libavl.mk
And entry to the DEVELOPERS file needs to be added.
Quoted 6 lines
package/libavl/0001-fix-makefile.patch new file +0
-0
package/libavl/0001-fix-makefile.patch line 9
Quoted 9 lines
package/libavl/0001-fix-makefile.patch new file +9
-0@@ -0,0 +1,49 @@ +makefile: fix compilation and installation + +This was originally taken from: +https://sources.debian.org/data/main/liba/libavl/0.3.5-4/debian/patches/fix-makefile + +Unfortunately, the URL does not end in ".patch", therefore we cannot +use it in the FOO_PATCH variable directly. + +Signed-off-by: Michael Walle <[email protected]>
We need your Signed-off-by below this one.
package/libavl/0001-fix-makefile.patch line 19
Quoted 10 lines
package/libavl/0001-fix-makefile.patch new file +10
-0+ +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -6,7 +6,8 @@ + LDCONFIG ?= /sbin/ldconfig + + # Some suggestions: (-mcpu= generates i386 compatible code) +-CFLAGS ?= -O2 -fomit-frame-pointer -pipe -mcpu=i686 -w ++CFLAGS ?= -O2 -pipe -Wall -Werror ++CFLAGS += -fPIC
So this change is not really useful, because you anyway override CFLAGS. But if that's the patch as it is in Debian, please keep it as-is.
Quoted 6 lines
package/libavl/libavl.mk new file +0
-0
package/libavl/libavl.mk line 8
Quoted 8 lines
package/libavl/libavl.mk new file +8
-0@@ -0,0 +1,43 @@ +################################################################################ +# +# libavl +# +################################################################################ + +LIBAVL_VERSION = 0.3.5 +LIBAVL_SITE = http://ftp.debian.org/debian/pool/main/liba/libavl
URLs on ftp.debian.org are unfortunately not stable. We use snapshot.debian.org instead. Do a "git grep snapshot.debian.org" in Buildroot to see how other packages fetching from the Debian archive are doing this.
package/libavl/libavl.mk line 14
Quoted 6 lines
package/libavl/libavl.mk new file +6
-0+LIBAVL_SOURCE = libavl_$(LIBAVL_VERSION).orig.tar.gz +LIBAVL_LICENSE = LGPL-2.0+ +LIBAVL_LICENSE_FILES = COPYING +LIBAVL_INSTALL_STAGING = YES + +LIBAVL_CFLAGS = -fPIC
Please use:
LIBAVL_CFLAGS = $(TARGET_CFLAGS) -fPIC
package/libavl/libavl.mk line 15
Quoted 1 line
package/libavl/libavl.mk new file +1
-0+HOST_LIBAVL_CFLAGS = -fPIC
HOST_LIBAVL_CFLAGS = $(HOST_CFLAGS) -fPIC
Quoted 14 lines
package/libavl/libavl.mk new file +14
-0+ +define LIBAVL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + CFLAGS="$(LIBAVL_CFLAGS)" +endef + +define LIBAVL_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install \ + prefix=/usr DESTDIR=$(STAGING_DIR) +endef + +define LIBAVL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install \ + prefix=/usr DESTDIR=$(TARGET_DIR)
package/libavl/libavl.mk line 39
Quoted 10 lines
package/libavl/libavl.mk new file +10
-0+endef + +define HOST_LIBAVL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ + CFLAGS="$(HOST_LIBAVL_CFLAGS)" +endef + +define HOST_LIBAVL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) install \ + prefix=/usr DESTDIR=$(HOST_DIR)
For the host build/installation, semantically speaking, the correct thing is:
prefix=$(HOST_DIR)
Indeed, we don't have any "usr" in $(HOST_DIR), and prefix indicates where the software will be executing from.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 9/9 package/netopeer2-cli: add package
In reply to heiko.thiery at gmail.comQuoted 18 lines · On Wed, 9 Oct 2019 13:26:56 +0200 heiko.thiery at gmail.com wrote:
package/Config.in +1
-0@@ -1647,6 +1647,7 @@ menu "Networking" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/netopeer2-cli/Config.in" source "package/netopeer2-keystored/Config.in" source "package/netopeer2-server/Config.in" source "package/nghttp2/Config.in"package/netopeer2-cli/Config.in new file +0
-0
package/netopeer2-cli/Config.in line 4
Quoted 4 lines
package/netopeer2-cli/Config.in new file +4
-0@@ -0,0 +1,17 @@ +config BR2_PACKAGE_NETOPEER2_CLI + bool "netopeer2cli" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS
This list is not sufficient: you need to replicate all the "depends on" of the options you are "select"-ing.
package/netopeer2-cli/Config.in line 6
Quoted 2 lines
package/netopeer2-cli/Config.in new file +2
-0+ select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_LIBNETCONF2
You select this here, but it's not in the <pkg>_DEPENDENCIES of the package.
Quoted 10 lines
package/netopeer2-cli/netopeer2-cli.mk new file +4
-0@@ -0,0 +1,16 @@ +################################################################################ +# +# netopeer2-cli +#
package/netopeer2-cli/netopeer2-cli.mk line 14
Quoted 10 lines
package/netopeer2-cli/netopeer2-cli.mk new file +10
-0+################################################################################ + +NETOPEER2_CLI_VERSION = v0.7-r2 +NETOPEER2_CLI_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2_CLI_VERSION)) +NETOPEER2_CLI_LICENSE = BSD-3-Clause +NETOPEER2_CLI_LICENSE_FILES = LICENSE +NETOPEER2_CLI_SUBDIR = cli +NETOPEER2_CLI_INSTALL_STAGING = YES +NETOPEER2_CLI_DEPENDENCIES += libyang +NETOPEER2_CLI_DEPENDENCIES += sysrepo
Missing libnetconf2 in the dependencies. Also, format it like this:
NETOPEER2_CLI_DEPENDENCIES = libnetconf2 libyang sysrepo
But of course, take into account the fact that we most likely want a single package for netopeer2.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 5/9 package/libnetconf2: add package
In reply to Thomas PetazzoniHi Thomas,
Quoted 10 lines
package/libnetconf2/Config.in line 8
Quoted 8 lines
package/libnetconf2/Config.in new file +8
-0+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_SERVERI 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?
Quoted 11 lines
Quoted 11 lines
package/libnetconf2/Config.in new file +11
-0+ 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 +
Quoted 8 lines
package/libnetconf2/Config.in line 23
Quoted 4 lines
package/libnetconf2/Config.in new file +4
-0+config BR2_PACKAGE_LIBNETCONF2_TLS + bool + help + TLS support for libnetconf2Do 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.
Quoted 7 lines
package/libnetconf2/libnetconf2.mk new file +6
-0+ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON +LIBNETCONF2_DEPENDENCIES += libssh +else +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF +endif
Quoted 13 lines
package/libnetconf2/Config.in line 33
Quoted 9 lines
package/libnetconf2/Config.in new file +9
-0+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-libnetconf2We 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.
PATCH v2 5/9 package/libnetconf2: add package
Quoted 4 lines · On Wed, 9 Oct 2019 14:54:33 +0200 Heiko Thiery <[email protected]> wrote:
Quoted 1 line
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.
Quoted 2 lines
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 7/9 package/netopeer2-keystored: add package
In reply to Thomas PetazzoniQuoted 20 lines
package/netopeer2-keystored/netopeer2-keystored.mk line 8
Quoted 8 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +8
-0+################################################################################ +# +# netopeer2-keystored +# +################################################################################ + +NETOPEER2_KEYSTORED_VERSION = v0.7-r2 +NETOPEER2_KEYSTORED_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2_KEYSTORED_VERSION))This is the exact same source code you are fetching in netopeer2-keystored, netopeer2-server and netopeer2-cli. We do not want 3 separate Buildroot packages, but only one. Of course, it can have sub-options in the Config.in file so that the user can selectively enable keystored, cli and/or server.
But generally speaking in Buildroot, the rule is one upstream project == one package. We do have a few exceptions to this rule for various reasons, but unless there's a good and strong justification, we like to keep this one upstream project == one package rule in place.
Quoted 4 lines
package/netopeer2-keystored/netopeer2-keystored.mk line 12
Quoted 4 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +4
-0+NETOPEER2_KEYSTORED_LICENSE = BSD-3-Clause +NETOPEER2_KEYSTORED_LICENSE_FILES = LICENSE +NETOPEER2_KEYSTORED_SUBDIR = keystored +NETOPEER2_KEYSTORED_DEPENDENCIES += host-sysrepo sysrepo
So I have to move all the stuff from the 3 packages (netopeer2-server, netopeer2-cli, netopeer2-keystored) into one package e.g. netopeer2. Is it possible to have there 3 different build targets depending on the configuration?
PATCH v2 7/9 package/netopeer2-keystored: add package
Quoted 7 lines · On Wed, 9 Oct 2019 15:14:15 +0200 Heiko Thiery <[email protected]> wrote:
Quoted 4 lines
package/netopeer2-keystored/netopeer2-keystored.mk line 12
Quoted 4 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +4
-0+NETOPEER2_KEYSTORED_LICENSE = BSD-3-Clause +NETOPEER2_KEYSTORED_LICENSE_FILES = LICENSE +NETOPEER2_KEYSTORED_SUBDIR = keystored +NETOPEER2_KEYSTORED_DEPENDENCIES += host-sysrepo sysrepoSo I have to move all the stuff from the 3 packages (netopeer2-server, netopeer2-cli, netopeer2-keystored) into one package e.g. netopeer2.
Yes.
Quoted 2 lines
Is it possible to have there 3 different build targets depending on the configuration?
It depends on what you call build targets. Looking at the netooper2 code base, it's indeed 3 separate projects together, each with its own CMake build system. I.e, there is no top-level CMakeLists.txt to build the different components.
So we would have to do the CMake configuration/build/install steps manually, as the cmake-package infrastructure only deals with a single top-level CMake build infrastructure, which netopeer2 doesn't have.
In the light of this in the end, perhaps it makes sense to have three packages like you did. It kind of reflects the fact that even though they are stored in the same Git repo, they are three independent components each with its own build system.
Peter, Arnout, Yann, any thoughts ? See
https://github.com/CESNET/Netopeer2 for the code base.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 7/9 package/netopeer2-keystored: add package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hi,
Quoted 7 lines
In the light of this in the end, perhaps it makes sense to have three packages like you did. It kind of reflects the fact that even though they are stored in the same Git repo, they are three independent components each with its own build system.
Peter, Arnout, Yann, any thoughts ? See
https://github.com/CESNET/Netopeer2 for the code base.
Yes, that indeed seems the best solution to me as well.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 7/9 package/netopeer2-keystored: add package
In reply to Thomas PetazzoniThomas, Heiko, All,
On 2019-10-09 15:34 +0200, Thomas Petazzoni spake thusly:
Quoted 13 lines
Quoted 7 lines · On Wed, 9 Oct 2019 15:14:15 +0200 Heiko Thiery <[email protected]> wrote:
Quoted 4 lines
package/netopeer2-keystored/netopeer2-keystored.mk line 12
Quoted 4 lines
package/netopeer2-keystored/netopeer2-keystored.mk new file +4
-0+NETOPEER2_KEYSTORED_LICENSE = BSD-3-Clause +NETOPEER2_KEYSTORED_LICENSE_FILES = LICENSE +NETOPEER2_KEYSTORED_SUBDIR = keystored +NETOPEER2_KEYSTORED_DEPENDENCIES += host-sysrepo sysrepoSo I have to move all the stuff from the 3 packages (netopeer2-server, netopeer2-cli, netopeer2-keystored) into one package e.g. netopeer2.
Yes.
Quoted 7 lines
Quoted 2 lines
Is it possible to have there 3 different build targets depending on the configuration?
It depends on what you call build targets. Looking at the netooper2 code base, it's indeed 3 separate projects together, each with its own CMake build system. I.e, there is no top-level CMakeLists.txt to build the different components.
... yet they share the same set of top-level cmake modules... :-/
Which is not clean, because those CMakeModules should be provided by the libs themselves (e.g. libyang should provide FindLibYANG.cmake)...
Quoted 8 lines
So we would have to do the CMake configuration/build/install steps manually, as the cmake-package infrastructure only deals with a single top-level CMake build infrastructure, which netopeer2 doesn't have.
In the light of this in the end, perhaps it makes sense to have three packages like you did. It kind of reflects the fact that even though they are stored in the same Git repo, they are three independent components each with its own build system.
Yes.
And since they do share the same source tree, we really want to download it only once:
NETOPEER2_KEYSTORED_DL_SUBDIR = netopeer2
(similarly for the other two packages, of course).
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
v2 cover Add netopeer2 package (and dependencies)
In reply to heiko.thiery at gmail.comHi,
Am 2019-10-09 13:26, schrieb heiko.thiery at gmail.com:
Quoted 5 lines
From: Heiko Thiery <[email protected]>
This patchset contains the netopeer2 package and the required dependencies. Netopeer2 is a set of tools implementing network configuration tools based on the NETCONF Protocol.
The daemons (netconf server, sysrepod,..?) are missing the init scripts/systemd service files as well as the buildroot hooks for it, right?
-michael
PATCH v2 3/9 package/libavl: add package
In reply to Thomas PetazzoniHi Thomas,
Actually, I've prepared that package.
Am 2019-10-09 14:25, schrieb Thomas Petazzoni:
Quoted 20 lines
Quoted 4 lines · On Wed, 9 Oct 2019 13:26:50 +0200 heiko.thiery at gmail.com wrote:
From: Michael Walle <[email protected]>
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>Quoted 12 lines
--- package/Config.in | 1 + package/libavl/0001-fix-makefile.patch | 49 ++++++++++++++++++++++++++ package/libavl/Config.in | 13 +++++++ package/libavl/libavl.hash | 5 +++ package/libavl/libavl.mk | 43 ++++++++++++++++++++++ 5 files changed, 111 insertions(+) create mode 100644 package/libavl/0001-fix-makefile.patch create mode 100644 package/libavl/Config.in create mode 100644 package/libavl/libavl.hash create mode 100644 package/libavl/libavl.mk
Quoted 1 line
And entry to the DEVELOPERS file needs to be added.
I've added myself.
Quoted 10 lines
Quoted 10 lines
package/libavl/0001-fix-makefile.patch new file +3
-0@@ -0,0 +1,49 @@ +makefile: fix compilation and installation + +This was originally taken from:
Quoted 8 lines
package/libavl/0001-fix-makefile.patch line 9
Quoted 6 lines
package/libavl/0001-fix-makefile.patch new file +6
-0+https://sources.debian.org/data/main/liba/libavl/0.3.5-4/debian/patches/fix-makefile + +Unfortunately, the URL does not end in ".patch", therefore we cannot +use it in the FOO_PATCH variable directly. + +Signed-off-by: Michael Walle <[email protected]>We need your Signed-off-by below this one.
So do Heiko still need his s-o-b?
Quoted 28 lines
package/libavl/0001-fix-makefile.patch line 19
Quoted 11 lines
package/libavl/0001-fix-makefile.patch new file +10
-0+ +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -6,7 +6,8 @@ + LDCONFIG ?= /sbin/ldconfig + + # Some suggestions: (-mcpu= generates i386 compatible code) +-CFLAGS ?= -O2 -fomit-frame-pointer -pipe -mcpu=i686 -w ++CFLAGS ?= -O2 -pipe -Wall -Werror ++CFLAGS += -fPICSo this change is not really useful, because you anyway override CFLAGS. But if that's the patch as it is in Debian, please keep it as-is.
Quoted 11 lines
package/libavl/libavl.mk new file +5
-0@@ -0,0 +1,43 @@ +################################################################################ +# +# libavl +# +################################################################################
Quoted 8 lines
package/libavl/libavl.mk line 8
Quoted 3 lines
package/libavl/libavl.mk new file +3
-0+ +LIBAVL_VERSION = 0.3.5 +LIBAVL_SITE = http://ftp.debian.org/debian/pool/main/liba/libavlURLs on ftp.debian.org are unfortunately not stable. We use snapshot.debian.org instead. Do a "git grep snapshot.debian.org" in Buildroot to see how other packages fetching from the Debian archive are doing this.
Ahh I see. Will be fixed in the next version. I'll also use the snapshot url in the .hash comment.
Quoted 10 lines
package/libavl/libavl.mk line 14
Quoted 6 lines
package/libavl/libavl.mk new file +6
-0+LIBAVL_SOURCE = libavl_$(LIBAVL_VERSION).orig.tar.gz +LIBAVL_LICENSE = LGPL-2.0+ +LIBAVL_LICENSE_FILES = COPYING +LIBAVL_INSTALL_STAGING = YES + +LIBAVL_CFLAGS = -fPICPlease use:
LIBAVL_CFLAGS= $(TARGET_CFLAGS) -fPIC
will be fixed in the next version.
Quoted 4 lines
package/libavl/libavl.mk line 15
Quoted 2 lines
package/libavl/libavl.mk new file +1
-0+HOST_LIBAVL_CFLAGS = -fPIC
HOST_LIBAVL_CFLAGS= $(HOST_CFLAGS) -fPIC
dito
[..snip..]
Quoted 7 lines
For the host build/installation, semantically speaking, the correct thing is:
prefix=$(HOST_DIR)Indeed, we don't have any "usr" in $(HOST_DIR), and prefix indicates where the software will be executing from.
dito
-michael
PATCH v2 7/9 package/netopeer2-keystored: add package
In reply to Yann E. MORINHi Yann,
Quoted 9 lines
Quoted 8 lines
So we would have to do the CMake configuration/build/install steps manually, as the cmake-package infrastructure only deals with a single top-level CMake build infrastructure, which netopeer2 doesn't have.
In the light of this in the end, perhaps it makes sense to have three packages like you did. It kind of reflects the fact that even though they are stored in the same Git repo, they are three independent components each with its own build system.
Quoted 8 lines
Yes.
And since they do share the same source tree, we really want to download it only once:
NETOPEER2_KEYSTORED_DL_SUBDIR= netopeer2(similarly for the other two packages, of course).
does this mean we still have 3 packages but 2 of them use the download of e.g. netopeer2-server as the "master" package?
PATCH v2 7/9 package/netopeer2-keystored: add package
Quoted 16 lines
Hi Yann,
Quoted 14 lines
Quoted 8 lines
So we would have to do the CMake configuration/build/install steps manually, as the cmake-package infrastructure only deals with a single top-level CMake build infrastructure, which netopeer2 doesn't have.
In the light of this in the end, perhaps it makes sense to have three packages like you did. It kind of reflects the fact that even though they are stored in the same Git repo, they are three independent components each with its own build system.
Yes.
And since they do share the same source tree, we really want to download it only once:
Quoted 6 lines
Quoted 3 lines
NETOPEER2_KEYSTORED_DL_SUBDIR= netopeer2(similarly for the other two packages, of course).
does this mean we still have 3 packages but 2 of them use the download of e.g. netopeer2-server as the "master" package?
should I add the 2 other packages into a subfolder under netopeer2-server like it is done for the fftw package and the corresponding subpackages?
PATCH v2 7/9 package/netopeer2-keystored: add package
On 2019-10-09 19:08 +0200, Heiko Thiery spake thusly:
Quoted 18 lines
Quoted 18 lines
Hi Yann,
Quoted 16 lines
Quoted 8 lines
So we would have to do the CMake configuration/build/install steps manually, as the cmake-package infrastructure only deals with a single top-level CMake build infrastructure, which netopeer2 doesn't have.
In the light of this in the end, perhaps it makes sense to have three packages like you did. It kind of reflects the fact that even though they are stored in the same Git repo, they are three independent components each with its own build system.
Yes.
And since they do share the same source tree, we really want to download it only once:
NETOPEER2_KEYSTORED_DL_SUBDIR= netopeer2
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
(similarly for the other two packages, of course).
does this mean we still have 3 packages but 2 of them use the download of e.g. netopeer2-server as the "master" package?
should I add the 2 other packages into a subfolder under netopeer2-server like it is done for the fftw package and the corresponding subpackages?
You should keep doing three packages, like you initially submitted:
package/netopeer2-keystored/Config.in package/netopeer2-keystored/netopeer2-keystored.mk package/netopeer2-keystored/netopeer2-keystored.hash package/netopeer2-server/Config.in package/netopeer2-server/netopeer2-server.mk package/netopeer2-server/netopeer2-server.hash package/netopeer2-cli/Config.in package/netopeer2-cli/netopeer2-cli.hash package/netopeer2-cli/netopeer2-cli.mk
Then, you should add in the corresponding files:
NETOPEER2_KEYSTORED_DL_SUBDIR = netopeer2
NETOPEER2_SERVER_DL_SUBDIR = netopeer2
NETOPEER2_CLI_DL_SUBDIR = netopeer2
That all three of them have the same _DL_SUBDIR means that the archive will be downloaded only once, and be used for all three packages (but this _DL_SUBDIR variable is indeed not documented in our manual).
See for example: mesa3d and mesa3d-headers, or bluez5_utils and bluez5_utils-headers, for an example of using _DL_SUBDIR.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 7/9 package/netopeer2-keystored: add package
On 09/10/2019 20:15, Yann E. MORIN wrote:
[snip]
Quoted 11 lines
You should keep doing three packages, like you initially submitted:
package/netopeer2-keystored/Config.in
package/netopeer2-keystored/netopeer2-keystored.mkpackage/netopeer2-keystored/netopeer2-keystored.hash package/netopeer2-server/Config.inpackage/netopeer2-server/netopeer2-server.mkpackage/netopeer2-server/netopeer2-server.hash package/netopeer2-cli/Config.in package/netopeer2-cli/netopeer2-cli.hashpackage/netopeer2-cli/netopeer2-cli.mk
Note that two of the three hash files can be symlinks to the third one, so only
one hash file needs to be updated on a version bump.
Since the server depends on keystored, I think it makes most sense to have
keystored as the "master" hash file. But it doesn't matter that much.
Quoted 10 lines
Then, you should add in the corresponding files:
NETOPEER2_KEYSTORED_DL_SUBDIR= netopeer2
NETOPEER2_SERVER_DL_SUBDIR= netopeer2
NETOPEER2_CLI_DL_SUBDIR= netopeer2That all three of them have the same
_DL_SUBDIRmeans that the archive will be downloaded only once, and be used for all three packages (but this_DL_SUBDIRvariable is indeed not documented in our manual).
Call for contribution :-)
Regards,
Arnout
Quoted 7 lines
See for example: mesa3d and mesa3d-headers, or
bluez5_utilsand bluez5_utils-headers, for an example of using_DL_SUBDIR.Regards,
Yann E. MORIN.
PATCH v2 3/9 package/libavl: add package
In reply to Michael WalleQuoted 1 line · On Wed, 09 Oct 2019 18:04:30 +0200 Michael Walle <[email protected]> wrote:
Actually, I've prepared that package.
OK. Then it should probably be From: you, and have a Signed-off-by: you as the first line, followed by Heiko's Signed-off-by.
Quoted 3 lines
Quoted 1 line
We need your Signed-off-by below this one.
So do Heiko still need his s-o-b?
If you're the author of the Git commit, that's OK if there's only your SoB inside the patch.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 7/9 package/netopeer2-keystored: add package
In reply to Yann E. MORINHi Yann,
Quoted 14 lines
You should keep doing three packages, like you initially submitted:
b
package/netopeer2-keystored/Config.inpackage/netopeer2-keystored/netopeer2-keystored.mkpackage/netopeer2-keystored/netopeer2-keystored.hash package/netopeer2-server/Config.inpackage/netopeer2-server/netopeer2-server.mkpackage/netopeer2-server/netopeer2-server.hash package/netopeer2-cli/Config.in package/netopeer2-cli/netopeer2-cli.hashpackage/netopeer2-cli/netopeer2-cli.mkThen, you should add in the corresponding files:
Quoted 7 lines
NETOPEER2_KEYSTORED_DL_SUBDIR= netopeer2
NETOPEER2_SERVER_DL_SUBDIR= netopeer2
NETOPEER2_CLI_DL_SUBDIR= netopeer2That all three of them have the same
_DL_SUBDIRmeans that the archive will be downloaded only once, and be used for all three packages (but this_DL_SUBDIRvariable is indeed not documented in our manual).
I also have to set the <PKg>_SOURCE to the same file for all 3 packages. Is it then still necessary to set also the <PKG>_DL_SUBDIR?
PATCH v2 7/9 package/netopeer2-keystored: add package
Quoted 2 lines
I also have to set the <PKg>_SOURCE to the same file for all 3 packages. Is it then still necessary to set also the <PKG>_DL_SUBDIR?
Just can give me self the answer .. YES it is needed ;-)
PATCH v2 3/9 package/libavl: add package
In reply to Thomas PetazzoniAm 2019-10-09 21:27, schrieb Thomas Petazzoni:
Quoted 7 lines
Quoted 1 line · On Wed, 09 Oct 2019 18:04:30 +0200 Michael Walle <[email protected]> wrote:
Actually, I've prepared that package.
OK. Then it should probably be From: you, and have a Signed-off-by: you as the first line, followed by Heiko's Signed-off-by.
That was already the case, wasn't it? ;)
-michael
PATCH v2 3/9 package/libavl: add package
Quoted 4 lines · On Thu, 10 Oct 2019 10:20:05 +0200 Michael Walle <[email protected]> wrote:
Quoted 2 lines
OK. Then it should probably be From: you, and have a Signed-off-by: you as the first line, followed by Heiko's Signed-off-by.
That was already the case, wasn't it? ;)
My bad, it was indeed already the case, it was perfectly correct. Sorry for the noise :-/
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
v2 cover Add netopeer2 package (and dependencies)
In reply to Michael WalleQuoted 3 lines
The daemons (netconf server, sysrepod,..?) are missing the init
scripts/systemdservice files as well as the buildroot hooks for it, right?
With patch v3 a systemv init script was added to the packages.