package/libev: use host-autotools-package macro
PATCH 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 2/9 package/libssh: 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/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 3/9 package/libredblack: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
RedBlack Balanced Tree Searching and Sorting Library.
https://github.com/sysrepo/libredblack
--- DEVELOPERS | 3 +++ package/Config.in | 1 + package/libredblack/Config.in | 4 ++++ package/libredblack/libredblack.hash | 2 ++ package/libredblack/libredblack.mk | 16 ++++++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/libredblack/Config.in create mode 100644 package/libredblack/libredblack.hash create mode 100644 package/libredblack/libredblack.mk
DEVELOPERS +3 -0
@@ -1036,6 +1036,9 @@ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ +N: Heiko Thiery <[email protected]> +F: package/libredblack/ + N: Henrique Camargo <[email protected]> F: package/json-glib/
package/Config.in +1 -0
@@ -1745,6 +1745,7 @@ menu "Other" source "package/libpthread-stubs/Config.in" source "package/libpthsem/Config.in" source "package/libpwquality/Config.in" + source "package/libredblack/Config.in" source "package/libseccomp/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in"
package/libredblack/Config.in new file +4 -0
@@ -0,0 +1,4 @@ +config BR2_PACKAGE_LIBREDBLACK + bool "libredblack - red-black balanced tree algorithm" + help + RedBlack Balanced Tree Searching and Sorting Library.
package/libredblack/libredblack.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 85833e1549450e8cb06c0a94c3607d82ab2d46791acd14a5c6d35b4259ade853 libredblack-a399310d99b61eec4d3c0677573ab5dddcf9395d.tar.gz +sha256 ede9298547948ae66509e61d6e2d41ff2a8b511578644fb7ec970239fbca07b4 COPYING
package/libredblack/libredblack.mk new file +16 -0
@@ -0,0 +1,16 @@ +################################################################################ +# +# libredblack +# +################################################################################ + +LIBREDBLACK_VERSION = a399310d99b61eec4d3c0677573ab5dddcf9395d +LIBREDBLACK_SITE = $(call github,sysrepo,libredblack,$(LIBREDBLACK_VERSION)) +LIBREDBLACK_LICENSE = LGPL-2.1 +LIBREDBLACK_LICENSE_FILES = COPYING +LIBREDBLACK_INSTALL_STAGING = YES +LIBREDBLACK_CONF_OPTS = --with-rbgen=no +HOST_LIBREDBLACK_CONF_OPTS = --with-rbgen=no --without-python + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
2.20.1
PATCH 3/9 package/libredblack: add package
Hello Heiko,
Thanks for your patch series! It is pretty good overall, but of course there are a few details to improve here and there.
Quoted 18 lines · On Tue, 1 Oct 2019 16:30:16 +0200 heiko.thiery at gmail.com wrote:
package/Config.in +1
-0@@ -1745,6 +1745,7 @@ menu "Other" source "package/libpthread-stubs/Config.in" source "package/libpthsem/Config.in" source "package/libpwquality/Config.in" + source "package/libredblack/Config.in" source "package/libseccomp/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in"package/libredblack/Config.in new file +0
-0
package/libredblack/Config.in line 2
Quoted 2 lines
package/libredblack/Config.in new file +2
-0@@ -0,0 +1,4 @@ +config BR2_PACKAGE_LIBREDBLACK + bool "libredblack - red-black balanced tree algorithm"
This should be just:
bool "libredblack"
package/libredblack/Config.in line 4
Quoted 2 lines
package/libredblack/Config.in new file +2
-0+ help + RedBlack Balanced Tree Searching and Sorting Library.
Please add an empty line, followed by the URL of the project homepage. If there's nothing better than the Github page, then the Github page is fine.
Quoted 14 lines
package/libredblack/libredblack.hash new file +2
-0@@ -0,0 +1,2 @@ +sha256 85833e1549450e8cb06c0a94c3607d82ab2d46791acd14a5c6d35b4259ade853 libredblack-a399310d99b61eec4d3c0677573ab5dddcf9395d.tar.gz +sha256 ede9298547948ae66509e61d6e2d41ff2a8b511578644fb7ec970239fbca07b4 COPYINGpackage/libredblack/libredblack.mk new file +0
-0
package/libredblack/libredblack.mk line 8
Quoted 8 lines
package/libredblack/libredblack.mk new file +8
-0@@ -0,0 +1,16 @@ +################################################################################ +# +# libredblack +# +################################################################################ + +LIBREDBLACK_VERSION = a399310d99b61eec4d3c0677573ab5dddcf9395d +LIBREDBLACK_SITE = $(call github,sysrepo,libredblack,$(LIBREDBLACK_VERSION))
The Github page says "
Copy of RedBlack Balanced Tree Searching and Sorting Library -
http://libredblack.sourceforge.net/". Does it make sense to use the original version from SourceForge instead ?
package/libredblack/libredblack.mk line 9
Quoted 1 line
package/libredblack/libredblack.mk new file +1
-0+LIBREDBLACK_LICENSE = LGPL-2.1
The license is LGPL-2.1+
package/libredblack/libredblack.mk line 12
Quoted 3 lines
package/libredblack/libredblack.mk new file +3
-0+LIBREDBLACK_LICENSE_FILES = COPYING +LIBREDBLACK_INSTALL_STAGING = YES +LIBREDBLACK_CONF_OPTS = --with-rbgen=no
Since you have it for the host variant, I think it makes sense to also have --without-python here.
package/libredblack/libredblack.mk line 16
Quoted 4 lines
package/libredblack/libredblack.mk new file +4
-0+HOST_LIBREDBLACK_CONF_OPTS = --with-rbgen=no --without-python + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/9 package/libredblack: add package
Quoted 4 lines
The Github page says "
Copy of RedBlack Balanced Tree Searching and Sorting Library -
http://libredblack.sourceforge.net/". Does it make sense to use the original version from SourceForge instead ?
While taking a look into that we figured out that a (maybe more common) lib called libavl can also be used for building the sysrepo.
Therefore now we will provide a package for that libavl instead of the libredblack. This libavl is also used in debian so we think it is better maintained.
PATCH 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 | 1 + package/Config.in | 1 + package/libyang/Config.in | 7 +++++++ package/libyang/libyang.hash | 2 ++ package/libyang/libyang.mk | 21 +++++++++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/libyang/Config.in create mode 100644 package/libyang/libyang.hash create mode 100644 package/libyang/libyang.mk
DEVELOPERS +1 -0
@@ -1038,6 +1038,7 @@ F: package/python-sip/ N: Heiko Thiery <[email protected]> F: package/libredblack/ +F: package/libyang/ N: Henrique Camargo <[email protected]> F: package/json-glib/
package/Config.in +1 -0
@@ -1640,6 +1640,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 +7 -0
@@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBYANG + bool "libyang - YANG data modeling language parser and toolkit" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PCRE + help + Libyang is YANG data modeling language parser and toolkit + written (and providing API) in C.
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 +21 -0
@@ -0,0 +1,21 @@ +################################################################################ +# +# 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 + +$(eval $(cmake-package)) +$(eval $(host-cmake-package))
Signature · 1 line
2.20.1
PATCH 4/9 package/libyang: add package
Hello Heiko,
Quoted 18 lines · On Tue, 1 Oct 2019 16:30:17 +0200 heiko.thiery at gmail.com wrote:
package/Config.in +1
-0@@ -1640,6 +1640,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 +0
-0
package/libyang/Config.in line 2
Quoted 2 lines
package/libyang/Config.in new file +2
-0@@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBYANG + bool "libyang - YANG data modeling language parser and toolkit"
Should be just:
bool "libyang"
package/libyang/Config.in line 4
Quoted 2 lines
package/libyang/Config.in new file +2
-0+ depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PCRE
The home page at https://github.com/CESNET/libyang says:
note, that PCRE is supposed to be compiled with unicode support (configure's options --enable-utf and --enable-unicode-properties)
So I think you need:
select BR2_PACKAGE_PCRE_UTF
Could you make sure it is indeed needed?
package/libyang/Config.in line 7
Quoted 3 lines
package/libyang/Config.in new file +3
-0+ help + Libyang is YANG data modeling language parser and toolkit + written (and providing API) in C.
Upstream URL of the project.
Also, you need a Config.in comment like this:
comment "libyang needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
Quoted 9 lines
package/libyang/libyang.mk new file +3
-0@@ -0,0 +1,21 @@ +################################################################################ +# +# libyang
package/libyang/libyang.mk line 13
Quoted 10 lines
package/libyang/libyang.mk new file +10
-0+# +################################################################################ + +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
Just =
package/libyang/libyang.mk line 14
Quoted 1 line
package/libyang/libyang.mk new file +1
-0+HOST_LIBYANG_DEPENDENCIES += host-pcre
Just =
package/libyang/libyang.mk line 16
Quoted 2 lines
package/libyang/libyang.mk new file +2
-0+ +LIBYANG_CONF_OPTS += \
Just =
package/libyang/libyang.mk line 18
Quoted 2 lines
package/libyang/libyang.mk new file +2
-0+ -DENABLE_VALGRIND_TESTS=OFF \ + -DGEN_PYTHON_BINDINGS=OFF
What about passing the same options to the host variant ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 4/9 package/libyang: add package
Hi Thomas,
Quoted 9 lines
Should be just:
bool "libyang"
package/libyang/Config.in line 4
Quoted 2 lines
package/libyang/Config.in new file +2
-0+ depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PCREThe home page at https://github.com/CESNET/libyang says:
Quoted 8 lines
note, that PCRE is supposed to be compiled with unicode support (configure's options --enable-utf and --enable-unicode-properties)
So I think you need:
select
BR2_PACKAGE_PCRE_UTFCould you make sure it is indeed needed?
Your are right .. I added this.
--
Heiko
PATCH 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 | 60 +++++++++++++++++++ package/libnetconf2/Config.in | 10 ++++ package/libnetconf2/libnetconf2.hash | 2 + package/libnetconf2/libnetconf2.mk | 28 +++++++++ 6 files changed, 102 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-sip/ N: Heiko Thiery <[email protected]> F: package/libredblack/ F: package/libyang/ +F: package/libnetconf2/ N: Henrique Camargo <[email protected]> F: package/json-glib/
package/Config.in +1 -0
@@ -1607,6 +1607,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 +60 -0
60 lines not on this page · raw message
package/libnetconf2/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBNETCONF2 + bool "libnetconf2 - NETCONF library" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + 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.
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 +28 -0
@@ -0,0 +1,28 @@ +################################################################################ +# +# 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 libssh +HOST_LIBNETCONF2_DEPENDENCIES += host-libyang host-libssh + +LIBNETCONF2_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DENABLE_SSH=ON \ + -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF + +HOST_LIBNETCONF2_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DENABLE_SSH=ON \ + -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package))
Signature · 1 line
2.20.1
PATCH 5/9 package/libnetconf2: add package
Hello,
DEVELOPERS F: package/python-sip/ · line 1042
Quoted 9 lines · On Tue, 1 Oct 2019 16:30:18 +0200 heiko.thiery at gmail.com wrote:
DEVELOPERS +1
-0@@ -1039,6 +1039,7 @@ F: package/python-sip/ N: Heiko Thiery <[email protected]> F: package/libredblack/ F: package/libyang/ +F: package/libnetconf2/
Please keep entries sorted alphabetically.
Quoted 7 lines
package/libnetconf2/0001-Add-support-for-musl-libc.patch new file +0
-0
package/libnetconf2/0001-Add-support-for-musl-libc.patch line 7
Quoted 7 lines
package/libnetconf2/0001-Add-support-for-musl-libc.patch new file +7
-0@@ -0,0 +1,60 @@ +From 153fe40bd60499677e825e66501e8601536e0323 Mon Sep 17 00:00:00 2001 +From: Rosen Penev <[email protected]> +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.
We need your Signed-off-by here. Also, where does this patch comes from ? It should ideally be mentioned here as well.
package/libnetconf2/Config.in line 2
Quoted 8 lines
package/libnetconf2/Config.in new file +2
-0@@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBNETCONF2 + bool "libnetconf2 - NETCONF library"
Just:
bool "libnetconf2"
package/libnetconf2/Config.in line 7
Quoted 5 lines
package/libnetconf2/Config.in new file +5
-0+ depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_LIBSSH + select BR2_PACKAGE_LIBSSH_SERVER
libssh has a "depends on BR2_USE_MMU", so you need to replicate it here.
package/libnetconf2/Config.in line 10
Quoted 3 lines
package/libnetconf2/Config.in new file +3
-0+ help + libnetconf2 is a NETCONF library in C intended for building + NETCONF clients and servers.
Upstream URL should be added.
Also, you need a Config.in comment like this:
comment "libnetconf2 needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
Quoted 9 lines
package/libnetconf2/libnetconf2.mk new file +3
-0@@ -0,0 +1,28 @@ +################################################################################ +# +# libnetconf2
package/libnetconf2/libnetconf2.mk line 13
Quoted 10 lines
package/libnetconf2/libnetconf2.mk new file +10
-0+# +################################################################################ + +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 libssh +HOST_LIBNETCONF2_DEPENDENCIES += host-libyang host-libssh
Use = instead of +=
package/libnetconf2/libnetconf2.mk line 15
Quoted 2 lines
package/libnetconf2/libnetconf2.mk new file +2
-0+ +LIBNETCONF2_CONF_OPTS += \
Ditto.
package/libnetconf2/libnetconf2.mk line 17
Quoted 2 lines
package/libnetconf2/libnetconf2.mk new file +2
-0+ -DENABLE_TLS=ON \ + -DENABLE_SSH=ON \
So SSH support is optional ? Why did you made it mandatory ?
package/libnetconf2/libnetconf2.mk line 25
Quoted 8 lines
package/libnetconf2/libnetconf2.mk new file +8
-0+ -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF + +HOST_LIBNETCONF2_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DENABLE_SSH=ON \ + -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF
Use = for those unconditional assignments.
package/libnetconf2/libnetconf2.mk line 28
Quoted 3 lines
package/libnetconf2/libnetconf2.mk new file +3
-0+ +$(eval $(cmake-package)) +$(eval $(host-cmake-package))
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 5/9 package/libnetconf2: add package
Quoted 21 lines
package/libnetconf2/libnetconf2.mk line 13
Quoted 13 lines
package/libnetconf2/libnetconf2.mk new file +13
-0+################################################################################ +# +# 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 libssh +HOST_LIBNETCONF2_DEPENDENCIES += host-libyang host-libsshUse = instead of +=
Review
Quoted 2 lines
(quoted diff) +2
-0+ +LIBNETCONF2_CONF_OPTS += \Ditto.
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ -DENABLE_TLS=ON \ + -DENABLE_SSH=ON \So SSH support is optional ? Why did you made it mandatory ?
For the target application that is used we need the LIBSSH_SERVER. But you're right, this can be an optional.
I will enable it in the package that requiers it and let it disabled for the host. With this the "host-libssh" support is not needed any more.
PATCH 5/9 package/libnetconf2: add package
Hello,
Quoted 8 lines · On Fri, 4 Oct 2019 10:51:41 +0200 Heiko Thiery <[email protected]> wrote:
Quoted 1 line
So SSH support is optional ? Why did you made it mandatory ?
For the target application that is used we need the
LIBSSH_SERVER. But you're right, this can be an optional.I will enable it in the package that requiers it and let it disabled for the host. With this the "host-libssh" support is not needed any more.
OK, but if it's optional, we also want it to be optional for the target variant of the package.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 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 | 17 +++++++++++++++++ package/sysrepo/sysrepo.hash | 2 ++ package/sysrepo/sysrepo.mk | 26 ++++++++++++++++++++++++++ 5 files changed, 47 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
@@ -1040,6 +1040,7 @@ N: Heiko Thiery <[email protected]> F: package/libredblack/ F: package/libyang/ F: package/libnetconf2/ +F: package/sysrepo/ N: Henrique Camargo <[email protected]> F: package/json-glib/
package/Config.in +1 -0
@@ -1667,6 +1667,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 +17 -0
@@ -0,0 +1,17 @@ +config BR2_PACKAGE_SYSREPO + bool "sysrepo - YANG based data store" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBNETCONF2 + select BR2_PACKAGE_LIBREDBLACK + 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. + +comment "needs a toolchain w/ threads, dynamic libraray" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
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 +26 -0
@@ -0,0 +1,26 @@ +################################################################################ +# +# 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 libredblack libyang pcre protobuf-c +HOST_SYSREPO_DEPENDENCIES += host-libev host-libnetconf2 host-libredblack host-libyang host-pcre host-protobuf-c + +SYSREPO_CONF_OPTS += \ + -DGEN_PYTHON2_TESTS=OFF \ + -DENABLE_TESTS=OFF \ + -DCALL_TARGET_BINS_DIRECTLY=OFF + +HOST_SYSREPO_CONF_OPTS += \ + -DGEN_PYTHON2_TESTS=OFF \ + -DENABLE_TESTS=OFF \ + -DCALL_TARGET_BINS_DIRECTLY=OFF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package))
Signature · 1 line
2.20.1
PATCH 6/9 package/sysrepo: add package
Hello Heiko,
package/sysrepo/Config.in line 2
Quoted 8 lines · On Tue, 1 Oct 2019 16:30:19 +0200 heiko.thiery at gmail.com wrote:
package/sysrepo/Config.in new file +2
-0@@ -0,0 +1,17 @@ +config BR2_PACKAGE_SYSREPO + bool "sysrepo - YANG based data store"
Just:
bool "sysrepo"
package/sysrepo/Config.in line 5
Quoted 3 lines
package/sysrepo/Config.in new file +3
-0+ depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL
Could you add a comment that explains why it doesn't build on musl ?
Also, you're missing the BR2_USE_MMU dependency that is inherited from libnetconf2.
You need to replicate the dependencies of protobuf-c (C++, x86 || x86-64 host architecture, host gcc >= 4.8)
package/sysrepo/Config.in line 17
Quoted 12 lines
package/sysrepo/Config.in new file +12
-0+ select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBNETCONF2 + select BR2_PACKAGE_LIBREDBLACK + 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. + +comment "needs a toolchain w/ threads, dynamic libraray" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
You're missing the musl dependency, and of course BR2_USE_MMU and the other dependencies that come from protobuf-c.
Quoted 17 lines
package/sysrepo/sysrepo.hash new file +2
-0@@ -0,0 +1,2 @@ +sha256 d3066c1776a6727b96bbb3517eb646d0bb6037e8e1addcbe873cae590493843e sysrepo-v0.7.8.tar.gz +sha256 28a773bfffa828ec38c030fc8ace5f3aeb90926ec1309bbd135441c4387ce3cd LICENSEpackage/sysrepo/sysrepo.mk new file +3
-0@@ -0,0 +1,26 @@ +################################################################################ +# +# sysrepo
package/sysrepo/sysrepo.mk line 13
Quoted 10 lines
package/sysrepo/sysrepo.mk new file +10
-0+# +################################################################################ + +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 libredblack libyang pcre protobuf-c +HOST_SYSREPO_DEPENDENCIES += host-libev host-libnetconf2 host-libredblack host-libyang host-pcre host-protobuf-c
Use = instead of +=
Also, split those lines, like this:
FOO_DEPENDENCIES = \ bar \ baz \ foobar
package/sysrepo/sysrepo.mk line 23
Quoted 9 lines
package/sysrepo/sysrepo.mk new file +9
-0+SYSREPO_CONF_OPTS += \ + -DGEN_PYTHON2_TESTS=OFF \ + -DENABLE_TESTS=OFF \ + -DCALL_TARGET_BINS_DIRECTLY=OFF + +HOST_SYSREPO_CONF_OPTS += \ + -DGEN_PYTHON2_TESTS=OFF \ + -DENABLE_TESTS=OFF \ + -DCALL_TARGET_BINS_DIRECTLY=OFF
Use = as well for those unconditional assignments.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 6/9 package/sysrepo: add package
Quoted 5 lines
package/sysrepo/Config.in line 5
Quoted 3 lines
package/sysrepo/Config.in new file +3
-0+ depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSLCould you add a comment that explains why it doesn't build on musl ?
This is invalid and I removed the dependency.
PATCH 7/9 package/netopeer2server: 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/netopeer2server/Config.in | 16 ++++++++++++++++ package/netopeer2server/netopeer2server.hash | 2 ++ package/netopeer2server/netopeer2server.mk | 19 +++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/netopeer2server/Config.in create mode 100644 package/netopeer2server/netopeer2server.hash create mode 100644 package/netopeer2server/netopeer2server.mk
DEVELOPERS +1 -0
@@ -1040,6 +1040,7 @@ N: Heiko Thiery <[email protected]> F: package/libredblack/ F: package/libyang/ F: package/libnetconf2/ +F: package/netopeer2server/ F: package/sysrepo/ N: Henrique Camargo <[email protected]>
package/Config.in +1 -0
@@ -1646,6 +1646,7 @@ menu "Networking" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/netopeer2server/Config.in" source "package/nghttp2/Config.in" source "package/norm/Config.in" source "package/nss-mdns/Config.in"
package/netopeer2server/Config.in new file +16 -0
@@ -0,0 +1,16 @@ +config BR2_PACKAGE_NETOPEER2SERVER + bool "netopeer2-server" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_SYSREPO + select BR2_PACKAGE_NETOPEER2KEYSTORED + help + Netopeer2 is a set of tools implementing network + configuration tools based on the NETCONF Protocol. + + https://github.com/CESNET/Netopeer2 + +comment "needs a glibc toolchain w/ threads, dynamic libraray" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
package/netopeer2server/netopeer2server.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 59688271be4fecbbee671fc7eb3dc0538b13b4baab53e923e26eaeb33e6f7ec0 netopeer2server-v0.7-r2.tar.gz +sha256 932b75a8610a5c58e0fe0f70f8e4ebbcf3a2392acc16a88e95aebcdbdb9245e0 LICENSE
package/netopeer2server/netopeer2server.mk new file +19 -0
@@ -0,0 +1,19 @@ +################################################################################ +# +# netopeer2server +# +################################################################################ + +NETOPEER2SERVER_VERSION = v0.7-r2 +NETOPEER2SERVER_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2SERVER_VERSION)) +NETOPEER2SERVER_LICENSE = BSD-3-Clause +NETOPEER2SERVER_LICENSE_FILES = LICENSE +NETOPEER2SERVER_SUBDIR = server +NETOPEER2SERVER_INSTALL_STAGING = YES +NETOPEER2SERVER_DEPENDENCIES += libyang sysrepo + +NETOPEER2SERVER_CONF_OPTS += \ + -DENABLE_CONFIGURATION=OFF \ + -DKEYSTORED_KEYS_DIR=/etc/keystored/keys + +$(eval $(cmake-package))
Signature · 1 line
2.20.1
PATCH 8/9 package/netopeer2cli: 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/netopeer2cli/Config.in | 10 ++++++++++ package/netopeer2cli/netopeer2cli.hash | 2 ++ package/netopeer2cli/netopeer2cli.mk | 16 ++++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/netopeer2cli/Config.in create mode 100644 package/netopeer2cli/netopeer2cli.hash create mode 100644 package/netopeer2cli/netopeer2cli.mk
DEVELOPERS +1 -0
@@ -1040,6 +1040,7 @@ N: Heiko Thiery <[email protected]> F: package/libredblack/ F: package/libyang/ F: package/libnetconf2/ +F: package/netopeer2cli/ F: package/netopeer2server/ F: package/sysrepo/
package/Config.in +1 -0
@@ -1646,6 +1646,7 @@ menu "Networking" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/netopeer2cli/Config.in" source "package/netopeer2server/Config.in" source "package/nghttp2/Config.in" source "package/norm/Config.in"
package/netopeer2cli/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_NETOPEER2CLI + bool "netopeer2-cli" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_SYSREPO + help + Netopeer2 CLI is a simple command line interface to + connect to a NETCONF server (device).
package/netopeer2cli/netopeer2cli.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 59688271be4fecbbee671fc7eb3dc0538b13b4baab53e923e26eaeb33e6f7ec0 netopeer2cli-v0.7-r2.tar.gz +sha256 932b75a8610a5c58e0fe0f70f8e4ebbcf3a2392acc16a88e95aebcdbdb9245e0 LICENSE
package/netopeer2cli/netopeer2cli.mk new file +16 -0
@@ -0,0 +1,16 @@ +################################################################################ +# +# netopeer2cli +# +################################################################################ + +NETOPEER2CLI_VERSION = v0.7-r2 +NETOPEER2CLI_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2CLI_VERSION)) +NETOPEER2CLI_LICENSE = BSD-3-Clause +NETOPEER2CLI_LICENSE_FILES = LICENSE +NETOPEER2CLI_SUBDIR = cli +NETOPEER2CLI_INSTALL_STAGING = YES +NETOPEER2CLI_DEPENDENCIES += libyang +NETOPEER2CLI_DEPENDENCIES += sysrepo + +$(eval $(cmake-package))
Signature · 1 line
2.20.1
PATCH 9/9 package/netopeer2keystored: add package
In reply to heiko.thiery at gmail.comFrom: Heiko Thiery <[email protected]>
netopeer2 keystored plugin.
--- DEVELOPERS | 1 + package/Config.in | 1 + package/libnetconf2/libnetconf2.mk | 8 +++----- package/netopeer2keystored/Config.in | 16 +++++++++++++++ .../netopeer2keystored.hash | 2 ++ .../netopeer2keystored/netopeer2keystored.mk | 20 +++++++++++++++++++ 6 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 package/netopeer2keystored/Config.in create mode 100644 package/netopeer2keystored/netopeer2keystored.hash create mode 100644 package/netopeer2keystored/netopeer2keystored.mk
DEVELOPERS +1 -0
@@ -1040,6 +1040,7 @@ N: Heiko Thiery <[email protected]> F: package/libredblack/ F: package/libyang/ F: package/libnetconf2/ +F: package/netopeer2keystored/ F: package/netopeer2cli/ F: package/netopeer2server/ F: package/sysrepo/
package/Config.in +1 -0
@@ -1647,6 +1647,7 @@ menu "Networking" source "package/nanomsg/Config.in" source "package/neon/Config.in" source "package/netopeer2cli/Config.in" + source "package/netopeer2keystored/Config.in" source "package/netopeer2server/Config.in" source "package/nghttp2/Config.in" source "package/norm/Config.in"
package/libnetconf2/libnetconf2.mk +3 -5
@@ -10,17 +10,15 @@ LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause LIBNETCONF2_LICENSE_FILES = LICENSE LIBNETCONF2_DEPENDENCIES += libyang libssh -HOST_LIBNETCONF2_DEPENDENCIES += host-libyang host-libssh +HOST_LIBNETCONF2_DEPENDENCIES += host-libyang LIBNETCONF2_CONF_OPTS += \ - -DENABLE_TLS=ON \ - -DENABLE_SSH=ON \ -DENABLE_BUILD_TESTS=OFF \ -DENABLE_VALGRIND_TESTS=OFF HOST_LIBNETCONF2_CONF_OPTS += \ - -DENABLE_TLS=ON \ - -DENABLE_SSH=ON \ + -DENABLE_TLS=OFF \ + -DENABLE_SSH=OFF \ -DENABLE_BUILD_TESTS=OFF \ -DENABLE_VALGRIND_TESTS=OFF
package/netopeer2keystored/Config.in new file +16 -0
@@ -0,0 +1,16 @@ +config BR2_PACKAGE_NETOPEER2KEYSTORED + bool "netopeer2-keystore daemon" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL + 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 glibc toolchain w/ threads, dynamic libraray" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
package/netopeer2keystored/netopeer2keystored.hash new file +2 -0
@@ -0,0 +1,2 @@ +sha256 59688271be4fecbbee671fc7eb3dc0538b13b4baab53e923e26eaeb33e6f7ec0 netopeer2keystored-v0.7-r2.tar.gz +sha256 932b75a8610a5c58e0fe0f70f8e4ebbcf3a2392acc16a88e95aebcdbdb9245e0 LICENSE
package/netopeer2keystored/netopeer2keystored.mk new file +20 -0
@@ -0,0 +1,20 @@ +################################################################################ +# +# netopeer2keystored +# +################################################################################ + +NETOPEER2KEYSTORED_VERSION = v0.7-r2 +NETOPEER2KEYSTORED_SITE = $(call github,CESNET,Netopeer2,$(NETOPEER2KEYSTORED_VERSION)) +NETOPEER2KEYSTORED_LICENSE = BSD-3-Clause +NETOPEER2KEYSTORED_LICENSE_FILES = LICENSE +NETOPEER2KEYSTORED_SUBDIR = keystored +NETOPEER2KEYSTORED_INSTALL_STAGING = YES +NETOPEER2KEYSTORED_DEPENDENCIES += host-sysrepo sysrepo + +NETOPEER2KEYSTORED_CONF_OPTS += \ + -DKEYSTORED_DEFER_SSH_KEY=ON \ + -DMODEL_INSTALL=OFF \ + -DSSH_KEY_INSTALL=OFF + +$(eval $(cmake-package))
Signature · 1 line
2.20.1