diff --git a/build/script/cmake_package_mini.sh b/build/script/cmake_package_mini.sh
index cfe15d5de..cfa203669 100644
--- a/build/script/cmake_package_mini.sh
+++ b/build/script/cmake_package_mini.sh
@@ -59,7 +59,7 @@ gcc_version="8.3.0"
 
 ##add platform architecture information
 cpus_num=$(grep -w processor /proc/cpuinfo|wc -l)
-PLATFORM_ARCH=$(uname -p)
+PLATFORM_ARCH=$(uname -m)
 if [ "$PLATFORM_ARCH"X == "aarch64"X ] ; then
     ARCHITECTURE_EXTRA_FLAG=_euleros2.0_${ext_version}_$PLATFORM_ARCH
     release_file_list="aarch64_lite_list"
diff --git a/build/script/separate_debug_information.sh b/build/script/separate_debug_information.sh
old mode 100644
new mode 100755
diff --git a/build/script/utils/common.sh b/build/script/utils/common.sh
index e4d909015..8a327374b 100644
--- a/build/script/utils/common.sh
+++ b/build/script/utils/common.sh
@@ -4,7 +4,7 @@
 
 declare LOG_FILE="${SCRIPT_DIR}/makemppdb_pkg.log"
 declare product_name='openGauss'
-declare PLATFORM_ARCH=$(uname -p)
+declare PLATFORM_ARCH=$(uname -m)
 declare package_path=${ROOT_DIR}/output
 declare install_package_format="tar"
 declare PLATFORM=32
@@ -110,7 +110,7 @@ export CC="${USE_CCACHE}$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/bin/gcc"
 export CXX="${USE_CCACHE}$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/bin/g++"
 export LD_LIBRARY_PATH=$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/lib64:$BUILD_TOOLS_PATH/gcc$gcc_version/isl/lib:$BUILD_TOOLS_PATH/gcc$gcc_version/mpc/lib/:$BUILD_TOOLS_PATH/gcc$gcc_version/mpfr/lib/:$BUILD_TOOLS_PATH/gcc$gcc_version/gmp/lib/:$LD_LIBRARY_PATH
 export PATH=$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/bin:$PATH
-export JAVA_HOME=${PLATFORM_PATH}/huaweijdk8/${PLATFORM_ARCH}/jdk
+export JAVA_HOME=${PLATFORM_PATH}/openjdk8/${PLATFORM_ARCH}/jdk
 
 declare ERR_FAILED=1
 declare ERR_OK=0
diff --git a/liteom/install.sh b/liteom/install.sh
index bc11492d7..80427d7a3 100644
--- a/liteom/install.sh
+++ b/liteom/install.sh
@@ -577,7 +577,7 @@ function decompress()
     then
         platform=64
     fi
-    platform_arch=$(uname -p)
+    platform_arch=$(uname -m)
     bin_name="openGauss-Lite.*-${kernel}-${platform_arch}"
 	bin_res=$(ls -a | grep -E "${bin_name}.bin")
 	if [ "${bin_res}" = "" ]
@@ -1250,4 +1250,4 @@ function main()
     info "run cmd 'source ${env_file}' to make the environment variables take effect."
 }
 main
-exit 0
\ No newline at end of file
+exit 0
diff --git a/liteom/upgrade_common.sh b/liteom/upgrade_common.sh
index e4a8d0bd1..5fa0421e5 100644
--- a/liteom/upgrade_common.sh
+++ b/liteom/upgrade_common.sh
@@ -398,7 +398,7 @@ function check_pkg() {
   log "kernel: ${kernel}"
 
   #detect platform information.
-  platform_arch=$(uname -p)
+  platform_arch=$(uname -m)
   bin_name="openGauss-Lite.*-${kernel}-${platform_arch}"
   binfile=$(ls -a | grep -E "${binname}.bin")
   shafile=${binfile%.*}.sha256
@@ -1242,4 +1242,4 @@ function delete_tmp_files() {
     fi
     rm -f "$GAUSS_TMP_PATH"/version_flag
     rm -f "$GAUSS_TMP_PATH"/record_step.txt
-}
\ No newline at end of file
+}
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 86ea73ede..bd3ec360a 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -343,9 +343,9 @@ endif
   PLJAVA_HOME = $(with_3rd)/$(BINARYPATH)/pljava/$(LIB_SUPPORT_LLT)
   using_openjdk = $(shell if [ -d "$(with_3rd)/$(PLATFORMPATH)/openjdk8" ]; then echo "yes"; else echo "no"; fi;)
   ifeq ($(using_openjdk), yes)
-    JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/openjdk8/$(shell uname -p)/jdk
+    JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/openjdk8/$(shell uname -m)/jdk
   else
-    JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/huaweijdk8/$(shell uname -p)/jdk
+    JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/huaweijdk8/$(shell uname -m)/jdk
   endif
   MASSTREE_HOME = $(with_3rd)/$(BINARYPATH)/masstree/comm
   MYFDW_HOME = $(with_3rd)/$(BINARYPATH)/mysql_fdw
diff --git a/src/gausskernel/Makefile b/src/gausskernel/Makefile
index 586c7fff7..762576315 100755
--- a/src/gausskernel/Makefile
+++ b/src/gausskernel/Makefile
@@ -646,12 +646,12 @@ ifeq ($(enable_thread_check), yes)
 	cp $(top_builddir)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libtsan.so.0.0.0 '$(DESTDIR)$(libdir)/'
 endif
 else
-	#cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
-	#cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
-	#cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
-	cp /usr/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
-	cp /usr/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
-	cp /usr/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
+	cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
+	cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
+	cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
+	#cp /usr/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
+	#cp /usr/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
+        #cp /usr/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
 ifeq ($(enable_mot), yes)
 	cp -d $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libatomic.so* '$(DESTDIR)$(libdir)/'
 endif