diff options
author | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-10-01 18:09:01 +0200 |
---|---|---|
committer | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-10-06 23:27:05 +0200 |
commit | df63161bafa18c05318e7a87fd6422b1095e1a5a (patch) | |
tree | 4175ab5b02251741bb63ff9e157c53a509700d44 /cmake | |
parent | 85a791ac2cdd35d79c00141e748b4c68fbdafb0d (diff) |
[HICN-287] Adding hicn section to the startup.conf
Checking if the size of the CS is greater than the number of vlib buffers available and size it accordingly.
Removed unused parameters to set PIT lifetime
Change-Id: I47679466542d4338e447d9e0b956038143164020
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Modules/Packager.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake index 27a269b88..898e40bcb 100644 --- a/cmake/Modules/Packager.cmake +++ b/cmake/Modules/Packager.cmake @@ -116,6 +116,10 @@ macro(make_packages) set(CPACK_${type}_${uc}_PACKAGE_DEPENDS "${DEB_DEPS}") set(CPACK_${type}_${uc}_PACKAGE_NAME "${lc}") set(CPACK_COMPONENT_${uc}_DESCRIPTION "${${lc}_DESCRIPTION}") + + if (NOT ${${lc}_DEB_PACKAGE_CONTROL_EXTRA} STREQUAL "") + set(CPACK_DEBIAN_${uc}_PACKAGE_CONTROL_EXTRA "${${lc}_DEB_PACKAGE_CONTROL_EXTRA}") + endif() endforeach() elseif(OS_ID_LIKE MATCHES "rhel") set(CPACK_GENERATOR "RPM") @@ -152,6 +156,14 @@ macro(make_packages) set(CPACK_RPM_${uc}_PACKAGE_NAME "${package_name}") set(CPACK_${type}_${uc}_FILE_NAME "${package_name}-${rpm_ver}.${arch}.rpm") + + if (NOT ${${lc}_RPM_POST_INSTALL_SCRIPT_FILE} STREQUAL "") + set(CPACK_RPM_${uc}_POST_INSTALL_SCRIPT_FILE "${${lc}_RPM_POST_INSTALL_SCRIPT_FILE}") + endif() + + if (NOT ${${lc}_RPM_POST_UNINSTALL_SCRIPT_FILE} STREQUAL "") + set(CPACK_RPM_${uc}_POST_UNINSTALL_SCRIPT_FILE "${${lc}_RPM_POST_UNINSTALL_SCRIPT_FILE}") + endif() endforeach() endif() |