From 797ffd06396937ddc6d341554558d173ba43e2ab Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Thu, 30 Sep 2021 00:34:05 +0800
Subject: [PATCH 1/3] update jdk to openjdk8 in cmake file

---
 cmake/src/set_thirdparty_path.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/src/set_thirdparty_path.cmake b/cmake/src/set_thirdparty_path.cmake
index 940b6c469..d5d5bc2a6 100755
--- a/cmake/src/set_thirdparty_path.cmake
+++ b/cmake/src/set_thirdparty_path.cmake
@@ -67,7 +67,7 @@ set(NANOMSG_HOME ${DEPENDENCY_PATH}/nanomsg/${LIB_NOT_SUPPORT_LLT})
 set(NCURSES_HOME ${DEPENDENCY_PATH}/ncurses/${SUPPORT_LLT})
 set(OPENSSL_HOME ${DEPENDENCY_PATH}/openssl/${LIB_NOT_SUPPORT_LLT})
 set(PLJAVA_HOME ${DEPENDENCY_PATH}/pljava/${LIB_NOT_SUPPORT_LLT})
-set(JAVA_HOME ${3RD_PATH}/platform/huaweijdk8/${BUILD_TUPLE}/jdk)
+set(JAVA_HOME ${3RD_PATH}/platform/openjdk8/${BUILD_TUPLE}/jdk)
 set(PROTOBUF_HOME ${DEPENDENCY_PATH}/protobuf/${SUPPORT_LLT})
 set(THRIFT_HOME ${DEPENDENCY_PATH}/thrift)
 set(SNAPPY_HOME ${DEPENDENCY_PATH}/snappy/${SUPPORT_LLT})

From d663da319f48faa2988f7055da71df907590a95d Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Thu, 30 Sep 2021 01:04:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0javahome=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Makefile.global.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 4b3b4e9ac..3cfe30121 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -306,6 +306,7 @@ ifeq ($(with_3rd), NONE)
   ZSTD_HOME = $(top_builddir)/$(BINARYPATH)/zstd
   LIBNANOMSG_HOME = $(top_builddir)/$(BINARYPATH)/nanomsg/comm
   PLJAVA_HOME = $(top_builddir)/$(BINARYPATH)/pljava/$(LIB_SUPPORT_LLT)
+  JAVA_HOME = $(top_builddir)/$(PLATFORMPATH)/openjdk8/jdk1.8.0_222
   MASSTREE_HOME = $(top_builddir)/$(BINARYPATH)/masstree/comm
   MYFDW_HOME    = $(top_builddir)/dependency/mysql_fdw
   ORCFDW_HOME   = $(top_builddir)/dependency/oracle_fdw
@@ -350,6 +351,7 @@ endif
   ZSTD_HOME = $(with_3rd)/$(BINARYPATH)/zstd
   LIBNANOMSG_HOME = $(with_3rd)/$(BINARYPATH)/nanomsg/comm
   PLJAVA_HOME = $(with_3rd)/$(BINARYPATH)/pljava/$(LIB_SUPPORT_LLT)
+  JAVA_HOME = $(with_3rd)/$(PLATFORMPATH)/openjdk8/jdk1.8.0_222
   MASSTREE_HOME = $(with_3rd)/$(BINARYPATH)/masstree/comm
   MYFDW_HOME = $(with_3rd)/dependency/mysql_fdw
   ORCFDW_HOME = $(with_3rd)/dependency/oracle_fdw

From 53aab64916e7858e5cede2fc781f0fe393d8e8ce Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Thu, 30 Sep 2021 10:01:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?package=E6=89=93=E5=8C=85=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?simpleInstall=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/script/package_opengauss.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/script/package_opengauss.sh b/build/script/package_opengauss.sh
index 878538a1d..fd36ac247 100755
--- a/build/script/package_opengauss.sh
+++ b/build/script/package_opengauss.sh
@@ -355,6 +355,7 @@ function target_file_copy()
     copy_files_list "$1" $2
 
     cp ${SCRIPT_DIR}/version.cfg ${BUILD_DIR}/temp
+    cp -rf ${SCRIPT_DIR}/../../simpleInstall ${BUILD_DIR}/temp
     if [ $? -ne 0 ]; then
         die "copy ${SCRIPT_DIR}/version.cfg to ${BUILD_DIR}/temp failed"
     fi