diff --git a/0002-add-kylinsec-platform.patch b/0002-add-kylinsec-platform.patch new file mode 100644 index 0000000000000000000000000000000000000000..522dbffd0062e6afef5e6a90a8f8e1a3d49dcb90 --- /dev/null +++ b/0002-add-kylinsec-platform.patch @@ -0,0 +1,32 @@ +From 02f0141586b12ca76582550a22894134e28c7962 Mon Sep 17 00:00:00 2001 +From: xiewenhao +Date: Wed, 30 Mar 2022 17:32:43 +0800 +Subject: [PATCH 2/2] add kylinsec platform + +--- + openGauss-server-2.1.0/src/get_PlatForm_str.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/openGauss-server-2.1.0/src/get_PlatForm_str.sh b/openGauss-server-2.1.0/src/get_PlatForm_str.sh +index 9fff29a..3f222cd 100755 +--- a/openGauss-server-2.1.0/src/get_PlatForm_str.sh ++++ b/openGauss-server-2.1.0/src/get_PlatForm_str.sh +@@ -135,6 +135,15 @@ then + plat_form_str=kylin_"$cpu_bit" + fi + ++################################################################################## ++# kylinsec platform ++# the result form like this: kylinsec_aarch64 ++################################################################################## ++if [ "$kernel"x = "kylinsec"x ] ++then ++ plat_form_str=kylinsec_"$cpu_bit" ++fi ++ + ################################################################################## + # ubuntu platform + # the result form like this: ubuntu_x86_64 +-- +2.18.1 + diff --git a/opengauss-bashprofile b/opengauss-bashprofile index b2244473d4426db1486479b68f07f3f1cacd4886..0d44355e2b2375f6d324d6189a73bb651895fcae 100644 --- a/opengauss-bashprofile +++ b/opengauss-bashprofile @@ -1,7 +1,5 @@ -[ -f /etc/profile ] && source /etc/profile - export GAUSSHOME=/usr/local/opengauss/ export LD_LIBRARY_PATH=/usr/local/opengauss/lib:$LD_LIBRARY_PATH export PATH=/usr/local/opengauss/bin:$PATH export PGDATA=/var/lib/opengauss/data -export PORT=7654 \ No newline at end of file +export PORT=7654 diff --git a/opengauss-server.spec b/opengauss-server.spec index 906e7124ac553f98f1b91c32c2bf8299284cb59c..35c569615293f2b8c6902d107bbb5282d6fb4083 100755 --- a/opengauss-server.spec +++ b/opengauss-server.spec @@ -12,7 +12,7 @@ Name: opengauss Version: 2.1.0 -Release: 3 +Release: 6 Summary: openGauss is an open source relational database management system License: MulanPSL-2.0 and MIT and BSD and zlib and TCL and Apache-2.0 and BSL-1.0 URL: https://gitee.com/opengauss/openGauss-server @@ -32,6 +32,7 @@ Patch21: 0002-zlib.patch Patch22: 0003-zlib.patch Patch23: makefile-miniunz.patch Patch40: 0001-orc.patch +Patch41: 0002-add-kylinsec-platform.patch BuildRequires: cmake gcc gcc-c++ openssl-devel python BuildRequires: cjson lz4-devel protobuf-devel snappy-devel zstd-devel boost-devel @@ -85,6 +86,7 @@ pushd %{orc_name}-%{orc_version} %patch40 -p1 popd +%patch41 -p1 %build ########### build cjson ########### build_target=$(pwd)/deps_binarylibs @@ -184,15 +186,28 @@ install -m 644 %{SOURCE6} %{buildroot}/%{apppath}/script/opengauss.service install -m 700 %{SOURCE7} %{buildroot}/%{apppath}/script/autostart.sh %pre -/usr/sbin/groupadd -g 39 -o -r opengauss >/dev/null 2>&1 || : -/usr/sbin/useradd -M -N -g opengauss -o -r -d %{datapath} -s /bin/bash \ - -c "openGauss Server" -u 39 opengauss >/dev/null 2>&1 || : +/usr/sbin/groupadd opengauss >/dev/null 2>&1 || : +/usr/sbin/useradd -M -N -g opengauss -d %{datapath} -s /bin/bash \ + -c "openGauss Server" opengauss >/dev/null 2>&1 || : + +# for install step +if [ $1 = 1 ]; then + portinfo=$(lsof -i:%{port}) + if [ "${portinfo}" != "" ]; then + echo "The port[%{port}] is occupied. Please use command 'lsof -i:%{port} to check it.'" + exit 1 + fi +fi %post # set opengauss mini config parameters set_mini_configparam(){ config_mini_file=%{apppath}/share/postgresql/opengauss_config_file_mini + + # set guc parameters echo "port = %{port}" >> ${config_mini_file} + echo "synchronous_commit = off" >> ${config_mini_file} + echo "listen_addresses = '127.0.0.1'" >> ${config_mini_file} config_sample_file=%{apppath}/share/postgresql/postgresql.conf.sample if [[ -f $config_mini_file ]] @@ -227,13 +242,13 @@ start_opengauss(){ return 0 fi - result=`su - opengauss -c "source ~/.bash_profile; gs_initdb -D /var/lib/opengauss/data -U opengauss --nodename=single_node"` + result=`su - opengauss -c "source /var/lib/opengauss/.bash_profile; gs_initdb -D /var/lib/opengauss/data -U opengauss --nodename=single_node"` if [ $? -ne 0 ]; then echo "Init openGauss database failed." echo $result else echo "Init openGauss database success." - result=`su - opengauss -c "source ~/.bash_profile; gs_ctl start -D /var/lib/opengauss/data"` + result=`su - opengauss -c "source /var/lib/opengauss/.bash_profile; gs_ctl start -D /var/lib/opengauss/data"` if [ $? -ne 0 ]; then echo "Start openGauss database failed." echo $result @@ -264,7 +279,7 @@ remove_service(){ fi } clear_database(){ - pid=$(ps -ef | grep /var/lib/opengauss/data | grep -v grep | awk '{print $2}') + pid=$(ps -ef | grep /usr/local/opengauss/bin/gaussdb | grep -v grep | awk '{print $2}') if [ "$pid" != "" ]; then kill -9 $pid fi @@ -288,6 +303,15 @@ fi %changelog +* Wed Mar 30 2022 ouyangminxiang - 2.1.0-6 +- add kylinsec platform + +* Sat Mar 12 2022 zhangxubo - 2.1.0-5 +- Fix bugs: #I4VDYQ #I4V624 #I4UOUU #I4TCDB #I4TCB8 + +* Thu Jan 27 2022 zhangxubo - 2.1.0-4 +- Fix bugs: #I4SDWX + * Sat Jan 22 2022 zhangxubo - 2.1.0-3 - Fix bugs: #I4RVNX diff --git a/opengauss.service b/opengauss.service index e9f1f42fed1f1c5f85ecbf08343c941e139fb57b..c2680b2947ac27b18f41029f95f87dd64e237e50 100755 --- a/opengauss.service +++ b/opengauss.service @@ -6,6 +6,7 @@ After=local-fs.target Type=idle ExecStart=/usr/local/opengauss/script/autostart.sh Delegate=yes +RemainAfterExit=yes [Install] WantedBy=multi-user.target