diff options
author | Mauro Sardara <msardara@cisco.com> | 2020-10-05 09:46:52 +0200 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2020-10-05 09:46:52 +0200 |
commit | 3640fbfa138be5c1ac3b8b84d8a813886a48dfe1 (patch) | |
tree | 04ef02b25e3dac9c1c8cbf59359ef37217b67836 /libtransport | |
parent | ecadd679e406f4ca1231dadfcbbfca61d010829c (diff) |
[HICN-643] Fix get_next_version_script and version numbers.
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: Ib1118a4b8d25209aa9dd8335ee900a326daac45b
Diffstat (limited to 'libtransport')
-rw-r--r-- | libtransport/cmake/Modules/Packaging.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libtransport/cmake/Modules/Packaging.cmake b/libtransport/cmake/Modules/Packaging.cmake index 47db0a493..274eb4c59 100644 --- a/libtransport/cmake/Modules/Packaging.cmake +++ b/libtransport/cmake/Modules/Packaging.cmake @@ -32,44 +32,44 @@ set(lib${LIBTRANSPORT}-devel_DESCRIPTION ${lib${LIBTRANSPORT}_DESCRIPTION} if ((BUILD_MEMIF_CONNECTOR OR BUILD_HICNPLUGIN) AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") set(lib${LIBTRANSPORT}_DEB_DEPENDENCIES - "lib${LIBHICN} (= stable_version), libparc (>= 1.0), libmemif, vpp (= stable_version), libhicnctrl-memif (= stable_version)" + "lib${LIBHICN} (>= stable_version), libparc (>= 1.0), libmemif (>= stable_version), vpp (>= stable_version-release), vpp (<< next_version-release), libhicnctrl-memif (>= stable_version-release), libhicnctrl-memif (<< next_version-release)" CACHE STRING "Dependencies for deb/rpm package." ) set(lib${LIBTRANSPORT}_RPM_DEPENDENCIES - "lib${LIBHICN} = stable_version, libparc >= 1.0, libmemif, vpp = stable_version, libhicnctrl-memif = stable_version" + "lib${LIBHICN} >= stable_version, libparc >= 1.0, libmemif >= stable_version, vpp >= stable_version-release, vpp < next_version-release, libhicnctrl-memif >= stable_version-release, libhicnctrl-memif < stable_version-release" CACHE STRING "Dependencies for deb/rpm package." ) set(lib${LIBTRANSPORT}-dev_DEB_DEPENDENCIES - "lib${LIBTRANSPORT} (= stable_version), libasio-dev (>= 1.10), libhicn-dev (= stable_version), libmemif-dev (= stable_version), libparc-dev (= 1.0), vpp-dev (= stable_version), hicn-plugin-dev (= stable_version)" + "lib${LIBTRANSPORT} (>= stable_version), libasio-dev (>= 1.10), libhicn-dev (>= stable_version), libmemif-dev (>= stable_version), libparc-dev (>= 1.0), vpp-dev (>= stable_version-release), vpp-dev (<< next_version-release), hicn-plugin-dev (>= stable_version-release), hicn-plugin-dev (<< next_version-release)" CACHE STRING "Dependencies for deb/rpm package." ) set(lib${LIBTRANSPORT}-dev_RPM_DEPENDENCIES - "lib${LIBTRANSPORT} = stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel = stable_version, libmemif-devel = stable_version, libparc-devel >= 1.0, vpp-devel = stable_version, hicn-plugin-dev = stable_version" + "lib${LIBTRANSPORT} >= stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel >= stable_version, libmemif-devel >= stable_version, libparc-devel >= 1.0, vpp-devel >= stable_version-release, vpp-devel < next_version-release, hicn-plugin-dev >= stable_version-release, hicn-plugin-dev < next_version-release" CACHE STRING "Dependencies for deb/rpm package." ) else() set(lib${LIBTRANSPORT}_DEB_DEPENDENCIES - "lib${LIBHICN} (= stable_version), libparc (>= 1.0)" + "lib${LIBHICN} (>= stable_version), libparc (>= 1.0)" CACHE STRING "Dependencies for deb/rpm package." ) set(lib${LIBTRANSPORT}_RPM_DEPENDENCIES - "lib${LIBHICN} = stable_version, libparc >= 1.0" + "lib${LIBHICN} >= stable_version, libparc >= 1.0" CACHE STRING "Dependencies for deb/rpm package." ) set(lib${LIBTRANSPORT}-dev_DEB_DEPENDENCIES - "lib${LIBTRANSPORT} (= stable_version), libasio-dev (>= 1.10), lib${LIBHICN}-dev (= stable_version), libparc-dev (>= 1.0)" + "lib${LIBTRANSPORT} (>= stable_version), libasio-dev (>= 1.10), lib${LIBHICN}-dev (>= stable_version), libparc-dev (>= 1.0)" CACHE STRING "Dependencies for deb/rpm package." ) set(lib${LIBTRANSPORT}-dev_RPM_DEPENDENCIES - "lib${LIBTRANSPORT} = stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel = stable_version, libparc-devel >= 1.0" + "lib${LIBTRANSPORT} >= stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel >= stable_version, libparc-devel >= 1.0" CACHE STRING "Dependencies for deb/rpm package." ) |