diff --git a/build/script/cmake_package_mini.sh b/build/script/cmake_package_mini.sh index 7e918aed0..411e2219b 100644 --- a/build/script/cmake_package_mini.sh +++ b/build/script/cmake_package_mini.sh @@ -43,7 +43,7 @@ else fi if [ X"$kernel" == X"euleros" ]; then - dist_version="EULER" + dist_version="EulerOS" elif [ X"$kernel" == X"centos" ]; then dist_version="CentOS" elif [ X"$kernel" == X"openeuler" ]; then @@ -54,6 +54,8 @@ else dist_version="Platform" fi +os_version=$(cat /etc/os-release | grep -w VERSION_ID | awk -F '"' '{print $2}') + show_package=false gcc_version="10.3.1" @@ -290,12 +292,11 @@ fi ####################################################################### ## declare all package name ####################################################################### -declare version_string="${mppdb_name_for_package}-${version_number}" -declare package_pre_name="${version_string}-${dist_version}-${PLATFORM_ARCH}" -declare server_package_name="${package_pre_name}.${install_package_format}.gz" +declare package_version_name="${version_number}-${dist_version}${os_version}-${PLATFORM_ARCH}" +declare server_package_name="${mppdb_name_for_package}-${package_version_name}.${install_package_format}.gz" -declare libpq_package_name="${package_pre_name}-Libpq.${install_package_format}.gz" -declare symbol_package_name="${package_pre_name}-symbol.${install_package_format}.gz" +declare libpq_package_name="${mppdb_name_for_package}-Libpq-${package_version_name}.${install_package_format}.gz" +declare symbol_package_name="${mppdb_name_for_package}-symbol-${package_version_name}.${install_package_format}.gz" echo "[makemppdb] $(date +%y-%m-%d' '%T): script dir : ${SCRIPT_DIR}" ROOT_DIR=$(dirname "$SCRIPT_DIR") @@ -591,7 +592,7 @@ function target_file_copy_for_non_server() done } -declare bin_name="${package_pre_name}.bin" +declare bin_name="${mppdb_name_for_package}-${package_version_name}.bin" declare sha256_name='' declare script_dir="${ROOT_DIR}/script" @@ -643,7 +644,7 @@ function target_file_copy() echo "End generate ${bin_name} bin file" >> "$LOG_FILE" 2>&1 #generate sha256 file - sha256_name="${package_pre_name}.sha256" + sha256_name="${mppdb_name_for_package}-${package_version_name}.sha256" echo "Begin generate ${sha256_name} sha256 file..." >> "$LOG_FILE" 2>&1 sha256sum "${bin_name}" | awk -F" " '{print $1}' > "$sha256_name" if [ $? -ne 0 ]; then diff --git a/build/script/utils/cmake_compile.sh b/build/script/utils/cmake_compile.sh index 0caa1fa31..92c2ba2e3 100644 --- a/build/script/utils/cmake_compile.sh +++ b/build/script/utils/cmake_compile.sh @@ -21,7 +21,7 @@ function gaussdb_pkg_pre_clean() function read_gaussdb_version() { cd ${SCRIPT_DIR} - echo "${product_name}-${version_number}" > version.cfg + echo "${product_name}-Server-${version_number}" > version.cfg #auto read the number from kernal globals.cpp, no need to change it here } diff --git a/build/script/utils/common.sh b/build/script/utils/common.sh index 8b79e1043..af3d3dcb7 100644 --- a/build/script/utils/common.sh +++ b/build/script/utils/common.sh @@ -59,14 +59,13 @@ select_package_command ####################################################################### ##get os dist version ####################################################################### +os_name=$(cat /etc/os-release | grep -w NAME | awk -F '"' '{print $2}') if [[ -f "/etc/openEuler-release" ]]; then os_name="openEuler" elif [[ -f "/etc/euleros-release" ]]; then os_name="EulerOS" elif [[ -f "/etc/centos-release" ]]; then os_name="CentOS" -elif [[ -f "/etc/openEuler-release" ]]; then - os_name="openEuler" elif [[ -f "/etc/FusionOS-release" ]]; then os_name="FusionOS" elif [[ -f "/etc/kylin-release" ]]; then @@ -78,13 +77,15 @@ elif [[ -f "/etc/CSIOS-release" ]]; then else os_name=$(lsb_release -d | awk -F ' ' '{print $2}'| tr A-Z a-z | sed 's/.*/\L&/; s/[a-z]*/\u&/g') fi +os_version=$(cat /etc/os-release | grep -w VERSION_ID | awk -F '"' '{print $2}') + +if [ "$os_name"X == ""X ]; then + echo "os name is empty" + exit 1 +fi ##add platform architecture information if [ "$PLATFORM_ARCH"X == "aarch64"X ] ; then - if [ "$os_name" != "openEuler" ] && [ "$os_name" != "EulerOS" ] && [ "$os_name" != "FusionOS" ] && [ "$os_name" != "Kylin" ] && [ "$dist_version" != "Asianux" ] && [ "$os_name" != "CSIOS" ]; then - echo "We only support NUMA on openEuler(aarch64), EulerOS(aarch64), FusionOS(aarch64), Kylin(aarch64), Asianux, CSIOS(aarch64) platform." - exit 1 - fi GAUSSDB_EXTRA_FLAGS=" -D__USE_NUMA" fi @@ -144,10 +145,9 @@ declare release_file_list="${PLATFORM_ARCH}_${product_mode}_list" ####################################################################### ## declare all package name ####################################################################### -declare version_string="${product_name}-${version_number}" -declare package_pre_name="${version_string}-${os_name}-${PLATFORM}bit" -declare libpq_package_name="${package_pre_name}-Libpq.tar.gz" -declare tools_package_name="${package_pre_name}-tools.tar.gz" -declare kernel_package_name="${package_pre_name}.tar.bz2" -declare symbol_package_name="${package_pre_name}-symbol.tar.gz" -declare sha256_name="${package_pre_name}.sha256" +declare package_version_name="${version_number}-${os_name}${os_version}-${PLATFORM_ARCH}" +declare libpq_package_name="${product_name}-Libpq-${package_version_name}.tar.gz" +declare tools_package_name="${product_name}-Tools-${package_version_name}.tar.gz" +declare kernel_package_name="${product_name}-Server-${package_version_name}.tar.gz" +declare symbol_package_name="${product_name}-Symbol-${package_version_name}.tar.gz" +declare sha256_name="${product_name}-Server-${package_version_name}.sha256" diff --git a/build/script/utils/internal_packages.sh b/build/script/utils/internal_packages.sh index a920d15cb..f797b09fb 100644 --- a/build/script/utils/internal_packages.sh +++ b/build/script/utils/internal_packages.sh @@ -71,7 +71,6 @@ function target_file_copy() echo "End generate ${kernel_package_name} tar file" >> "$LOG_FILE" 2>&1 #generate sha256 file - sha256_name="${package_pre_name}.sha256" echo "Begin generate ${sha256_name} sha256 file..." >> "$LOG_FILE" 2>&1 sha256sum "${kernel_package_name}" | awk -F" " '{print $1}' > "$sha256_name" if [ $? -ne 0 ]; then diff --git a/build/script/utils/make_compile.sh b/build/script/utils/make_compile.sh index d5d7f83d4..9dc4a7b97 100644 --- a/build/script/utils/make_compile.sh +++ b/build/script/utils/make_compile.sh @@ -21,7 +21,7 @@ function gaussdb_pkg_pre_clean() function read_gaussdb_version() { cd ${SCRIPT_DIR} - echo "${product_name}-${version_number}" > version.cfg + echo "${product_name}-Server-${version_number}" > version.cfg #auto read the number from kernal globals.cpp, no need to change it here } diff --git a/liteom/install.sh b/liteom/install.sh index cd592873e..b40d69e89 100644 --- a/liteom/install.sh +++ b/liteom/install.sh @@ -570,19 +570,10 @@ function decompress() fi log "kernel: ${kernel}" - # detect platform information. - platform=32 - bit=$(getconf LONG_BIT) - if [ "$bit" -eq 64 ] - then - platform=64 - fi - platform_arch=$(uname -p) - bin_name="openGauss-Lite.*-${kernel}-${platform_arch}" - bin_res=$(ls -a | grep -E "${bin_name}.bin") + bin_res=$(ls | grep openGauss-Lite*.bin) if [ "${bin_res}" = "" ] then - die "can not find suitable bin file, expected bin file is ${bin_name}.bin" + die "can not find suitable bin file, expected bin file is ${bin_res}" fi log "bin file: ${bin_res}" diff --git a/liteom/upgrade_common.sh b/liteom/upgrade_common.sh index e0fe9057b..21cc46bfe 100644 --- a/liteom/upgrade_common.sh +++ b/liteom/upgrade_common.sh @@ -399,8 +399,7 @@ function check_pkg() { #detect platform information. platform_arch=$(uname -p) - bin_name="openGauss-Lite.*-${kernel}-${platform_arch}" - binfile=$(ls -a | grep -E "${binname}.bin") + binfile=$(ls | grep openGauss-Lite*.bin) shafile=${binfile%.*}.sha256 if [[ ! -f "${binfile}" ]] || [[ ! -f "${shafile}" ]]; then die "bin or sha256 file not exit for the platform ${kernel}-${platform_arch}!" ${err_upgrade_pre}