CP] add oceanbase-ce rpm or deb require oceanbase-ce-libs

cmake/DEB.cmake

@@ -9,16 +9,36 @@ include(cmake/Pack.cmake)
 # rename server package name
 set(CPACK_DEBIAN_SERVER_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
 set(CPACK_DEBIAN_PACKAGE_RELEASE ${OB_RELEASEID})
-set(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
 
+find_program(LSB_RELEASE_EXEC lsb_release)
+if(LSB_RELEASE_EXEC)
+  execute_process(
+    COMMAND ${LSB_RELEASE_EXEC} -is
+    OUTPUT_VARIABLE DEBIAN_NAME
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  string(TOLOWER "${DEBIAN_NAME}" DEBIAN_NAME)
+  execute_process(
+    COMMAND ${LSB_RELEASE_EXEC} -rs
+    OUTPUT_VARIABLE DEBIAN_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+endif(LSB_RELEASE_EXEC)
+if(DEBIAN_NAME AND DEBIAN_VERSION)
+  set(CPACK_DEBIAN_PACKAGE_RELEASE "${CPACK_DEBIAN_PACKAGE_RELEASE}${DEBIAN_NAME}${DEBIAN_VERSION}")
+endif()
+
+set(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
+set(CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS "oceanbase-ce-libs = ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}")
 set(CPACK_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
 set(CPACK_PACKAGE_CONTACT "${OceanBase_CE_HOMEPAGE_URL}")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "OceanBase")
 set(CPACK_DEBIAN_PACKAGE_SECTION "database")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "Optional")
 
+# systemd define on deb
 if (OB_BUILD_OPENSOURCE)
-  set(CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS "jq, systemd")
+  set(CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS "${CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS}, jq, systemd")
 
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tools/rpm/systemd/profile/post_install.sh.template
                 ${CMAKE_CURRENT_SOURCE_DIR}/tools/rpm/systemd/profile/postinst

cmake/Pack.cmake

@@ -23,6 +23,7 @@ endif()
 
 set(BITCODE_TO_ELF_LIST "")
 
+# systemd define on package
 if (OB_BUILD_OPENSOURCE)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tools/rpm/systemd/profile/oceanbase-service.sh.template
                 ${CMAKE_CURRENT_SOURCE_DIR}/tools/rpm/systemd/profile/oceanbase-service.sh

cmake/RPM.cmake

@@ -31,6 +31,11 @@ else()
 endif()
 
 set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
+if (CPACK_RPM_PACKAGE_RELEASE)
+  set(CPACK_RPM_SERVER_PACKAGE_REQUIRES "oceanbase-ce-libs = ${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}")
+else()
+  set(CPACK_RPM_SERVER_PACKAGE_REQUIRES "oceanbase-ce-libs = ${CPACK_PACKAGE_VERSION}")
+endif()
 set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
 set(CPACK_RPM_PACKAGE_LICENSE "Mulan PubL v2.")
 set(CPACK_RPM_DEFAULT_USER "admin")
@@ -52,8 +57,9 @@ set(CPACK_RPM_SPEC_MORE_DEFINE
 %endif
 ")
 
+# systemd define on rpm
 if (OB_BUILD_OPENSOURCE)
-  set(CPACK_RPM_PACKAGE_REQUIRES "jq, systemd")
+  set(CPACK_RPM_SERVER_PACKAGE_REQUIRES "${CPACK_RPM_SERVER_PACKAGE_REQUIRES}, jq, systemd")
 
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tools/rpm/systemd/profile/post_install.sh.template
                 ${CMAKE_CURRENT_SOURCE_DIR}/tools/rpm/systemd/profile/post_install.sh

deps/init/oceanbase.el9.aarch64.deps

@@ -13,12 +13,6 @@ os=9
 arch=aarch64
 repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/9/aarch64/
 
-#RANGE_IF_BUSINESS
-[target-obshell]
-os=8
-arch=aarch64
-repo=https://ob-yum.oceanbase-dev.com/8/aarch64/test/obshell/
-#RANGE_END
 
 [deps]
 devdeps-gtest-1.8.0-132022101316.el8.aarch64.rpm
@@ -56,11 +50,7 @@ obdevtools-llvm-11.0.1-312022092921.el8.aarch64.rpm
 [tools-deps]
 devdeps-oblogmsg-1.0-52022113019.el8.aarch64.rpm
 devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm
-#RANGE_IF_BUSINESS
+obshell-4.2.2.0-122024022614.el8.aarch64.rpm target=community
-obshell-4.2.2.0-122024022614.el8.aarch64.rpm target=obshell
-#RANGE_ELSE
-#obshell-4.2.2.0-122024022614.el8.aarch64.rpm target=community
-#RANGE_END
 
 [test-utils]
 ob-deploy-1.6.0-41.el8.aarch64.rpm target=community

deps/init/oceanbase.el9.x86_64.deps

@@ -13,12 +13,6 @@ os=9
 arch=x86_64
 repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/9/x86_64/
 
-#RANGE_IF_BUSINESS
-[target-obshell]
-os=8
-arch=x86_64
-repo=https://ob-yum.oceanbase-dev.com/8/x86_64/test/obshell/
-#RANGE_END
 
 [deps]
 devdeps-gtest-1.8.0-132022101316.el8.x86_64.rpm
@@ -59,11 +53,7 @@ obdevtools-llvm-11.0.1-312022092921.el8.x86_64.rpm
 [tools-deps]
 devdeps-oblogmsg-1.0-52022113019.el8.x86_64.rpm
 devdeps-rocksdb-6.22.1.1-52022100420.el8.x86_64.rpm
-#RANGE_IF_BUSINESS
+obshell-4.2.2.0-122024022614.el8.x86_64.rpm target=community
-obshell-4.2.2.0-122024022614.el8.x86_64.rpm target=obshell
-#RANGE_ELSE
-#obshell-4.2.2.0-122024022614.el8.x86_64.rpm target=community
-#RANGE_END
 
 [test-utils]
 ob-deploy-1.6.0-41.el8.x86_64.rpm target=community