diff options
| author | liuxueli <[email protected]> | 2024-11-15 11:38:23 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2024-11-15 11:44:48 +0800 |
| commit | 123c0fe7933d420797fb25462ca0979499faf44d (patch) | |
| tree | 98ebaf246bdde84283c255082bde4f2cac90993e | |
| parent | 364c16835c90ee4e82153635a18fbc0e4f7cccd4 (diff) | |
bugfix: build rpm failedv2.1.9feature-adapt-rocky9-aarch64
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ci/travis.sh | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 11cfb5e..0676a7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ file(GLOB SRC ) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "/home/mesasoft/sapp_run" CACHE PATH "default install path" FORCE) + set(CMAKE_INSTALL_PREFIX "/opt/tsg/sapp/" CACHE PATH "default install path" FORCE) endif() set(DNS_DEPEND_DYN_LIB MESA_handle_logger MESA_field_stat2 MESA_prof_load) @@ -76,7 +76,6 @@ set(CPACK_RPM_LIBRARIES_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/dns/dns.conf" ) -set(CMAKE_INSTALL_PREFIX /home/mesasoft/sapp_run) install(TARGETS dns LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/dns COMPONENT LIBRARIES) install(FILES bin/dns.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/dns COMPONENT PROFILE) install(FILES bin/dns.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/conf/dns COMPONENT PROFILE) diff --git a/ci/travis.sh b/ci/travis.sh index 80df870..ff69b11 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -60,16 +60,4 @@ make if [ -n "${PACKAGE}" ]; then make package -fi - -if [ -n "${UPLOAD_RPM}" ]; then - cp ~/rpm_upload_tools.py ./ - python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm -fi - -if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then - rpm -i $SYMBOL_TARGET*debuginfo*.rpm - _symbol_file=`find /usr/lib/debug/ -name "$SYMBOL_TARGET*.so*.debug"` - cp $_symbol_file ${_symbol_file}info.${CI_COMMIT_SHORT_SHA} - sentry-cli upload-dif -t elf ${_symbol_file}info.${CI_COMMIT_SHORT_SHA} -fi +fi
\ No newline at end of file |