diff options
| author | lijia <[email protected]> | 2021-11-05 15:54:01 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2021-11-05 15:54:01 +0800 |
| commit | a3b0443f971f413e694639c5268c978809024ca1 (patch) | |
| tree | 7df2e01b148ffaa8c8cd15cdebed5007d45370f1 | |
| parent | 4afb300dd6de61b2930f04972bab74e8cef2f20b (diff) | |
修复CI构建RPM包名称.v4.2.64
| -rw-r--r-- | cmake/Package.cmake | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index b982dbb..ca27732 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -12,7 +12,14 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}") set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}") -execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION) + + + +execute_process(COMMAND bash -c "echo CPACK_PACKAGE_VERSION=$CPACK_PACKAGE_VERSION" >> /tmp/ci.log) + +execute_process(COMMAND bash -c "echo CPACK_RPM_EXECUTABLE_FILE_NAME=$CPACK_RPM_EXECUTABLE_FILE_NAME" >> /tmp/ci.log) + +execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $(NF-1)\".\"$NF}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION) execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt) @@ -20,11 +27,10 @@ SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt) # RPM Build set(CPACK_GENERATOR "RPM") set(CPACK_RPM_PACKAGE_VENDOR "MESA") -set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes") +set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") #set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on") set(CPACK_RPM_PACKAGE_RELEASE_DIST "on") set(CPACK_RPM_DEBUGINFO_PACKAGE "on") -set(CPACK_RPM_PACKAGE_DEBUG 1) set(CPACK_RPM_COMPONENT_INSTALL ON) set(CPACK_COMPONENTS_IGNORE_GROUPS 1) @@ -33,8 +39,8 @@ set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") set(CPACK_COMPONENT_EXECUTABLE_REQUIRED TRUE) set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) -#set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -#set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable") set(CPACK_COMPONENT_LIBRARY_GROUP "executable") |