diff options
| author | liuxueli <[email protected]> | 2020-04-10 11:41:11 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-04-10 11:41:11 +0800 |
| commit | bd5f0acc18999ffe23b0a6c0ea0d113da7328c68 (patch) | |
| tree | c54a54340919280f0d92568c7db2d2a3f9addce0 | |
| parent | 2aed6fd98fecc270b7a41b5f09cb364a8c03ddb9 (diff) | |
按照规范生成devel.rpm
| -rw-r--r-- | .gitlab-ci.yml | 17 | ||||
| -rw-r--r-- | cmake/Package.cmake | 28 |
2 files changed, 13 insertions, 32 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc03b84..cb4cbda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,20 +84,3 @@ release_build_release: - build/*.rpm only: - tags - -release_build_release_devel: - stage: build - variables: - BUILD_TYPE: RelWithDebInfo - ENABLE_DEVEL_SWITCH: "ON" - PACKAGE: 1 - UPLOAD: 1 - PULP3_REPO_NAME: framework-stable-x86_64.el7 - PULP3_DIST_NAME: framework-stable-x86_64.el7 - extends: .build_by_travis - artifacts: - name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release" - paths: - - build/*.rpm - only: - - tags diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 83d6447..2703138 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -17,7 +17,7 @@ execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\ # RPM Build set(CPACK_GENERATOR "RPM") set(CPACK_RPM_PACKAGE_VENDOR "MESA") -set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") +set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes") set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on") set(CPACK_RPM_DEBUGINFO_PACKAGE "on") set(CPACK_RPM_PACKAGE_DEBUG 1) @@ -28,23 +28,21 @@ set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE) set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) -set(CPACK_RPM_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) +set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") +set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) -if(ENABLE_DEVEL) - set(CPACK_RPM_FILE_NAME "${MY_RPM_NAME_PREFIX}-devel-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") - set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-devel-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_COMPONENT_LIBRARY_GROUP "library") - set(CPACK_COMPONENT_LIBRARY_GROUP "devel") - set(CPACK_COMPONENT_HEADER_GROUP "devel") - set(CPACK_COMPONENTS_ALL LIBRARY HEADER) -else() - set(CPACK_RPM_MAIN_COMPONENT LIBRARY) - set(CPACK_RPM_FILE_NAME "${MY_RPM_NAME_PREFIX}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") - set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_COMPONENT_HEADER_GROUP "header") - set(CPACK_COMPONENT_LIBRARY_GROUP "library") - set(CPACK_COMPONENTS_ALL LIBRARY) -endif() +set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME}) +set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) + +set(CPACK_COMPONENTS_ALL LIBRARY HEADER) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") |