diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh index 501a06eddb0397afbf7170e603c71abab2326496..5c2df734faf3195d783be9f337e3bd5f58cb1f64 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 58f69589d831f51604a67d54942520cb41700bc2..0c806a159f786e7506e80922f69ce6ab33a043c0 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 e301f5ece984e5853227e040ecf8cfbd7c655670..aef01875cbb15963f9289983c8e42649707b10bf 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}