From 317d897d444160560126af3982d107d3a34d9eb3 Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Thu, 21 Dec 2017 11:16:53 +0100 Subject: [PATCH] sysrepo: bump to latest version This patche renames the yang files so sysrepoctl does not create duplicates. Signed-off-by: Mislav Novakovic --- net/sysrepo/Makefile | 16 ++++++++-------- net/sysrepo/files/libsysrepo.default | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index 3741dbc8a9..e73d415d0f 100644 --- a/net/sysrepo/Makefile +++ b/net/sysrepo/Makefile @@ -11,12 +11,12 @@ PKG_LICENSE:=ASL-2.0 PKG_MAINTAINER:=Mislav Novakovic PKG_NAME:=sysrepo -PKG_VERSION:=0.7.1 +PKG_VERSION:=0.7.2 PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=0b36f308574a60d7ee36b1a3118b999618bb40d8 -PKG_MIRROR_HASH:=d28ff0356b6ac4b934bb45ff77973efe7964b86a54270d11e1fd06a2af9bdbc8 +PKG_SOURCE_VERSION:=8a188c515ad113adbe0d393fe54dc0cad2d0167a +PKG_MIRROR_HASH:=b8a387a6ee6692c455815226f27a572984d997ce0c0c85ac0d15a81e8e9c62a3 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_VERSION)-$(PKG_SOURCE_VERSION) @@ -96,11 +96,11 @@ define Package/libsysrepo/install $(INSTALL_CONF) $(PKG_BUILD_DIR)/yang/sysrepo-persistent-data.yang $(1)/etc/sysrepo/yang/internal $(INSTALL_DIR) $(1)/etc/sysrepo/yang - $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf-acm@2012-02-22.yang $(1)/etc/sysrepo/yang/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf-notifications.yang $(1)/etc/sysrepo/yang/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/nc-notifications.yang $(1)/etc/sysrepo/yang/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/notifications.yang $(1)/etc/sysrepo/yang/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf@2011-06-01.yang $(1)/etc/sysrepo/yang/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf-acm@2012-02-22.yang $(1)/etc/sysrepo/yang/ietf-netconf-acm@2012-02-22.yang + $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf-notifications.yang $(1)/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06..yang + $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/nc-notifications.yang $(1)/etc/sysrepo/yang/nc-notifications@2008-07-14.yang + $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/notifications.yang $(1)/etc/sysrepo/yang/notifications@2008-07-14.yang + $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf@2011-06-01.yang $(1)/etc/sysrepo/yang/ietf-netconf@2011-06-01.yang $(INSTALL_DIR) $(1)/etc/sysrepo/data/internal $(INSTALL_DIR) $(1)/etc/sysrepo/data/notifications diff --git a/net/sysrepo/files/libsysrepo.default b/net/sysrepo/files/libsysrepo.default index ae2af81f84..35b56f67de 100644 --- a/net/sysrepo/files/libsysrepo.default +++ b/net/sysrepo/files/libsysrepo.default @@ -3,27 +3,27 @@ # Warning, problems can occur if the device restarts in the middle of this uci-default script if [ -x /bin/sysrepoctl ]; then - match=$(sysrepoctl -l | grep "ietf-netconf-acm\ ") + match=$(sysrepoctl -l | grep "ietf-netconf-acm ") if [ ! "$match" ]; then sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-acm@2012-02-22.yang -p 644 fi - match=$(sysrepoctl -l | grep "ietf-netconf-notifications\ ") + match=$(sysrepoctl -l | grep "ietf-netconf-notifications ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-notifications.yang -p 600 + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06..yang -p 600 fi - match=$(sysrepoctl -l | grep "nc-notifications\ ") + match=$(sysrepoctl -l | grep "nc-notifications ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/nc-notifications.yang -p 666 + sysrepoctl --install --yang=/etc/sysrepo/yang/nc-notifications@2008-07-14.yang -p 666 fi - match=$(sysrepoctl -l | grep "notifications\ ") + match=$(sysrepoctl -l | grep "notifications ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/notifications.yang -p 666 + sysrepoctl --install --yang=/etc/sysrepo/yang/notifications@2008-07-14.yang -p 666 fi - match=$(sysrepoctl -l | grep "ietf-netconf\ ") + match=$(sysrepoctl -l | grep "ietf-netconf ") if [ ! "$match" ]; then sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf@2011-06-01.yang -p 600 fi -- 2.30.2