@@ -17,8 +17,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22c95420..2ba1f44e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -402,10 +402,7 @@ check_symbol_exists(mkstemps "stdlib.h" SR_HAVE_MKSTEMPS)
- unset(CMAKE_REQUIRED_DEFINITIONS)
+@@ -558,10 +558,7 @@ target_link_libraries(sysrepo ${CMAKE_THREAD_LIBS_INIT})
+ set(CMAKE_REQUIRED_LIBRARIES pthread)
# tar
-find_program(TAR_BINARY "tar")
@@ -4,21 +4,21 @@ DESCRIPTION = ""
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ef345f161efb68c3836e6f5648b2312f"
-SRC_URI = "git://github.com/sysrepo/sysrepo.git;protocol=https;branch=devel \
+SRC_URI = "git://github.com/sysrepo/sysrepo.git;protocol=https;branch=master \
file://0001-Hardcode-correct-path-to-tar-binary.patch \
${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', \
'file://sysrepo','', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', \
'file://sysrepod.service','', d)}"
-PV = "2.2.71+git"
-SRCREV = "b828f0ab4693c613cc66efd053a146e05854d5c8"
+PV = "3.3.10+git"
+SRCREV = "ef93a1253cc97f13671759f6e7790cbf729a5ae9"
S = "${WORKDIR}/git"
DEPENDS = "libyang protobuf protobuf-c protobuf-c-native libredblack libev libnetconf2"
-FILES:${PN} += "${datadir}/yang/* ${libdir}/sysrepo-plugind/*"
+FILES:${PN} += "${datadir}/yang/* ${libdir}/sysrepo-plugind/* ${bindir}/*"
inherit cmake pkgconfig python3native python3-dir
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
@@ -27,20 +27,18 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
# Specify any options you want to pass to cmake using EXTRA_OECMAKE:
EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String=Release -DBUILD_EXAMPLES:String=False -DENABLE_TESTS:String=False -DREPOSITORY_LOC:PATH=/etc/sysrepo -DCALL_TARGET_BINS_DIRECTLY=False -DGEN_LANGUAGE_BINDINGS:String=False "
-BBCLASSEXTEND = "native nativesdk"
-
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE:${PN} = "sysrepod.service"
SYSTEMD_AUTO_ENABLE:${PN} = "disable"
RDEPENDS:${PN} += "tar"
-do_install:append () {
+do_install:append:class-target () {
install -d ${D}${sysconfdir}/sysrepo/data/notifications
install -d ${D}${sysconfdir}/sysrepo/yang
- install -o root -g root ${S}/modules/ietf-netconf-notifications.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang
- install -o root -g root ${S}/modules/ietf-netconf-with-defaults.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-with-defaults@2011-06-01.yang
- install -o root -g root ${S}/modules/ietf-netconf.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf@2011-06-01.yang
+ install -o root -g root ${S}/modules/ietf-netconf-notifications@2012-02-06.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang
+ install -o root -g root ${S}/modules/ietf-netconf-with-defaults@2011-06-01.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-with-defaults@2011-06-01.yang
+ install -o root -g root ${S}/modules/ietf-netconf@2013-09-29.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf@2013-09-29.yang
install -d ${D}${sysconfdir}/init.d
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
install -m 0775 ${UNPACKDIR}/sysrepo ${D}${sysconfdir}/init.d/
@@ -52,3 +50,8 @@ do_install:append () {
install -m 0644 ${UNPACKDIR}/sysrepod.service ${D}${systemd_system_unitdir}
fi
}
+
+BBCLASSEXTEND = "native"
+
+SYSROOT_DIRS:append = " ${bindir}"
+
With the update to libyang we need to move to a newer version of sysrepo. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- ...-Hardcode-correct-path-to-tar-binary.patch | 4 ++-- .../recipes-sysrepo/sysrepo/sysrepo_git.bb | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-)