Merge branch 'bwi/v2.0.4' of http://192.168.68.6:3001/bartoszek/rublon-ssh into bwi/v2.0.4
This commit is contained in:
commit
b7d75429db
@ -27,7 +27,7 @@ execute_process (
|
||||
OUTPUT_VARIABLE outOS
|
||||
)
|
||||
if ( ${outOS} MATCHES "ubuntu" OR ${outOS} MATCHES "debian" )
|
||||
set(CPACK_DEBIAN_PAM-DEV_PACKAGE_NAME, yes)
|
||||
set(CPACK_DEBIAN_PAM-DEV_PACKAGE_NAME, YES)
|
||||
set(CPACK_DEB_COMPONENT_INSTALL YES)
|
||||
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS YES)
|
||||
|
||||
@ -44,14 +44,14 @@ set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postinst;${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postrm")
|
||||
else()
|
||||
set(CPACK_GENERATOR "RPM")
|
||||
set(CPACK_RPM_COMPONENT_INSTALL ON)
|
||||
set(CPACK_RPM_COMPONENT_INSTALL YES)
|
||||
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/rublon/service/helpers")
|
||||
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
|
||||
"/usr/lib64/security"
|
||||
)
|
||||
|
||||
set(CPACK_RPM_SPEC_MORE_DEFINE "%define _build_id_links none")
|
||||
set(CPACK_RPM_PAM-DEV_PACKAGE_NAME, yes)
|
||||
set(CPACK_RPM_PAM-DEV_PACKAGE_NAME, YES)
|
||||
execute_process (
|
||||
COMMAND bash -c "awk -F= '/^PLATFORM_ID=/{print \$2}' /etc/os-release | cut -d '\:' -f2- | tr -d '\"'"
|
||||
OUTPUT_VARIABLE VERSION
|
||||
|
||||
Loading…
Reference in New Issue
Block a user