2nd round patches for openGauss 1.1.0

build/script/build_opengauss.sh

@@ -30,6 +30,7 @@ test -d $ROOT_DIR/contrib/carbondata && mv $ROOT_DIR/contrib/carbondata $ROOT_DI
 cp opengauss.spec gauss.spec
 
 #(3) invoke mpp_package
+chmod a+x mpp_package.sh
 echo "mpp_package.sh $@ -nopkg -pm opengauss"
 ./mpp_package.sh $@ -nopkg -pm opengauss
 if [ $? != "0" ]; then

build/script/mpp_package.sh

@@ -300,13 +300,6 @@ fi
 
 if [ "$product_mode"x == "opengauss"x ]; then
     release_file_list=$(echo ${release_file_list}_single | sed -e 's/mpp_release/opengauss_release/')
-    if [ ! -f $binarylib_dir/dependency/masstree/masstree-beta-0.9.0.tar.gz ]; then
-        echo "ERROR: there is no necessary files in $binarylib_dir/dependency/masstree/"
-        echo "    You may copy them from 'third_party' repo by executing:"
-        echo "    mkdir -p $binarylib_dir/dependency/masstree && cp -fr <third_party>/dependency/masstree/* $binarylib_dir/dependency/masstree"
-        echo "    You should substitute <third_party> by real path to third_party repo"
-        exit 1
-    fi
 fi
 
 read_mpp_version

build/script/mpp_release_list_openeuler_aarch64_single

@@ -82,8 +82,6 @@
 ./share/postgresql/extension/gc_fdw.control
 ./share/postgresql/extension/log_fdw--1.0.sql
 ./share/postgresql/extension/log_fdw.control
-./share/postgresql/extension/mot_fdw--1.0.sql
-./share/postgresql/extension/mot_fdw.control
 ./share/postgresql/extension/dimsearch--1.0.sql
 ./share/postgresql/extension/dimsearch.control
 ./share/postgresql/extension/packages--1.0.sql
@@ -779,9 +777,6 @@
 ./lib/libcom_err_gauss.so
 ./lib/libcom_err_gauss.so.3
 ./lib/libcom_err_gauss.so.3.0
-./lib/libatomic.so
-./lib/libatomic.so.1
-./lib/libatomic.so.1.2.0
 ./lib/libgpr.so
 ./lib/libgpr.so.9
 ./lib/libgpr.so.9.0.0

build/script/opengauss_release_list_centos_single

@@ -788,6 +788,7 @@
 ./lib/libatomic.so
 ./lib/libatomic.so.1
 ./lib/libatomic.so.1.2.0
+./lib/libmasstree.so
 ./lib/libgpr.so
 ./lib/libgpr.so.9
 ./lib/libgpr.so.9.0.0

build/script/opengauss_release_list_euleros_aarch64_single

@@ -792,6 +792,7 @@
 ./lib/libatomic.so
 ./lib/libatomic.so.1
 ./lib/libatomic.so.1.2.0
+./lib/libmasstree.so
 ./lib/libgpr.so
 ./lib/libgpr.so.9
 ./lib/libgpr.so.9.0.0

build/script/opengauss_release_list_euleros_single

@@ -786,6 +786,7 @@
 ./lib/libatomic.so
 ./lib/libatomic.so.1
 ./lib/libatomic.so.1.2.0
+./lib/libmasstree.so
 ./lib/libgpr.so
 ./lib/libgpr.so.9
 ./lib/libgpr.so.9.0.0

build/script/opengauss_release_list_openeuler_aarch64_single

@@ -782,6 +782,7 @@
 ./lib/libatomic.so
 ./lib/libatomic.so.1
 ./lib/libatomic.so.1.2.0
+./lib/libmasstree.so
 ./lib/libgpr.so
 ./lib/libgpr.so.9
 ./lib/libgpr.so.9.0.0

build/script/package_opengauss.sh

@@ -110,11 +110,11 @@ else
 fi
 
 SCRIPT_DIR=$(cd $(dirname $SCRIPT_PATH) && pwd)
-
-package_path=$SCRIPT_DIR
+test -d ${SCRIPT_DIR}/../../output || mkdir -p ${SCRIPT_DIR}/../../output
+output_path=$(cd ${SCRIPT_DIR}/../../output && pwd)
 
 #######################################################################
-##version 1.0.1
+##version 1.1.0
 #######################################################################
 function read_srv_version()
 {
@@ -124,8 +124,16 @@ function read_srv_version()
     #auto read the number from kernal globals.cpp, no need to change it here
 }
 
-read_srv_version
+function deploy_pkgs()
+{
+    for pkg in $@; do
+        if [ -f $pkg ]; then
+            mv $pkg $output_path/
+        fi
+    done
+}
 
+read_srv_version
 
 #########################################################################
 ##read command line paramenters
@@ -281,6 +289,7 @@ function install_gaussdb()
        ./separate_debug_information.sh
        cd $SCRIPT_DIR
        mv symbols.tar.gz $kernel_symbol_package_name
+       deploy_pkgs $kernel_symbol_package_name
     fi
 
     #insert the commitid to version.cfg as the upgrade app path specification
@@ -388,7 +397,8 @@ function make_package_srv()
     mkdir -p temp
     mkdir -p ${BUILD_DIR}/temp/etc
     target_file_copy "$copydest" ${BUILD_DIR}/temp
-    mv ${sha256_name} ${kernel_package_name} ${package_path}
+
+    deploy_pkgs ${sha256_name} ${kernel_package_name}
     echo "make server(all) package success!"
 }
 
@@ -420,7 +430,8 @@ function make_package_upgrade_sql()
 
     chmod 600 ${UPGRADE_SQL_TAR}
     chmod 600 ${UPGRADE_SQL_SHA256}
-    mv ${UPGRADE_SQL_TAR} ${UPGRADE_SQL_SHA256} ${package_path}
+
+    deploy_pkgs ${UPGRADE_SQL_TAR} ${UPGRADE_SQL_SHA256}
 
     echo "Successfully packaged upgrade_sql files."
 }
@@ -485,8 +496,9 @@ function make_package_libpq()
     if [ $? -ne 0 ]; then
         die "$package_command ${libpq_package_name} failed"
     fi
-    mv ${libpq_package_name} ${package_path}
-    echo "install $pkgname tools is ${libpq_package_name} of ${package_path} directory " >> "$LOG_FILE" 2>&1
+
+    deploy_pkgs ${libpq_package_name}
+    echo "install $pkgname tools is ${libpq_package_name} of ${output_path} directory " >> "$LOG_FILE" 2>&1
     echo "success!"
 }
 
@@ -541,8 +553,9 @@ function make_package_tools()
     if [ $? -ne 0 ]; then
         die "$package_command ${tools_package_name} failed"
     fi
-    mv ${tools_package_name} ${package_path}
-    echo "install $pkgname tools is ${tools_package_name} of ${package_path} directory " >> "$LOG_FILE" 2>&1
+
+    deploy_pkgs ${tools_package_name}
+    echo "install $pkgname tools is ${tools_package_name} of ${output_path} directory " >> "$LOG_FILE" 2>&1
     echo "success!"
 }