From 14f58fefe8724809bddc72955fa555a7d297a040 Mon Sep 17 00:00:00 2001 From: dowzyx Date: Thu, 4 Aug 2022 21:25:00 +0800 Subject: [PATCH] add two patches for gala-gopher --- 0003-rename-wrapper-function-in-gopher.patch | 49 ++++++++++++++++++++ 0004-set-sys-verion-macros-for-gopher.patch | 29 ++++++++++++ A-Ops.spec | 10 +++- 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 0003-rename-wrapper-function-in-gopher.patch create mode 100644 0004-set-sys-verion-macros-for-gopher.patch diff --git a/0003-rename-wrapper-function-in-gopher.patch b/0003-rename-wrapper-function-in-gopher.patch new file mode 100644 index 0000000..a42308f --- /dev/null +++ b/0003-rename-wrapper-function-in-gopher.patch @@ -0,0 +1,49 @@ +From aa5a4491f35a956cce72e63e6f3987f3c5e8ca39 Mon Sep 17 00:00:00 2001 +From: zhaoyuxing +Date: Thu, 4 Aug 2022 20:49:57 +0800 +Subject: [PATCH] Rename the wrapper function + +reason: this patch modify wrapper function's name, because the safe compilation +option FS is turned on, and the function fpritnf is renamed to __fprintf_chk. + +--- + gala-gopher/src/daemon/CMakeLists.txt | 2 +- + gala-gopher/src/lib/probe/probe.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gala-gopher/src/daemon/CMakeLists.txt b/gala-gopher/src/daemon/CMakeLists.txt +index a95732b..91d1983 100644 +--- a/gala-gopher/src/daemon/CMakeLists.txt ++++ b/gala-gopher/src/daemon/CMakeLists.txt +@@ -29,7 +29,7 @@ SET(COMMON_DIR ${SRC_DIR}/common) + + SET(LIBRDKAFKA_DIR /usr/include/librdkafka) + +-SET(CMAKE_C_FLAGS "-rdynamic -g -fno-builtin-fprintf -Wl,--wrap=fprintf \ ++SET(CMAKE_C_FLAGS "-rdynamic -g -fno-builtin-fprintf -Wl,--wrap=__fprintf_chk \ + -DPROBES_LIST=\"${PROBES_LIST}\" \ + -DPROBES_META_LIST=\"${PROBES_META_LIST}\" " + ) +diff --git a/gala-gopher/src/lib/probe/probe.c b/gala-gopher/src/lib/probe/probe.c +index db7a56b..b7dbf44 100644 +--- a/gala-gopher/src/lib/probe/probe.c ++++ b/gala-gopher/src/lib/probe/probe.c +@@ -277,7 +277,7 @@ static char* __number(char *str, unsigned long long num, int base, int size, int + return str; + } + +-int __wrap_fprintf(FILE *stream, const char *format, ...) ++int __wrap___fprintf_chk(FILE *stream, const char *format, ...) + { + int len; + unsigned long long num; +@@ -495,4 +495,4 @@ int __wrap_fprintf(FILE *stream, const char *format, ...) + + return 0; + +-} +\ No newline at end of file ++} +-- +2.36.1 + diff --git a/0004-set-sys-verion-macros-for-gopher.patch b/0004-set-sys-verion-macros-for-gopher.patch new file mode 100644 index 0000000..68aae71 --- /dev/null +++ b/0004-set-sys-verion-macros-for-gopher.patch @@ -0,0 +1,29 @@ +From c7f9c406b348da8a0baa05f4c5d05a3c33b60f3b Mon Sep 17 00:00:00 2001 +From: zhaoyuxing +Date: Thu, 4 Aug 2022 20:56:45 +0800 +Subject: [PATCH] set macros related to system version + +--- + gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk b/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk +index b80df09..24291fd 100644 +--- a/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk ++++ b/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk +@@ -24,9 +24,9 @@ else ifeq ($(ARCH), aarch64) + endif + + KER_VER = $(shell uname -r | awk -F'-' '{print $$1}') +-KER_VER_MAJOR = $(shell echo $(KER_VER) | awk -F'.' '{print $$1}') +-KER_VER_MINOR = $(shell echo $(KER_VER) | awk -F'.' '{print $$2}') +-KER_VER_PATCH = $(shell echo $(KER_VER) | awk -F'.' '{print $$3}') ++KER_VER_MAJOR = 5 ++KER_VER_MINOR = 10 ++KER_VER_PATCH = 0 + + LINK_TARGET ?= -lpthread -lbpf -lelf -llog4cplus -lz + EXTRA_CFLAGS ?= -g -O2 -Wall -fPIC +-- +2.36.1 + diff --git a/A-Ops.spec b/A-Ops.spec index 664ad7c..e6757a0 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,6 +1,6 @@ Name: A-Ops Version: v1.2.0 -Release: 3 +Release: 4 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops @@ -12,6 +12,8 @@ patch0001: 0001-gen-vmlinx-oe2209-x86.patch patch0001: 0001-gen-vmlinx-oe2209-arm.patch %endif patch0002: 0002-fix-anteater-install-requires.patch +patch0003: 0003-rename-wrapper-function-in-gopher.patch +patch0004: 0004-set-sys-verion-macros-for-gopher.patch # build for gopher @@ -144,6 +146,8 @@ Python3 package of python3-gala-anteater # %setup -T -D -a 1 %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 +%patch0004 -p1 %build # build for aops-agent @@ -398,6 +402,10 @@ fi %changelog +* Thu Aug 4 2022 zhaoyuxing - v1.2.0-4 +- 1. add patch to rename wrapper function name. +- 2. add patch to set macros related to system versiong. + * Tue Aug 2 2022 zhaoyuxing - v1.2.0-3 - 1. add patch to modify install_requires of gala-anteater. - 2. delete redundant dependent packages for gala-spider. -- Gitee