From c9d4ae0fd3d92410c59dfb15fb0488ac9307f4c5 Mon Sep 17 00:00:00 2001
From: "wangzelin.wzl" <wangzelin.wzl@alibaba-inc.com>
Date: Fri, 4 Mar 2022 19:25:05 +0800
Subject: [PATCH] add arm compatibility

---
 .gitignore                        |  4 ++++
 build.sh                          |  2 +-
 deps/3rd/dep_create.sh            |  3 ++-
 deps/3rd/obproxy.el7.aarch64.deps | 21 +++++++++++++++++++++
 deps/3rd/obproxy.el7.x86_64.deps  |  2 +-
 deps/3rd/obproxy.el8.aarch64.deps | 21 +++++++++++++++++++++
 deps/3rd/obproxy.el8.x86_64.deps  |  2 +-
 7 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 deps/3rd/obproxy.el7.aarch64.deps
 create mode 100644 deps/3rd/obproxy.el8.aarch64.deps

diff --git a/.gitignore b/.gitignore
index 9b8d3be..f2440b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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_*.*
@@ -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
diff --git a/build.sh b/build.sh
index 8b79cb3..c93bc75 100755
--- a/build.sh
+++ b/build.sh
@@ -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)
 
diff --git a/deps/3rd/dep_create.sh b/deps/3rd/dep_create.sh
index d8a75cf..6ea9d22 100644
--- a/deps/3rd/dep_create.sh
+++ b/deps/3rd/dep_create.sh
@@ -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
diff --git a/deps/3rd/obproxy.el7.aarch64.deps b/deps/3rd/obproxy.el7.aarch64.deps
new file mode 100644
index 0000000..7da7a80
--- /dev/null
+++ b/deps/3rd/obproxy.el7.aarch64.deps
@@ -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
diff --git a/deps/3rd/obproxy.el7.x86_64.deps b/deps/3rd/obproxy.el7.x86_64.deps
index 5ebd3a4..4004e36 100644
--- a/deps/3rd/obproxy.el7.x86_64.deps
+++ b/deps/3rd/obproxy.el7.x86_64.deps
@@ -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
diff --git a/deps/3rd/obproxy.el8.aarch64.deps b/deps/3rd/obproxy.el8.aarch64.deps
new file mode 100644
index 0000000..28270b2
--- /dev/null
+++ b/deps/3rd/obproxy.el8.aarch64.deps
@@ -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
diff --git a/deps/3rd/obproxy.el8.x86_64.deps b/deps/3rd/obproxy.el8.x86_64.deps
index 358b6bc..0a8cb46 100644
--- a/deps/3rd/obproxy.el8.x86_64.deps
+++ b/deps/3rd/obproxy.el8.x86_64.deps
@@ -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
-- 
GitLab