From c0bd16d50a73df4249bd575593c9df0042d6878c Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Wed, 11 Nov 2020 12:51:51 +0100
Subject: [HICN-653] Fix libmemif-{dev,devel} dependencies

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I10e901cce08d4188f62261553012295407a0f0cf
---
 extras/libmemif/CMakeLists1.patch             |  3 +++
 extras/libmemif/CMakeLists2.patch             |  2 +-
 extras/libmemif/cmake/Modules/Packaging.cmake | 16 ++++++++--------
 hicn-plugin/cmake/Modules/Packaging.cmake     |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/extras/libmemif/CMakeLists1.patch b/extras/libmemif/CMakeLists1.patch
index 91da8a7c9..adf41a417 100644
--- a/extras/libmemif/CMakeLists1.patch
+++ b/extras/libmemif/CMakeLists1.patch
@@ -50,6 +50,7 @@ endif()
 
 include_directories(src)
 set(LIBMEMIF memif)
+set(COMPONENT libmemif)
 set(LIBMEMIF_SHARED ${LIBMEMIF}.shared)
 
 set(LIBMEMIF_INCLUDE_DIRS
@@ -64,6 +65,8 @@ set(LIBMEMIF_LIBRARIES
   "" FORCE
 )
 
+include (Packaging)
+
 add_subdirectory(src)
 
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
diff --git a/extras/libmemif/CMakeLists2.patch b/extras/libmemif/CMakeLists2.patch
index 69a7e773b..20b67ea54 100644
--- a/extras/libmemif/CMakeLists2.patch
+++ b/extras/libmemif/CMakeLists2.patch
@@ -38,5 +38,5 @@ build_library(${LIBMEMIF}
   INSTALL_HEADERS ${MEMIF_HEADERS}
   LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
   INSTALL_ROOT_DIR memif
-  COMPONENT libmemif
+  COMPONENT ${COMPONENT}
 )
\ No newline at end of file
diff --git a/extras/libmemif/cmake/Modules/Packaging.cmake b/extras/libmemif/cmake/Modules/Packaging.cmake
index 7f6d53ceb..2b0f54200 100644
--- a/extras/libmemif/cmake/Modules/Packaging.cmake
+++ b/extras/libmemif/cmake/Modules/Packaging.cmake
@@ -15,30 +15,30 @@
 # Packages section
 ######################
 
-set(lib${LIBMEMIF}_DESCRIPTION
+set(${COMPONENT}_DESCRIPTION
   "Libmemif, shared memory interface"
   CACHE STRING "Description for deb/rpm package."
 )
 
-set(lib${LIBMEMIF}_DEB_DEPENDENCIES
+set(${COMPONENT}_DEB_DEPENDENCIES
   "" CACHE STRING "Dependencies for deb/rpm package."
 )
 
-set(lib${LIBMEMIF}_RPM_DEPENDENCIES
+set(${COMPONENT}_RPM_DEPENDENCIES
   "" CACHE STRING "Dependencies for deb/rpm package."
 )
 
-set(lib${LIBMEMIF}-dev_DESCRIPTION
+set(${COMPONENT}-dev_DESCRIPTION
   "Libmemif, shared memory interface header files"
   CACHE STRING "Description for deb/rpm package."
 )
 
-set(lib${LIBMEMIF}-dev_DEB_DEPENDENCIES
-  "libmemif (>= stable_version)"
+set(${COMPONENT}-dev_DEB_DEPENDENCIES
+  "${COMPONENT} (>= stable_version)"
   CACHE STRING "Dependencies for deb/rpm package."
 )
 
-set(lib${LIBMEMIF}-dev_RPM_DEPENDENCIES
-  "libmemif (>= stable_version)"
+set(${COMPONENT}-dev_RPM_DEPENDENCIES
+  "${COMPONENT} >= stable_version"
   CACHE STRING "Dependencies for deb/rpm package."
 )
diff --git a/hicn-plugin/cmake/Modules/Packaging.cmake b/hicn-plugin/cmake/Modules/Packaging.cmake
index f8d49388c..c0176e78f 100644
--- a/hicn-plugin/cmake/Modules/Packaging.cmake
+++ b/hicn-plugin/cmake/Modules/Packaging.cmake
@@ -36,7 +36,7 @@ set(${HICN_PLUGIN}_RPM_DEPENDENCIES
 )
 
 set(${HICN_PLUGIN}-dev_RPM_DEPENDENCIES
-  "vpp-dev >= stable_version-release, vpp-dev < next_version-release, libvppinfra-devel >= stable_version-release, libvppinfra-devel < next_version-release"
+  "vpp-devel >= stable_version-release, vpp-devel < next_version-release"
   CACHE STRING "Dependencies for deb/rpm package."
 )
 
-- 
cgit 1.2.3-korg