database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-5595: Wrong metadata in CMAPI packages.

Browse Source 
[fix] cmapi packages metadata version format for debian systems and version + release in RHEL systems
This commit is contained in:
mariadb-AlanMologorsky
2023-10-24 05:04:26 +03:00
committed by Leonid Fedorov
parent e3c5e10207
commit 2ccfc149c6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmapi/CMakeLists.txt
View File

@ -102,7 +102,6 @@ IF(RPM)
# but it's doesn't work because of some CPACK versions don't add definitions
# to the spec file using CPACK_RPM_SPEC_MORE_DEFINE
SET(CPACK_RPM_PACKAGE_VERSION ${CMAPI_PACKAGE_VERSION})
SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
@ -139,13 +138,15 @@ IF(RPM)
SET(CPACK_RPM_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}-${CMAPI_VERSION_RELEASE}.${OS_VERSION}.${CMAKE_HOST_SYSTEM_PROCESSOR}")
MESSAGE(STATUS "CPACK_RPM_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME}")
SET(CPACK_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME})
# version and release the same as in Columnstore engine package
SET(CPACK_RPM_PACKAGE_VERSION "${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}")
SET(CPACK_RPM_PACKAGE_RELEASE "${CMAPI_VERSION_RELEASE}.${OS_VERSION}")
ENDIF()
OPTION(DEB "Build a DEB" OFF)
IF(DEB)
SET(CPACK_GENERATOR "DEB")
SET(CPACK_DEBIAN_PACKAGE_VERSION ${CMAPI_PACKAGE_VERSION})
# TODO: different names in deb and rpm packages, fix it in next releases.
STRING(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_DEBIAN_PACKAGE_NAME)
STRING(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_PACKAGE_NAME)
@ -172,6 +173,9 @@ IF(DEB)
SET(CPACK_DEBIAN_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}_${ARCHITECTURE}")
MESSAGE(STATUS "CPACK_DEBIAN_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME}")
SET(CPACK_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME})
# making possible to store several cmapi packages in one repo (same version as in
# Columnstore engine package)
SET(CPACK_DEBIAN_PACKAGE_VERSION "${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}")
ENDIF()
INCLUDE (CPack)