diff --git a/build/script/aarch64_lite_list b/build/script/aarch64_lite_list index b5bbfe064..0116b3ee7 100644 --- a/build/script/aarch64_lite_list +++ b/build/script/aarch64_lite_list @@ -693,10 +693,10 @@ ./lib/liblz4.so.1.9.2 ./lib/libcjson.so ./lib/libcjson.so.1 -./lib/libcjson.so.1.7.13 +./lib/libcjson.so.1.7.14 ./lib/libcjson_utils.so ./lib/libcjson_utils.so.1 -./lib/libcjson_utils.so.1.7.13 +./lib/libcjson_utils.so.1.7.14 ./lib/libstdc++.so.6 ./lib/libgcc_s.so.1 ./lib/libgomp.so @@ -708,7 +708,7 @@ ./lib/libzstd.so.1.5.0 ./lib/libcurl.so ./lib/libcurl.so.4 -./lib/libcurl.so.4.6.0 +./lib/libcurl.so.4.7.0 ./lib/libxgboost.so ./lib/postgresql/latin2_and_win1250.so ./lib/postgresql/euc2004_sjis2004.so @@ -920,3 +920,5 @@ ./include/libpq-int.h ./include/pqcomm.h ./include/pqexpbuffer.h +[version] +2.1.0 \ No newline at end of file diff --git a/build/script/cmake_package_mini.sh b/build/script/cmake_package_mini.sh index f4b50a451..a558a5fd1 100644 --- a/build/script/cmake_package_mini.sh +++ b/build/script/cmake_package_mini.sh @@ -45,11 +45,11 @@ fi if [ X"$kernel" == X"euleros" ]; then dist_version="EULER" elif [ X"$kernel" == X"centos" ]; then - dist_version="CENTOS" + dist_version="CentOS" elif [ X"$kernel" == X"openeuler" ]; then - dist_version="OPENEULER" + dist_version="openEuler" else - echo "Only support EulerOS platform." + echo "Only support EulerOS|Centos|openEuler platform." echo "Kernel is $kernel" exit 1 fi @@ -62,14 +62,14 @@ cpus_num=$(grep -w processor /proc/cpuinfo|wc -l) PLATFORM_ARCH=$(uname -p) if [ "$PLATFORM_ARCH"X == "aarch64"X ] ; then ARCHITECTURE_EXTRA_FLAG=_euleros2.0_${ext_version}_$PLATFORM_ARCH - release_file_list="opengauss_release_list_${kernel}_${PLATFORM_ARCH}_mini_single" + release_file_list="aarch64_lite_list" else ARCHITECTURE_EXTRA_FLAG=_euleros2.0_sp5_${PLATFORM_ARCH} - release_file_list="opengauss_release_list_${kernel}_mini_single" + release_file_list="x86_64_lite_list" fi ##default install version storage path -declare mppdb_version='GaussDB Kernel' +declare mppdb_version='openGauss Lite' declare mppdb_name_for_package="$(echo ${mppdb_version} | sed 's/ /-/g')" declare package_path='./' declare version_number='' @@ -282,7 +282,7 @@ fi ## declare all package name ####################################################################### declare version_string="${mppdb_name_for_package}-${version_number}" -declare package_pre_name="${version_string}-${dist_version}-${PLATFORM}bit" +declare package_pre_name="${version_string}-${dist_version}-${PLATFORM_ARCH}" declare server_package_name="${package_pre_name}.${install_package_format}.gz" declare libpq_package_name="${package_pre_name}-Libpq.${install_package_format}.gz" @@ -629,7 +629,11 @@ function target_file_copy() #generate bin file echo "Begin generate ${bin_name} bin file..." >> "$LOG_FILE" 2>&1 - ${p7zpath}/7z a -t7z -sfx "${bin_name}" "$2/*" >> "$LOG_FILE" 2>&1 + curpath=$(pwd) + cd $2 + tar -zcf ${bin_name} . >> "$LOG_FILE" 2>&1 + mv ${bin_name} ${curpath} + cd ${curpath} if [ $? -ne 0 ]; then echo "Please check and makesure '7z' exist. " die "generate ${bin_name} failed." diff --git a/build/script/x86_64_lite_list b/build/script/x86_64_lite_list index 42be3fc48..f9befe131 100644 --- a/build/script/x86_64_lite_list +++ b/build/script/x86_64_lite_list @@ -14,6 +14,7 @@ ./bin/alarmItem.conf ./bin/retry_errcodes.conf ./bin/cluster_guc.conf +./bin/lz4 ./bin/gs_plan_simulator.sh ./share/postgresql/db4ai ./share/postgresql/snowball_create.sql @@ -688,10 +689,10 @@ ./lib/liblz4.so.1.9.2 ./lib/libcjson.so ./lib/libcjson.so.1 -./lib/libcjson.so.1.7.13 +./lib/libcjson.so.1.7.14 ./lib/libcjson_utils.so ./lib/libcjson_utils.so.1 -./lib/libcjson_utils.so.1.7.13 +./lib/libcjson_utils.so.1.7.14 ./lib/libstdc++.so.6 ./lib/libgcc_s.so.1 ./lib/libgomp.so @@ -703,7 +704,7 @@ ./lib/libzstd.so.1.5.0 ./lib/libcurl.so ./lib/libcurl.so.4 -./lib/libcurl.so.4.6.0 +./lib/libcurl.so.4.7.0 ./lib/libxgboost.so ./lib/postgresql/latin2_and_win1250.so ./lib/postgresql/euc2004_sjis2004.so @@ -740,6 +741,7 @@ ./lib/postgresql/security_plugin.so ./lib/postgresql/latin2_and_win1250.so ./lib/postgresql/euc2004_sjis2004.so +./lib/libxgboost.so ./include/postgresql/server/postgres_ext.h ./include/postgresql/server/pg_config_os.h ./include/postgresql/server/pgtime.h @@ -914,3 +916,5 @@ ./include/libpq-int.h ./include/pqcomm.h ./include/pqexpbuffer.h +[version] +2.1.0 \ No newline at end of file diff --git a/liteom/install.sh b/liteom/install.sh index fe11b0070..8bec2c188 100644 --- a/liteom/install.sh +++ b/liteom/install.sh @@ -548,12 +548,12 @@ function decompress() fi elif [ -f "/etc/openEuler-release" ] then - kernel=$(cat /etc/openEuler-release | awk -F ' ' '{print $1}' | tr a-z A-Z) + kernel=$(cat /etc/openEuler-release | awk -F ' ' '{print $1}') elif [ -f "/etc/centos-release" ] then - kernel=$(cat /etc/centos-release | awk -F ' ' '{print $1}' | tr a-z A-Z) + kernel=$(cat /etc/centos-release | awk -F ' ' '{print $1}') else - kernel=$(lsb_release -d | awk -F ' ' '{print $2}'| tr a-z A-Z) + kernel=$(lsb_release -d | awk -F ' ' '{print $2}') fi log "kernel: ${kernel}" @@ -564,7 +564,8 @@ function decompress() then platform=64 fi - bin_name="GaussDB-Kernel-.*-${kernel}-${platform}bit" + platform_arch=$(uname -p) + bin_name="openGauss-Lite.*-${kernel}-${platform_arch}" bin_res=$(ls -a | grep -E "${bin_name}.bin") if [ "${bin_res}" = "" ] then @@ -597,7 +598,7 @@ function decompress() die "copy binary files *.bin and version.cfg to install path error" fi cd ${app_path} - ./*.bin + tar -zxf ${bin_name}.bin if [ $? -ne 0 ] then die "decompress binary files (*.bin) error" diff --git a/src/test/regress/jdbc_client_lib/gsjdbc4.jar b/src/test/regress/jdbc_client_lib/gsjdbc4.jar index e69de29bb..1e2cce2c6 100644 Binary files a/src/test/regress/jdbc_client_lib/gsjdbc4.jar and b/src/test/regress/jdbc_client_lib/gsjdbc4.jar differ