diff options
| author | lijia <[email protected]> | 2021-11-04 19:53:04 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2021-11-04 19:53:04 +0800 |
| commit | a174c14be71514be4c10490c9dbc5583593b991c (patch) | |
| tree | d8d8f718a3ba76fe5f4d2e8c709194f1de159f72 | |
| parent | 042f7c51998adb71e8099ec79123e5819b4b0a0e (diff) | |
删除 cmake/package.cmake 变量 CPACK_RPM_EXECUTABLE_FILE_NAME.v4.2.62
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | cmake/Package.cmake | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97c3a1e..da3d28b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,7 +145,6 @@ envelope_rpm: FEATURE_ID: 100 APP_NAME_IN_RPM_SPEC: sapp script: - - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - export RPM_FULL_PATH=`ls $CI_PROJECT_DIR/build/*.rpm | grep -v debug | grep -v debuginfo | grep -v devel | head -n 1` - export | grep RPM_FULL_PATH - ls $RPM_FULL_PATH @@ -167,7 +166,6 @@ upload_envelope_rpm: PULP3_REPO_NAME: platform-stable-x86_64.el7 PULP3_DIST_NAME: platform-stable-x86_64.el7 script: - - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - cd $CI_PROJECT_DIR/build/ - ls -ahl *.rpm - cp ~/rpm_upload_tools.py ./ diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 73eca50..ddedb42 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -32,8 +32,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") |