!4284 5.0.0版本默认发布包加上xlogdump和pagehack工具

Merge pull request !4284 from zhangxubo/5.0.0
This commit is contained in:
opengauss_bot
2023-10-12 09:40:47 +00:00
committed by Gitee
5 changed files with 24 additions and 3 deletions

View File

@ -45,6 +45,8 @@
./bin/server.key.cipher
./bin/server.key.rand
./bin/gs_plan_simulator.sh
./bin/pg_xlogdump
./bin/pagehack
./etc/kerberos/kadm5.acl
./etc/kerberos/kdc.conf
./etc/kerberos/krb5.conf

View File

@ -28,6 +28,9 @@ function read_gaussdb_version()
PG_REG_TEST_ROOT="${ROOT_DIR}"
ROACH_DIR="${ROOT_DIR}/distribute/bin/roach"
MPPDB_DECODING_DIR="${ROOT_DIR}/contrib/mppdb_decoding"
XLOG_DUMP_DIR="${ROOT_DIR}/contrib/pg_xlogdump"
PAGE_HACK_DIR="${ROOT_DIR}/contrib/pagehack"
###################################
# get version number from globals.cpp
@ -259,6 +262,18 @@ function install_gaussdb()
fi
fi
cd "$XLOG_DUMP_DIR"
make clean >> "$LOG_FILE" 2>&1
make -sj >> "$LOG_FILE" 2>&1
make install -sj >> "$LOG_FILE" 2>&1
echo "End make install xlog_dump" >> "$LOG_FILE" 2>&1
cd "$PAGE_HACK_DIR"
make clean >> "$LOG_FILE" 2>&1
make -sj >> "$LOG_FILE" 2>&1
make install -sj >> "$LOG_FILE" 2>&1
echo "End make install pagehack" >> "$LOG_FILE" 2>&1
chmod 444 ${BUILD_DIR}/bin/cluster_guc.conf
dos2unix ${BUILD_DIR}/bin/cluster_guc.conf > /dev/null 2>&1
get_kernel_commitid

View File

@ -45,6 +45,8 @@
./bin/server.key.cipher
./bin/server.key.rand
./bin/gs_plan_simulator.sh
./bin/pg_xlogdump
./bin/pagehack
./etc/kerberos/kadm5.acl
./etc/kerberos/kdc.conf
./etc/kerberos/krb5.conf

View File

@ -19,8 +19,8 @@ subdir = contrib/pagehack
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -I${top_builddir}/src/lib/page_compression
override LDFLAGS += -L${top_builddir}/src/lib/page_compression
override CFLAGS += -lpagecompression -lzstd -llz4
override LDFLAGS += -L${top_builddir}/src/lib/page_compression -Wl,-z,relro,-z,now
override CFLAGS += -lpagecompression -lzstd -llz4 -fstack-protector-all
ifeq ($(enable_debug), yes)
PG_CPPFLAGS += -DDEBUG
endif

View File

@ -21,7 +21,9 @@ include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
override CPPFLAGS := -DFRONTEND $(CPPFLAGS) -fstack-protector-all -Wl,-z,relro,-z,now
override LDFLAGS += -Wl,-z,relro,-z,now
override CFLAGS += -fstack-protector-all
xlogreader.cpp: % : $(top_srcdir)/src/gausskernel/storage/access/transam/%
rm -f $@ && $(LN_S) $< .