X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fsysrepo%2FMakefile;h=3741dbc8a9de820883ab476456c24f32bed71f0e;hb=cc9eedb7861eed0b7de7bf1f5fdf4030cf5f3d51;hp=bfae426f3867f1eea6d17322b2b9013910e98d01;hpb=fb180b587d2c4fd2ed7330ef8de2d59cecd4c55a;p=feed%2Fpackages.git

diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile
index bfae426f38..3741dbc8a9 100644
--- a/net/sysrepo/Makefile
+++ b/net/sysrepo/Makefile
@@ -11,16 +11,18 @@ PKG_LICENSE:=ASL-2.0
 PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
 
 PKG_NAME:=sysrepo
-PKG_VERSION:=0.6.0
+PKG_VERSION:=0.7.1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e4a5705a4c5293ba121048c71899b98243d99edf
-PKG_MIRROR_HASH:=aa0fb5d7c947dd428d9f573c84edf6237c8c1a4db92dcd4d7552a68d25277a39
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+PKG_SOURCE_VERSION:=0b36f308574a60d7ee36b1a3118b999618bb40d8
+PKG_MIRROR_HASH:=d28ff0356b6ac4b934bb45ff77973efe7964b86a54270d11e1fd06a2af9bdbc8
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/sysrepo/sysrepo.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_BUILD_ROOT:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_BUILD_DIR:=$(PKG_BUILD_ROOT)
 
 CMAKE_INSTALL:=1
 
@@ -31,23 +33,23 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libsysrepo
-  SECTION:=util
+  SECTION:=utils
   CATEGORY:=Utilities
   URL:=$(PKG_SOURCE_URL)
   TITLE:=YANG-based data store library
-  DEPENDS:=+libyang +libprotobuf-c +libev +libavl
+  DEPENDS:=+libyang +libprotobuf-c +libev +libredblack +librt
 endef
 
-define Package/sysrepod
-  SECTION:=util
+define Package/sysrepo
+  SECTION:=utils
   CATEGORY:=Utilities
   URL:=$(PKG_SOURCE_URL)
-  TITLE:=YANG-based data store daemon
+  TITLE:=YANG-based data store daemon and plugin
   DEPENDS:=+libsysrepo
 endef
 
 define Package/sysrepoctl
-  SECTION:=util
+  SECTION:=utils
   CATEGORY:=Utilities
   URL:=$(PKG_SOURCE_URL)
   TITLE:=sysrepo cli tool
@@ -55,38 +57,38 @@ define Package/sysrepoctl
 endef
 
 define Package/sysrepocfg
-  SECTION:=util
+  SECTION:=utils
   CATEGORY:=Utilities
   URL:=$(PKG_SOURCE_URL)
   TITLE:=sysrepo configuration tool
   DEPENDS:=+libsysrepo
 endef
 
-define Package/sysrepo-plugind
-  SECTION:=util
-  CATEGORY:=Utilities
-  URL:=$(PKG_SOURCE_URL)
-  TITLE:=sysrepo plugin daemon
-  DEPENDS:=+libsysrepo
-endef
-
 define Package/sysrepo/description
 Sysrepo is an YANG-based configuration and operational state data store for Unix/Linux applications.
 endef
 
 CMAKE_OPTIONS += \
 	-DCMAKE_BUILD_TYPE:STRING=Release \
+	-DUSE_AVL_LIB:BOOL=FALSE \
 	-DENABLE_TESTS:BOOL=FALSE \
 	-DBUILD_EXAMPLES:BOOL=FALSE \
 	-DCMAKE_DISABLE_FIND_PACKAGE_SWIG=TRUE \
 	-DGEN_LANGUAGE_BINDINGS:BOOL=FALSE \
 	-DREPOSITORY_LOC:PATH=/etc/sysrepo \
 	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-	-DENABLE_NACM:BOOL=FALSE
+	-DENABLE_NACM:BOOL=FALSE \
+	-DREQUEST_TIMEOUT=6 \
+	-DLONG_REQUEST_TIMEOUT=30 \
+	-DCOMMIT_VERIFY_TIMEOUT=20 \
+	-DOPER_DATA_PROVIDE_TIMEOUT=4 \
+	-DNOTIF_AGE_TIMEOUT=120 \
+	-DNOTIF_TIME_WINDOW=20 \
+	-DUSE_SR_MEM_MGMT=0
 
 define Package/libsysrepo/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libsysrepo.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/src/libsysrepo.so* $(1)/usr/lib/
 
 	$(INSTALL_DIR) $(1)/etc/sysrepo/yang/internal
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/yang/sysrepo-module-dependencies.yang $(1)/etc/sysrepo/yang/internal
@@ -107,12 +109,15 @@ define Package/libsysrepo/install
 	$(INSTALL_BIN) ./files/libsysrepo.default $(1)/etc/uci-defaults/95_libsysrepo
 endef
 
-define Package/sysrepod/install
+define Package/sysrepo/install
 	$(INSTALL_DIR) $(1)/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sysrepod $(1)/bin/
 
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sysrepo-plugind $(1)/bin/
+
 	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/sysrepod.init $(1)/etc/init.d/sysrepod
+	$(INSTALL_BIN) ./files/sysrepo.init $(1)/etc/init.d/sysrepo
 endef
 
 define Package/sysrepoctl/install
@@ -125,16 +130,7 @@ define Package/sysrepocfg/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sysrepocfg $(1)/bin/
 endef
 
-define Package/sysrepo-plugind/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sysrepo-plugind $(1)/bin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/sysrepo-plugind.init $(1)/etc/init.d/sysrepo-plugind
-endef
-
 $(eval $(call BuildPackage,libsysrepo))
-$(eval $(call BuildPackage,sysrepod))
+$(eval $(call BuildPackage,sysrepo))
 $(eval $(call BuildPackage,sysrepoctl))
 $(eval $(call BuildPackage,sysrepocfg))
-$(eval $(call BuildPackage,sysrepo-plugind))