diff options
| -rw-r--r-- | apps/cmake/Modules/Packaging.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/Packager.cmake | 5 | ||||
| -rw-r--r-- | ctrl/facemgr/cmake/Modules/Packaging.cmake | 4 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/cmake/Modules/Packaging.cmake | 8 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake | 4 | ||||
| -rw-r--r-- | extras/router-plugin/cmake/Modules/Packaging.cmake | 4 | ||||
| -rw-r--r-- | hicn-light/cmake/Modules/Packaging.cmake | 4 | ||||
| -rw-r--r-- | hicn-plugin/cmake/Modules/Packaging.cmake | 4 | ||||
| -rw-r--r-- | lib/cmake/Modules/Packaging.cmake | 4 | ||||
| -rw-r--r-- | libtransport/cmake/Modules/Packaging.cmake | 16 |
10 files changed, 29 insertions, 28 deletions
diff --git a/apps/cmake/Modules/Packaging.cmake b/apps/cmake/Modules/Packaging.cmake index ae1054d69..6a6e34777 100644 --- a/apps/cmake/Modules/Packaging.cmake +++ b/apps/cmake/Modules/Packaging.cmake @@ -18,11 +18,11 @@ useful for testing and debugging within a hicn network." ) set(${HICN_APPS}_DEB_DEPENDENCIES - "lib${LIBTRANSPORT} (= stable_version)" + "lib${LIBTRANSPORT} (>= stable_version)" CACHE STRING "Dependencies for deb/rpm package." ) set(${HICN_APPS}_RPM_DEPENDENCIES - "lib${LIBTRANSPORT} = stable_version" + "lib${LIBTRANSPORT} >= stable_version" CACHE STRING "Dependencies for deb/rpm package." )
\ No newline at end of file diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake index 94b0e96a7..e72d71024 100644 --- a/cmake/Modules/Packager.cmake +++ b/cmake/Modules/Packager.cmake @@ -26,10 +26,10 @@ function(get_next_version VERSION NEXT_VERSION) list(GET VER_NUMBERS 0 major) list(GET VER_NUMBERS 1 minor) - math(EXPR minor "${minor} + 3") + math(EXPR minor "${minor} + 4") if (minor GREATER 12) - set(minor "1") + math(EXPR minor "${minor} % 12") math(EXPR major "${major} + 1") endif() @@ -108,6 +108,7 @@ macro(make_packages) message(STATUS "Version: ${deb_ver}") get_next_version(${tag} next_version) + message(STATUS "Next version: ${next_version}") get_cmake_property(components COMPONENTS) list(REMOVE_ITEM components "Unspecified") diff --git a/ctrl/facemgr/cmake/Modules/Packaging.cmake b/ctrl/facemgr/cmake/Modules/Packaging.cmake index bb406a423..3a7e5a85c 100644 --- a/ctrl/facemgr/cmake/Modules/Packaging.cmake +++ b/ctrl/facemgr/cmake/Modules/Packaging.cmake @@ -21,11 +21,11 @@ set(${FACEMGR}_DESCRIPTION ) set(${FACEMGR}_DEB_DEPENDENCIES - "libconfig9, libevent-dev, lib${LIBHICNCTRL} (= stable_version)" + "libconfig9, libevent-dev, lib${LIBHICNCTRL} (>= stable_version)" CACHE STRING "Dependencies for deb/rpm package." ) set(${FACEMGR}_RPM_DEPENDENCIES - "libconfig, libevent-devel, lib${LIBHICNCTRL} = stable_version" + "libconfig, libevent-devel, lib${LIBHICNCTRL} >= stable_version" CACHE STRING "Dependencies for deb/rpm package." ) diff --git a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake b/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake index bbacd0bc0..92e9d4adb 100644 --- a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake +++ b/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake @@ -32,7 +32,7 @@ if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") ) set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} (= stable_version), hicn-plugin-dev (= stable_version)" + "${LIBHICNCTRL_COMPONENT} (>= stable_version), hicn-plugin-dev (>= stable_version-release), hicn-plugin-dev (<< next_version-release)" CACHE STRING "Dependencies for deb/rpm package." ) @@ -42,7 +42,7 @@ if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") ) set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} = stable_version, hicn-plugin-dev = stable_version" + "${LIBHICNCTRL_COMPONENT} >= stable_version, hicn-plugin-dev >= stable_version-release, hicn-plugin-dev < next_version-release" CACHE STRING "Dependencies for deb/rpm package." ) @@ -53,7 +53,7 @@ else () ) set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} (= stable_version)" + "${LIBHICNCTRL_COMPONENT} (>= stable_version)" CACHE STRING "Dependencies for deb/rpm package." ) @@ -63,7 +63,7 @@ else () ) set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} = stable_version" + "${LIBHICNCTRL_COMPONENT} >= stable_version" CACHE STRING "Dependencies for deb/rpm package." ) endif()
\ No newline at end of file diff --git a/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake b/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake index 49854ec2a..323c9d01a 100644 --- a/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake +++ b/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake @@ -21,11 +21,11 @@ set(hicn-sysrepo-plugin_DESCRIPTION ) set(hicn-sysrepo-plugin_DEB_DEPENDENCIES - "hicn-plugin (= stable_version), sysrepo (>= 1.0)" + "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, sysrepo >= 1.0" + "hicn-plugin >= stable_version-release, sysrepo >= 1.0" CACHE STRING "Dependencies for deb/rpm package." ) diff --git a/extras/router-plugin/cmake/Modules/Packaging.cmake b/extras/router-plugin/cmake/Modules/Packaging.cmake index 7a6d69777..69f63971f 100644 --- a/extras/router-plugin/cmake/Modules/Packaging.cmake +++ b/extras/router-plugin/cmake/Modules/Packaging.cmake @@ -21,11 +21,11 @@ set(${HICN_EXTRA_PLUGIN}_DESCRIPTION ) set(${HICN_EXTRA_PLUGIN}_DEB_DEPENDENCIES - "vpp (= stable_version), vpp-plugin-core (= stable_version)" + "vpp (>= stable_version-release), vpp (<< next_version-release), vpp-plugin-core (>= stable_version-release), vpp-plugin-core (<< next_version-release)" CACHE STRING "Dependencies for deb/rpm package." ) set(${HICN_EXTRA_PLUGIN}_RPM_DEPENDENCIES - "vpp = stable_version vpp-plugins = stable_version" + "vpp >= stable_version-release, vpp < next_version-release, vpp-plugins >= stable_version-release, vpp-plugins < next_version-release" CACHE STRING "Dependencies for deb/rpm package." ) diff --git a/hicn-light/cmake/Modules/Packaging.cmake b/hicn-light/cmake/Modules/Packaging.cmake index f63a08825..2b9f4a7b9 100644 --- a/hicn-light/cmake/Modules/Packaging.cmake +++ b/hicn-light/cmake/Modules/Packaging.cmake @@ -21,7 +21,7 @@ set(${HICN_LIGHT}_DESCRIPTION ) set(${HICN_LIGHT}_DEB_DEPENDENCIES - "lib${LIBHICN} (= stable_version), libparc (>= 1.0)" + "lib${LIBHICN} (>= stable_version), libparc (>= 1.0)" CACHE STRING "Dependencies for deb/rpm package." ) @@ -31,7 +31,7 @@ set(${HICN_LIGHT}_DEB_PACKAGE_CONTROL_EXTRA ) set(${HICN_LIGHT}_RPM_DEPENDENCIES - "lib${LIBHICN} = stable_version, libparc >= 1.0" + "lib${LIBHICN} >= stable_version, libparc >= 1.0" CACHE STRING "Dependencies for deb/rpm package." ) diff --git a/hicn-plugin/cmake/Modules/Packaging.cmake b/hicn-plugin/cmake/Modules/Packaging.cmake index 6bc1c74ec..61453d6fd 100644 --- a/hicn-plugin/cmake/Modules/Packaging.cmake +++ b/hicn-plugin/cmake/Modules/Packaging.cmake @@ -21,12 +21,12 @@ set(${HICN_PLUGIN}_DESCRIPTION ) set(${HICN_PLUGIN}_DEB_DEPENDENCIES - "vpp (= stable_version), vpp-plugin-core (= stable_version)" + "vpp (>= stable_version-release), vpp (<< next_version-release), vpp-plugin-core (>= stable_version-release), vpp-plugin-core (<< next_version-release)" CACHE STRING "Dependencies for deb/rpm package." ) set(${HICN_PLUGIN}_RPM_DEPENDENCIES - "vpp = stable_version-release, vpp-plugins = stable_version" + "vpp >= stable_version-release, vpp < next_version-release, vpp-plugins >= stable_version-release, vpp-plugins < next_version-release" CACHE STRING "Dependencies for deb/rpm package." ) diff --git a/lib/cmake/Modules/Packaging.cmake b/lib/cmake/Modules/Packaging.cmake index 5456fd0a0..2ceda1426 100644 --- a/lib/cmake/Modules/Packaging.cmake +++ b/lib/cmake/Modules/Packaging.cmake @@ -32,11 +32,11 @@ set(lib${LIBHICN}-dev_DESCRIPTION ${${LIBHICN}_DESCRIPTION} ) set(lib${LIBHICN}-dev_DEB_DEPENDENCIES - "libhicn (= stable_version)" + "libhicn (>= stable_version)" CACHE STRING "Dependencies for deb/rpm package." ) set(lib${LIBHICN}-dev_RPM_DEPENDENCIES - "libhicn = stable_version" + "libhicn >= stable_version" CACHE STRING "Dependencies for deb/rpm package." ) 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." ) |