diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-12-12 12:41:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-12-12 12:41:15 +0000 |
| commit | d4f976ac3a063f7ebc8e55584c98502ce9a3dc3f (patch) | |
| tree | 781223ba6493b8565f72262cb6d8a32ba6aa210b /ctrl | |
| parent | 44ecc43d1680bfb5d338a649f235b15d45b00695 (diff) | |
| parent | 017f79bce9a131cb0369885321229db034488e7e (diff) | |
Merge "[HICN-449] Correct dependencies of DEB/RPM package for sysrepo."
Diffstat (limited to 'ctrl')
| -rw-r--r-- | ctrl/sysrepo-plugins/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake | 12 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/hicn-plugin/plugin/hicn_vpp_comm.c | 8 |
3 files changed, 9 insertions, 17 deletions
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, |