| Message ID | 20191024074644.10442-3-heiko.thiery@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add netopeer2 package (and dependencies) | expand |
Hello Heiko, On Thu, 24 Oct 2019 09:46:43 +0200 heiko.thiery@gmail.com wrote: > From: Heiko Thiery <heiko.thiery@kontron.com> > > sysrepo is a YANG-based configuration and operational state > data store for Unix/Linux applications. It is a dependency > of Netopeer, a NETCONF server. > > Signed-off-by: Heiko Thiery <heiko.thiery@kontron.com> I gave this a try, but unfortunately, host-sysrepo causes an installation failure here. I'm building this configuration: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.05.1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_SYSREPO=y # BR2_TARGET_ROOTFS_TAR is not set which fails with: -- Installing: /home/thomas/projets/buildroot/output/host/lib64/pkgconfig/libSysrepo-cpp.pc -- Installing: /usr/lib/python2.7/site-packages/_sysrepo.so CMake Error at swig/python/cmake_install.cmake:49 (file): file INSTALL cannot copy file "/home/thomas/projets/buildroot/output/build/host-sysrepo-v0.7.8/swig/python/_sysrepo.so" to "/usr/lib/python2.7/site-packages/_sysrepo.so". Call Stack (most recent call first): swig/cmake_install.cmake:112 (include) cmake_install.cmake:173 (include) It tries to install stuff in /usr/lib/python2.7/, which of course is not allowed. Another issue is that the host-sysrepo installation installs stuff to $(TARGET_DIR) which really isn't good for a host package: [100%] Built target _sysrepo Install the project... -- Install configuration: "debug" -- Installing: /home/thomas/projets/buildroot/output/target/etc/sysrepo -- Installing: /home/thomas/projets/buildroot/output/target/etc/sysrepo/yang/ -- Installing: /home/thomas/projets/buildroot/output/target/etc/sysrepo/data/ -- Installing: /home/thomas/projets/buildroot/output/target/etc/sysrepo/data/internal/ -- Installing: /home/thomas/projets/buildroot/output/host/var/run/sysrepo-subscriptions -- Installing: /home/thomas/projets/buildroot/output/host/lib64/sysrepo/plugins -- Installing: /home/thomas/projets/buildroot/output/target/etc/sysrepo/yang/internal/sysrepo-persistent-data.yang -- Installing: /home/thomas/projets/buildroot/output/target/etc/sysrepo/yang/internal/sysrepo-module-dependencies.yang -- Installing: /home/thomas/projets/buildroot/output/target/etc/sysrepo/yang/internal/sysrepo-notification-store.yang -- Installing: /home/thomas/projets/buildroot/output/host/lib64/pkgconfig/libsysrepo.pc -- Installing: /home/thomas/projets/buildroot/output/host/share/man/man1/sysrepoctl.1 See some other review comments below. > diff --git a/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch b/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch > new file mode 100644 > index 0000000000..5cb3606475 > --- /dev/null > +++ b/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch > @@ -0,0 +1,33 @@ > +From c4a2195febbd5d436f8de79d8391d8da9aa60ac4 Mon Sep 17 00:00:00 2001 > +From: Michael Walle <michael@walle.cc> > +Date: Thu, 10 Oct 2019 14:58:16 +0200 > +Subject: [PATCH 1/2] CMakeLists.txt: respect CMAKE_INSTALL_PREFIX and DESTDIR Patches should be generated with git format-patch -N so that they don't have the 1/2, 2/2 statements. > diff --git a/package/sysrepo/Config.in b/package/sysrepo/Config.in > new file mode 100644 > index 0000000000..a93e314535 > --- /dev/null > +++ b/package/sysrepo/Config.in > @@ -0,0 +1,35 @@ > +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_LIBAVL Alphabetic sorting: should be before select BR2_PACKAGE_LIBEV. > + select BR2_PACKAGE_LIBYANG > + select BR2_PACKAGE_PROTOBUF_C > + select BR2_PACKAGE_PCRE > + select BR2_PACKAGE_PCRE_UCP Ditto alphabetic sorting: pcre before protobuf. > + 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" Put the comment at the end of the Config.in file, otherwise the "sysrepo examples" option is not intended properly when looked at in menuconfig. > + > +if BR2_PACKAGE_SYSREPO > + > +config BR2_PACKAGE_SYSREPO_EXAMPLES > + bool "sysrepo examples" When it will be intended under sysrepo, repeating sysrepo is not very useful, so maybe just: bool "enable examples" > diff --git a/package/sysrepo/S50sysrepod b/package/sysrepo/S50sysrepod > new file mode 100644 > index 0000000000..05ca627fb7 > --- /dev/null > +++ b/package/sysrepo/S50sysrepod > @@ -0,0 +1,44 @@ > +#!/bin/sh > + > +DAEMON="sysrepod" > +PIDFILE="/var/run/$DAEMON.pid" > + > +SYSREPOD_ARGS="" > + > +start() { > + printf 'Starting %s: ' "$DAEMON" > + start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ > + -- $SYSREPOD_ARGS > + status=$? Indentation if four spaces until this line. > + if [ "$status" -eq 0 ]; then And then one tab starting from this line. Please check the reference init script in package/busybox/, and try to be consistent with what they do in terms of indentation. Note: this problem is also below in the same init script, as well as in the other init script. > +SYSREPO_VERSION = v0.7.8 The v should be in SYSREPO_SITE, not SYSREPO_VERSION. Thanks a lot! Thomas
> I gave this a try, but unfortunately, host-sysrepo causes an > installation failure here. > > I'm building this configuration: > > BR2_arm=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.05.1.tar.bz2" > BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y > BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y > BR2_TOOLCHAIN_EXTERNAL_LOCALE=y > # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set > BR2_TOOLCHAIN_EXTERNAL_CXX=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_SYSREPO=y > # BR2_TARGET_ROOTFS_TAR is not set Can you give me a hint how I can easily use this defconfig to reproduce this? I just used the test-pkg utility and this seems to build successfully and I struggle with setting this up.
On 27/10/2019 07:17, Heiko Thiery wrote: >> I gave this a try, but unfortunately, host-sysrepo causes an >> installation failure here. >> >> I'm building this configuration: >> >> BR2_arm=y >> BR2_TOOLCHAIN_EXTERNAL=y >> BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y >> BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y >> BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.05.1.tar.bz2" >> BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y >> BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y >> BR2_TOOLCHAIN_EXTERNAL_LOCALE=y >> # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set >> BR2_TOOLCHAIN_EXTERNAL_CXX=y >> BR2_INIT_NONE=y >> BR2_SYSTEM_BIN_SH_NONE=y >> # BR2_PACKAGE_BUSYBOX is not set >> BR2_PACKAGE_SYSREPO=y >> # BR2_TARGET_ROOTFS_TAR is not set > > Can you give me a hint how I can easily use this defconfig to > reproduce this? I just used the test-pkg utility and this seems to > build successfully and I struggle with setting this up. Just write those lines (and nothing else) to .config, remove the output directory, and to make olddefconfig; make. Regards, Arnout
> Just write those lines (and nothing else) to .config, remove the output > directory, and to make olddefconfig; make. thanks. that was it.
> I gave this a try, but unfortunately, host-sysrepo causes an > installation failure here. > > I'm building this configuration: > > BR2_arm=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.05.1.tar.bz2" > BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y > BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y > BR2_TOOLCHAIN_EXTERNAL_LOCALE=y > # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set > BR2_TOOLCHAIN_EXTERNAL_CXX=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_SYSREPO=y > # BR2_TARGET_ROOTFS_TAR is not set > > which fails with: > > -- Installing: /home/thomas/projets/buildroot/output/host/lib64/pkgconfig/libSysrepo-cpp.pc > -- Installing: /usr/lib/python2.7/site-packages/_sysrepo.so > CMake Error at swig/python/cmake_install.cmake:49 (file): > file INSTALL cannot copy file > "/home/thomas/projets/buildroot/output/build/host-sysrepo-v0.7.8/swig/python/_sysrepo.so" > to "/usr/lib/python2.7/site-packages/_sysrepo.so". > Call Stack (most recent call first): > swig/cmake_install.cmake:112 (include) > cmake_install.cmake:173 (include) fix this and rebuild your config. now it looks better. > Another issue is that the host-sysrepo installation installs stuff to > $(TARGET_DIR) which really isn't good for a host package: fix this installation issue > See some other review comments below. > > > diff --git a/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch b/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch > > new file mode 100644 > > index 0000000000..5cb3606475 > > --- /dev/null > > +++ b/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch > > @@ -0,0 +1,33 @@ > > +From c4a2195febbd5d436f8de79d8391d8da9aa60ac4 Mon Sep 17 00:00:00 2001 > > +From: Michael Walle <michael@walle.cc> > > +Date: Thu, 10 Oct 2019 14:58:16 +0200 > > +Subject: [PATCH 1/2] CMakeLists.txt: respect CMAKE_INSTALL_PREFIX and DESTDIR > > Patches should be generated with git format-patch -N so that they don't > have the 1/2, 2/2 statements. > > diff --git a/package/sysrepo/Config.in b/package/sysrepo/Config.in > > new file mode 100644 > > index 0000000000..a93e314535 > > --- /dev/null > > +++ b/package/sysrepo/Config.in > > @@ -0,0 +1,35 @@ > > +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_LIBAVL > > Alphabetic sorting: should be before select BR2_PACKAGE_LIBEV. > > > + select BR2_PACKAGE_LIBYANG > > + select BR2_PACKAGE_PROTOBUF_C > > + select BR2_PACKAGE_PCRE > > + select BR2_PACKAGE_PCRE_UCP > > Ditto alphabetic sorting: pcre before protobuf. Done > > > + 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" > > Put the comment at the end of the Config.in file, otherwise the > "sysrepo examples" option is not intended properly when looked at in > menuconfig. Done > > + > > +if BR2_PACKAGE_SYSREPO > > + > > +config BR2_PACKAGE_SYSREPO_EXAMPLES > > + bool "sysrepo examples" > > When it will be intended under sysrepo, repeating sysrepo is not very > useful, so maybe just: > > bool "enable examples" > > > diff --git a/package/sysrepo/S50sysrepod b/package/sysrepo/S50sysrepod > > new file mode 100644 > > index 0000000000..05ca627fb7 > > --- /dev/null > > +++ b/package/sysrepo/S50sysrepod > > @@ -0,0 +1,44 @@ > > +#!/bin/sh > > + > > +DAEMON="sysrepod" > > +PIDFILE="/var/run/$DAEMON.pid" > > + > > +SYSREPOD_ARGS="" > > + > > +start() { > > + printf 'Starting %s: ' "$DAEMON" > > + start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ > > + -- $SYSREPOD_ARGS > > + status=$? > > Indentation if four spaces until this line. > > > + if [ "$status" -eq 0 ]; then > > And then one tab starting from this line. Please check the reference > init script in package/busybox/, and try to be consistent with what > they do in terms of indentation. Note: this problem is also below in > the same init script, as well as in the other init script. Done > > +SYSREPO_VERSION = v0.7.8 > > The v should be in SYSREPO_SITE, not SYSREPO_VERSION. This was already fixed in last patchset (v4) Thank you again for your endurance with me ;-) -- Heiko
diff --git a/DEVELOPERS b/DEVELOPERS index c494b75bff..e5f5f8fe1a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1045,6 +1045,7 @@ F: package/python-sip/ N: Heiko Thiery <heiko.thiery@gmail.com> F: package/libnetconf2/ F: package/libyang/ +F: package/sysrepo/ N: Henrique Camargo <henrique@henriquecamargo.com> F: package/json-glib/ diff --git a/package/Config.in b/package/Config.in index d78b4c444b..7cb6f14df9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1678,6 +1678,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" diff --git a/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch b/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch new file mode 100644 index 0000000000..5cb3606475 --- /dev/null +++ b/package/sysrepo/0001-CMakeLists.txt-respect-CMAKE_INSTALL_PREFIX-and-DEST.patch @@ -0,0 +1,33 @@ +From c4a2195febbd5d436f8de79d8391d8da9aa60ac4 Mon Sep 17 00:00:00 2001 +From: Michael Walle <michael@walle.cc> +Date: Thu, 10 Oct 2019 14:58:16 +0200 +Subject: [PATCH 1/2] CMakeLists.txt: respect CMAKE_INSTALL_PREFIX and DESTDIR + +Don't use absolute pathnames in the install function. This way the files +will be installed in the correct location even if CMAKE_INSTALL_PREFIX +and DESTDIR are changed. + +Patch comes from upstream pull-request: +https://github.com/sysrepo/sysrepo/pull/1638 + +Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4521088..14b7cd36 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -357,7 +357,7 @@ if(WITH_SYSTEMD) + ${PROJECT_SOURCE_DIR}/deploy/systemd/sysrepod.service + ${PROJECT_SOURCE_DIR}/deploy/systemd/sysrepo-plugind.service + ) +- install(DIRECTORY ${PROJECT_SOURCE_DIR}/deploy/systemd/ DESTINATION "/lib/systemd/system" ++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/deploy/systemd/ DESTINATION "lib/systemd/system" + FILES_MATCHING PATTERN "*.service") + endif() + +-- +2.20.1 + diff --git a/package/sysrepo/0002-CMakeLists.txt-make-systemd-unit-dir-configurable.patch b/package/sysrepo/0002-CMakeLists.txt-make-systemd-unit-dir-configurable.patch new file mode 100644 index 0000000000..3ab75f7957 --- /dev/null +++ b/package/sysrepo/0002-CMakeLists.txt-make-systemd-unit-dir-configurable.patch @@ -0,0 +1,40 @@ +From 906927b4ee2dd0d5bd669d193fc851d14919fbd1 Mon Sep 17 00:00:00 2001 +From: Michael Walle <michael@walle.cc> +Date: Thu, 10 Oct 2019 14:38:57 +0200 +Subject: [PATCH 2/2] CMakeLists.txt: make systemd unit dir configurable + +Patch comes from upstream pull-request: +https://github.com/sysrepo/sysrepo/pull/1638 + +Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14b7cd36..14c84675 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,6 +217,9 @@ else() + message(FATAL_ERROR "Unknown file format \"${FILE_FORMAT_EXT}\", must be json, xml, or lyb.") + endif() + ++set(SYSTEMD_UNIT_DIR "lib/systemd/system/" CACHE STRING ++ "Path to the systemd service directory.") ++ + # timeouts + set(REQUEST_TIMEOUT 15 CACHE STRING + "Timeout (in seconds) for Sysrepo API requests. Set to 0 for no timeout.") +@@ -357,7 +360,8 @@ if(WITH_SYSTEMD) + ${PROJECT_SOURCE_DIR}/deploy/systemd/sysrepod.service + ${PROJECT_SOURCE_DIR}/deploy/systemd/sysrepo-plugind.service + ) +- install(DIRECTORY ${PROJECT_SOURCE_DIR}/deploy/systemd/ DESTINATION "lib/systemd/system" ++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/deploy/systemd/ ++ DESTINATION "${SYSTEMD_UNIT_DIR}" + FILES_MATCHING PATTERN "*.service") + endif() + +-- +2.20.1 + diff --git a/package/sysrepo/Config.in b/package/sysrepo/Config.in new file mode 100644 index 0000000000..a93e314535 --- /dev/null +++ b/package/sysrepo/Config.in @@ -0,0 +1,35 @@ +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_LIBAVL + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_PROTOBUF_C + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UCP + 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" + +if BR2_PACKAGE_SYSREPO + +config BR2_PACKAGE_SYSREPO_EXAMPLES + bool "sysrepo examples" + help + Enable sysrepo examples. + +endif diff --git a/package/sysrepo/S50sysrepod b/package/sysrepo/S50sysrepod new file mode 100644 index 0000000000..05ca627fb7 --- /dev/null +++ b/package/sysrepo/S50sysrepod @@ -0,0 +1,44 @@ +#!/bin/sh + +DAEMON="sysrepod" +PIDFILE="/var/run/$DAEMON.pid" + +SYSREPOD_ARGS="" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + -- $SYSREPOD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + *) + echo "Usage: $0 {start|stop|restart}" +esac diff --git a/package/sysrepo/S51sysrepo-plugind b/package/sysrepo/S51sysrepo-plugind new file mode 100644 index 0000000000..9dd3bb1101 --- /dev/null +++ b/package/sysrepo/S51sysrepo-plugind @@ -0,0 +1,49 @@ +#!/bin/sh + +DAEMON="sysrepo-plugind" +PIDFILE="/var/run/$DAEMON.pid" + +SYSREPO_PLUGIND_ARGS="" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + -- $SYSREPO_PLUGIND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + # we do not support real reload .. just restart + restart +} + +case "$1" in + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" +esac diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash new file mode 100644 index 0000000000..39ec70a2f6 --- /dev/null +++ b/package/sysrepo/sysrepo.hash @@ -0,0 +1,2 @@ +sha256 d3066c1776a6727b96bbb3517eb646d0bb6037e8e1addcbe873cae590493843e sysrepo-v0.7.8.tar.gz +sha256 28a773bfffa828ec38c030fc8ace5f3aeb90926ec1309bbd135441c4387ce3cd LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk new file mode 100644 index 0000000000..1cebf9f8a9 --- /dev/null +++ b/package/sysrepo/sysrepo.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# 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 \ + -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ + $(if $(BR2_INIT_SYSTEMD),-DWITH_SYSTEMD=ON) \ + $(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=usr/lib/systemd/system) + +# 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 + +define SYSREPO_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/sysrepo/S50sysrepod \ + $(TARGET_DIR)/etc/init.d/S50sysrepod + $(INSTALL) -m 755 -D package/sysrepo/S51sysrepo-plugind \ + $(TARGET_DIR)/etc/init.d/S51sysrepo-plugind +endef + +define SYSREPO_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/etc/systemd/systemd/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/sysrepod.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/sysrepo-plugind.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants +endef + +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))