From 017f79bce9a131cb0369885321229db034488e7e Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Thu, 12 Dec 2019 11:11:52 +0100
Subject: [HICN-449] Correct dependencies of DEB/RPM package for sysrepo.

Change-Id: Ie3f7f700617d99e7e56431afbb1b877e6cb366f9
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 ctrl/sysrepo-plugins/CMakeLists.txt                     |  6 ++----
 ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake      | 12 ++++++------
 ctrl/sysrepo-plugins/hicn-plugin/plugin/hicn_vpp_comm.c |  8 +-------
 3 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'ctrl')

diff --git a/ctrl/sysrepo-plugins/CMakeLists.txt b/ctrl/sysrepo-plugins/CMakeLists.txt
index 1a9bca18c..8c1278c1c 100644
--- a/ctrl/sysrepo-plugins/CMakeLists.txt
+++ b/ctrl/sysrepo-plugins/CMakeLists.txt
@@ -41,14 +41,12 @@ if (NOT SRPD_PLUGINS_PATH)
   message(FATAL_ERROR "Cannot get sysrepo plugins directory due to missing pkg-config, set SRPD_PLUGINS_PATH manually.")
 endif()
 
+find_package(Vpp REQUIRED)
+
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-  find_package(Vpp REQUIRED)
   find_package(HicnPlugin REQUIRED)
-  find_package(Libhicn REQUIRED)
 else()
   list(APPEND DEPENDENCIES
-    ${LIBHICN_SHARED}
-    ${LIBHICN_STATIC}
     hicn_plugin
   )
 endif()
diff --git a/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake b/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake
index f5e8426fb..0c816c446 100644
--- a/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake
+++ b/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake
@@ -15,17 +15,17 @@
 # Packages section
 ######################
 
-set(hicn_sysrepo_plugin_DESCRIPTION
+set(hicn-sysrepo-plugin_DESCRIPTION
   "A Plugin to enable hICN VPP in sysrepo."
   CACHE STRING "Description for deb/rpm package."
 )
 
-set(hicn_sysrepo_plugin_DEB_DEPENDENCIES
-  "hicn-plugin (= stable_version-release), vpp (= stable_version-release), vpp-plugins (= stable_version-release)"
+set(hicn-sysrepo-plugin_DEB_DEPENDENCIES
+  "hicn-plugin (= stable_version-release), sysrepo (>= 1.0)"
   CACHE STRING "Dependencies for deb/rpm package."
 )
 
-set(hicn_sysrepo_plugin_RPM_DEPENDENCIES
-"hicn-plugin (= stable_version-release), vpp (= stable_version-release), vpp-plugins (= stable_version-release)"
-CACHE STRING "Dependencies for deb/rpm package."
+set(hicn-sysrepo-plugin_RPM_DEPENDENCIES
+  "hicn-plugin = stable_version-release, sysrepo >= 1.0"
+  CACHE STRING "Dependencies for deb/rpm package."
 )
diff --git a/ctrl/sysrepo-plugins/hicn-plugin/plugin/hicn_vpp_comm.c b/ctrl/sysrepo-plugins/hicn-plugin/plugin/hicn_vpp_comm.c
index e028d7840..52ae6ee90 100644
--- a/ctrl/sysrepo-plugins/hicn-plugin/plugin/hicn_vpp_comm.c
+++ b/ctrl/sysrepo-plugins/hicn-plugin/plugin/hicn_vpp_comm.c
@@ -15,20 +15,14 @@
 #include "hicn_vpp_comm.h"
 #include <vapi/vapi.h>
 
-
-
-
 #define APP_NAME "hicn_plugin"
 #define MAX_OUTSTANDING_REQUESTS 4
 #define RESPONSE_QUEUE_SIZE 2
-vapi_ctx_t g_vapi_ctx_instance=NULL;
+vapi_ctx_t g_vapi_ctx_instance = NULL;
 
 // Use VAPI macros to define symbols
 
-
-
 int hicn_connect_vpp() {
-
   if (g_vapi_ctx_instance == NULL) {
     vapi_error_e rv = vapi_ctx_alloc(&g_vapi_ctx_instance);
     rv = vapi_connect(g_vapi_ctx_instance, APP_NAME, NULL,
-- 
cgit 1.2.3-korg