Skip to content

Commit

Permalink
add arm compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
wangzelin19961202 committed Mar 4, 2022
1 parent a109c0a commit c9d4ae0
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ unittest/**/*_test
unittest/**/**/test_*
unittest/**/**/*_test
unittest/**/unittest_*
unittest/obproxy/foo_client
unittest/obproxy/foo_server
!unittest/**/test_*.*
!unittest/**/**/test_*.*
!unittest/**/unittest_*.*
Expand Down Expand Up @@ -173,6 +175,8 @@ tools/deploy/focus_*
src/.idea/*
src/cmake-build-debug/*
CMakeLists.txt
*.gz
obproxy-tmp*
.DS_Store
src/.DS_Store
unittest/.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
TOPDIR="$(dirname $(readlink -f "$0"))"
DEP_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/deps/devel
TOOLS_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/devtools
RUNTIME_DIR=${TOPDIR}/deps/3rd/home/admin/oceanbase
RUNTIME_DIR=${TOPDIR}/deps/3rd/usr
CPU_CORES=`grep -c ^processor /proc/cpuinfo`
MAKE_ARGS=(-j $CPU_CORES)

Expand Down
3 changes: 2 additions & 1 deletion deps/3rd/dep_create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ function get_os_release() {
elif [[ "${OS_ARCH}x" == "aarch64x" ]]; then
case "$ID" in
alios)
version_ge "8.0" && compat_centos8 && return
version_ge "7.0" && compat_centos7 && return
;;
centos)
version_ge "8.0" && compat_centos7 && return
version_ge "8.0" && OS_RELEASE=8 && return
version_ge "7.0" && OS_RELEASE=7 && return
;;
esac
Expand Down
21 changes: 21 additions & 0 deletions deps/3rd/obproxy.el7.aarch64.deps
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[target]
os=7
arch=aarch64
repo=https://mirrors.aliyun.com/oceanbase/development-kit/el/7/aarch64/

[deps]
devdeps-openssl-static-1.0.1e-3.el7.aarch64.rpm
devdeps-libcurl-static-7.29.0-3.el7.aarch64.rpm
devdeps-mariadb-connector-c-3.1.12-3.el7.aarch64.rpm
devdeps-gtest-1.8.0-3.el7.aarch64.rpm
devdeps-prometheus-cpp-0.8.0-2.el7.aarch64.rpm
devdeps-grpc-1.20.1-8.el7.aarch64.rpm

[tools]
obdevtools-gcc-5.2.0-3.el7.aarch64.rpm
obdevtools-bintuils-2.30-3.el7.aarch64.rpm
obdevtools-bison-2.4.1-3.el7.aarch64.rpm
obdevtools-flex-2.5.35-3.el7.aarch64.rpm

[release]
oceanbase-ce-devel-3.1.3-10000102022030411.el7.aarch64.rpm
2 changes: 1 addition & 1 deletion deps/3rd/obproxy.el7.x86_64.deps
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ obdevtools-bison-2.4.1-3.el7.x86_64.rpm
obdevtools-flex-2.5.35-3.el7.x86_64.rpm

[release]
oceanbase-ce-sql-parser-3.1.0-1.el7.x86_64.rpm
oceanbase-ce-devel-3.1.3-10000102022030411.el7.x86_64.rpm
21 changes: 21 additions & 0 deletions deps/3rd/obproxy.el8.aarch64.deps
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[target]
os=8
arch=aarch64
repo=https://mirrors.aliyun.com/oceanbase/development-kit/el/8/aarch64/

[deps]
devdeps-openssl-static-1.0.1e-12.el8.aarch64.rpm
devdeps-libcurl-static-7.29.0-16.el8.aarch64.rpm
devdeps-mariadb-connector-c-3.1.12-16.el8.aarch64.rpm
devdeps-gtest-1.8.0-16.el8.aarch64.rpm
devdeps-prometheus-cpp-0.8.0-2.el8.aarch64.rpm
devdeps-grpc-1.20.1-8.el8.aarch64.rpm

[tools]
obdevtools-gcc-5.2.0-15.el8.aarch64.rpm
obdevtools-binutils-2.30-7.el8.aarch64.rpm
obdevtools-bison-2.4.1-9.el8.aarch64.rpm
obdevtools-flex-2.5.35-10.el8.aarch64.rpm

[release]
oceanbase-ce-devel-3.1.3-10000102022030411.el8.aarch64.rpm
2 changes: 1 addition & 1 deletion deps/3rd/obproxy.el8.x86_64.deps
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ obdevtools-bison-2.4.1-3.el8.x86_64.rpm
obdevtools-flex-2.5.35-3.el8.x86_64.rpm

[release]
oceanbase-ce-sql-parser-3.1.0-1.el8.x86_64.rpm
oceanbase-ce-devel-3.1.3-10000102022030411.el8.x86_64.rpm

0 comments on commit c9d4ae0

Please sign in to comment.