diff options
| author | songyanchao <[email protected]> | 2023-06-15 11:48:31 +0000 |
|---|---|---|
| committer | songyanchao <[email protected]> | 2023-06-16 06:25:31 +0000 |
| commit | ec05f44cea7763e72654b7b9b3161db8322912b7 (patch) | |
| tree | 8aa746c6fc8be54096ae96e4677bf5ecf1605976 /cmake | |
| parent | a6fb6bb69f99d7dac3037882568c1e05044ff013 (diff) | |
🐎 ci(DPISDN-9): 修改py脚本编译流程，以解决build-id相同导致无法在同一台设备上安装多个rpm的问题
修改py脚本编译流程，以解决build-id相同导致无法在同一台设备上安装多个rpm的问题
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Package.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index b741720..30f6eae 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -28,9 +28,9 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.i # Must uninstall the debug package before install release package if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd") + set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-${MACHINE}") else() - set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-debug") + set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-debug-${MACHINE}") endif() # setup %config(noreplace) |