From 7f2bbf5f6934be58c016f0159e497fa519d14372 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Fri, 6 Nov 2020 12:42:46 +0100 Subject: [HICN-653] Cleanup build scripts. Main changes: - Next VPP version is now counted 4 months (instead of 3) from the current one - CMake will now use Ninja as generator - Build functions are gathered under build/functions.sh and they are shared instead of being duplicated in build-extras and build-packages - Various bug fixes for dependencies and versioning. Signed-off-by: Mauro Sardara Change-Id: I3f482d2c87847a465019dd0992ee9375c88bb412 Signed-off-by: Mauro Sardara --- hicn-plugin/cmake/Modules/Packaging.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'hicn-plugin/cmake/Modules') diff --git a/hicn-plugin/cmake/Modules/Packaging.cmake b/hicn-plugin/cmake/Modules/Packaging.cmake index 61453d6fd..f8d49388c 100644 --- a/hicn-plugin/cmake/Modules/Packaging.cmake +++ b/hicn-plugin/cmake/Modules/Packaging.cmake @@ -25,11 +25,21 @@ set(${HICN_PLUGIN}_DEB_DEPENDENCIES CACHE STRING "Dependencies for deb/rpm package." ) +set(${HICN_PLUGIN}-dev_DEB_DEPENDENCIES + "vpp-dev (>= stable_version-release), vpp-dev (<< next_version-release), libvppinfra-dev (>= stable_version-release), libvppinfra-dev (<< next_version-release)" + CACHE STRING "Dependencies for deb/rpm package." +) + set(${HICN_PLUGIN}_RPM_DEPENDENCIES "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." ) +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" + CACHE STRING "Dependencies for deb/rpm package." +) + set(${HICN_PLUGIN}_DEB_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/scripts/postinst" CACHE STRING "Control scripts conffiles, postinst, postrm, prerm." -- cgit 1.2.3-korg