From 9a659e3b4d9ea6db7b03e38f50287acbc28bd109 Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Tue, 3 Dec 2019 15:11:04 +0800
Subject: [PATCH 1/2] [TBASE-816]

---
 packaging/deb/makedeb.sh | 12 +++++++++++-
 packaging/release.sh     |  4 ++--
 packaging/rpm/makerpm.sh |  7 +++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index 501a06eddb..17bb5aabae 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -7,6 +7,7 @@
 compile_dir=$1
 output_dir=$2
 tdengine_ver=$3
+armver=$4
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -m ${script_dir}/../..)"
@@ -63,7 +64,16 @@ debver="Version: "$tdengine_ver
 sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
  
 #get taos version, then set deb name
-debname="TDengine-"${tdengine_ver}".deb"
+if [ -z "$armver" ]; then
+  debname="TDengine-"${tdengine_ver}".deb"
+elif [ "$armver" == "arm64" ]; then
+  debname="TDengine-"${tdengine_ver}"-arm64.deb"
+elif [ "$armver" == "arm32" ]; then
+  debname="TDengine-"${tdengine_ver}-arm32".deb"
+else
+  echo "input parameter error!!!"
+  return
+fi
 
 # make deb package
 dpkg -b ${pkg_dir} $debname
diff --git a/packaging/release.sh b/packaging/release.sh
index 58f69589d8..0c806a159f 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -149,7 +149,7 @@ if [ -d ${output_dir} ]; then
 fi  
 ${csudo} mkdir -p ${output_dir} 
 cd ${script_dir}/deb
-${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${version}
+${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${version} ${armver}
   
 echo "do rpm package for the centos system"
 output_dir="${top_dir}/rpms"
@@ -158,7 +158,7 @@ if [ -d ${output_dir} ]; then
 fi
 ${csudo} mkdir -p ${output_dir}  
 cd ${script_dir}/rpm
-${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${version}
+${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${version} ${armver}
 
 echo "do tar.gz package for all systems"  
 cd ${script_dir}/tools
diff --git a/packaging/rpm/makerpm.sh b/packaging/rpm/makerpm.sh
index e301f5ece9..aef01875cb 100755
--- a/packaging/rpm/makerpm.sh
+++ b/packaging/rpm/makerpm.sh
@@ -9,6 +9,7 @@
 compile_dir=$1
 output_dir=$2
 tdengine_ver=$3
+armver=$4
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -m ${script_dir}/../..)"
@@ -58,5 +59,11 @@ ${csudo} rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_di
 #${csudo} cp -rf RPMS/* ${output_dir}
 cp_rpm_package ${pkg_dir}/RPMS 
 
+if [ "$armver" == "arm64" ]; then
+  mv ${output_dir}/TDengine-${tdengine_ver}.rpm ${output_dir}/TDengine-${tdengine_ver}-arm64.rpm
+elif [ "$armver" == "arm32" ]; then
+  mv ${output_dir}/TDengine-${tdengine_ver}.rpm ${output_dir}/TDengine-${tdengine_ver}-arm32.rpm
+fi
+
 cd ..
 ${csudo} rm -rf ${pkg_dir}

From 8fb2d0c03eb435865e50c4432c27b5b0aae3f6b6 Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Tue, 3 Dec 2019 15:22:35 +0800
Subject: [PATCH 2/2] [TBASE-816]

---
 packaging/deb/makedeb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index 17bb5aabae..5c2df734fa 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -69,7 +69,7 @@ if [ -z "$armver" ]; then
 elif [ "$armver" == "arm64" ]; then
   debname="TDengine-"${tdengine_ver}"-arm64.deb"
 elif [ "$armver" == "arm32" ]; then
-  debname="TDengine-"${tdengine_ver}-arm32".deb"
+  debname="TDengine-"${tdengine_ver}"-arm32.deb"
 else
   echo "input parameter error!!!"
   return