diff --git a/cmake/RPM.cmake b/cmake/RPM.cmake index 7ab7c687b180122c7f6aaf0a20fa5c87543a60d8..344263b809d7a4129cd5ec8a79f016abadb4916d 100644 --- a/cmake/RPM.cmake +++ b/cmake/RPM.cmake @@ -9,7 +9,9 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_PACKAGE_RELEASE ${OB_RELEASEID}) set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) # RPM package informations. +set(CPACK_RPM_RELOCATION_PATHS /usr /home/admin/oceanbase) set(CPACK_PACKAGING_INSTALL_PREFIX /home/admin/oceanbase) +list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/home/admin/oceanbase") set(CPACK_PACKAGE_NAME "oceanbase-ce") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OceanBase CE is a distributed relational database") set(CPACK_PACKAGE_VENDOR "Ant Group CO., Ltd.") @@ -77,6 +79,18 @@ install(PROGRAMS COMPONENT libs ) +# utils +install(PROGRAMS + ${CMAKE_BINARY_DIR}/tools/ob_admin/ob_admin + ${CMAKE_BINARY_DIR}/tools/ob_error/src/ob_error + DESTINATION /usr/bin + COMPONENT utils +) +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/utils_post.script "/sbin/ldconfig /home/admin/oceanbase/lib") +set(CPACK_RPM_UTILS_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_BINARY_DIR}/utils_post.script) +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/utils_postun.script "/sbin/ldconfig") +set(CPACK_RPM_UTILS_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_BINARY_DIR}/utils_postun.script) + # install cpack to make everything work include(CPack) @@ -84,4 +98,5 @@ include(CPack) add_custom_target(rpm COMMAND +make package DEPENDS - observer ob_sql_proxy_parser_static) + observer ob_admin ob_error + ob_sql_proxy_parser_static) \ No newline at end of file diff --git a/tools/ob_admin/CMakeLists.txt b/tools/ob_admin/CMakeLists.txt index 2341755f7c4e664926604bdb32566afdd24e8778..edd3f26233d20523f520bcf76aaa86aee0a07104 100644 --- a/tools/ob_admin/CMakeLists.txt +++ b/tools/ob_admin/CMakeLists.txt @@ -16,6 +16,7 @@ add_executable(ob_admin ob_admin_executor.cpp main.cpp) +set(LGPL_DEPS "-L${DEP_DIR}/lib/mariadb -lmariadb -laio") if (OB_STATIC_LINK_LGPL_DEPS) set(LGPL_DEPS "-L${DEP_DIR}/lib/mariadb -l:libmariadbclient.a -l:libaio.a") endif() @@ -31,4 +32,4 @@ target_link_libraries(ob_admin target_include_directories(ob_admin PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}) + ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file