summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-12-11 18:45:15 +0100
committerMauro Sardara <msardara@cisco.com>2019-12-11 18:45:15 +0100
commit6ebfd6a44209de4960f806cf7986539fa4c4f286 (patch)
tree92bd087f6ec4b2eca2c3f7eed990bb75a901d24e
parentfc7dae2593f5010e36a49ec77500daee9747c636 (diff)
[HICN-430] Update extra dependencies
Change-Id: I10a505ea638688f7a08fc92bdecffead5721ae8b Signed-off-by: Mauro Sardara <msardara@cisco.com>
-rw-r--r--cmake/Modules/Packager.cmake2
-rw-r--r--extras/libyang/cmake/Modules/Packaging.cmake6
-rw-r--r--extras/sysrepo/cmake/Modules/Packaging.cmake4
3 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake
index fdda9a203..03e78959b 100644
--- a/cmake/Modules/Packager.cmake
+++ b/cmake/Modules/Packager.cmake
@@ -50,7 +50,7 @@ macro(extract_version)
)
if (NOT VER)
- set(VER "v1.0-0-gcafe")
+ set(VER "v1.1-0-gcafe")
endif()
message(STATUS "Git describe output: ${VER}")
diff --git a/extras/libyang/cmake/Modules/Packaging.cmake b/extras/libyang/cmake/Modules/Packaging.cmake
index 80dcecb76..853b18e58 100644
--- a/extras/libyang/cmake/Modules/Packaging.cmake
+++ b/extras/libyang/cmake/Modules/Packaging.cmake
@@ -23,11 +23,11 @@ set(libyang_DESCRIPTION
)
set(libyang_DEB_DEPENDENCIES
- "libpcre3 (>= 2:8.39-9)"
+ "libpcre3 (>= 2:8.38-3.1)"
CACHE STRING "Dependencies for deb/rpm package."
)
set(libyang_RPM_DEPENDENCIES
- "libpcre3 (>= >= 2:8.39-9)"
+ "pcre >= 8.32-17"
CACHE STRING "Dependencies for deb/rpm package."
-)
+) \ No newline at end of file
diff --git a/extras/sysrepo/cmake/Modules/Packaging.cmake b/extras/sysrepo/cmake/Modules/Packaging.cmake
index db407616a..2433539c7 100644
--- a/extras/sysrepo/cmake/Modules/Packaging.cmake
+++ b/extras/sysrepo/cmake/Modules/Packaging.cmake
@@ -23,12 +23,12 @@ set(sysrepo_DESCRIPTION
)
set(sysrepo_DEB_DEPENDENCIES
- "libpcre3 (>= 2:8.39-9), libev4 (>= 1:4.22-1), libprotobuf-c1 (>= 1.2.1-2), libyang (>= 0.16-r2-1), libavl1 (>=0.3.5-4)"
+ "libyang (>= 1.0)"
CACHE STRING "Dependencies for deb/rpm package."
)
set(sysrepo_RPM_DEPENDENCIES
- "libpcre3 (>= 2:8.39-9), libev4 (>= 1:4.22-1), libprotobuf-c1 (>= 1.2.1-2), libyang (>= 0.16-r2-1), libavl1 (>=0.3.5-4)"
+ "libyang >= 1.0"
CACHE STRING "Dependencies for deb/rpm package."
)