diff --git a/Replace-openEuler-with-VENROR.patch b/Replace-openEuler-with-VENROR.patch new file mode 100644 index 0000000000000000000000000000000000000000..e27cff6d4cd0d2a3be259d278689d41107511600 --- /dev/null +++ b/Replace-openEuler-with-VENROR.patch @@ -0,0 +1,32 @@ +From de44a1580918f90204df01bef83e97216565520f Mon Sep 17 00:00:00 2001 +From: huangwenhua +Date: Tue, 23 Apr 2024 09:16:15 +0800 +Subject: [PATCH] Replace openEuler with VENROR + +--- + src/probes/extends/ebpf.probe/src/mk/var.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/probes/extends/ebpf.probe/src/mk/var.mk b/src/probes/extends/ebpf.probe/src/mk/var.mk +index 6d6ea83..09848ff 100644 +--- a/src/probes/extends/ebpf.probe/src/mk/var.mk ++++ b/src/probes/extends/ebpf.probe/src/mk/var.mk +@@ -58,13 +58,14 @@ LDFLAGS += -Wl,--copy-dt-needed-entries -Wl,-z,relro,-z,now + CXXFLAGS += -std=c++11 -g -O2 -Wall -fPIC + C++ = g++ + CC = gcc ++VENDOR = $(shell rpm --eval "%{_vendor}") + + CLANGFLAGS := $(CFLAGS) + CFLAGS += -Wno-format-truncation + + CXX_VERSION = $(shell $(C++) -dumpversion) + CXX_STDLIB_DIR = /usr/include/c++/$(CXX_VERSION) +-CXXABI_INCLUDE_DIR = -I$(CXX_STDLIB_DIR) -I$(CXX_STDLIB_DIR)/$(ARCH)-linux-gnu -I$(CXX_STDLIB_DIR)/$(ARCH)-openEuler-linux ++CXXABI_INCLUDE_DIR = -I$(CXX_STDLIB_DIR) -I$(CXX_STDLIB_DIR)/$(ARCH)-linux-gnu -I$(CXX_STDLIB_DIR)/$(ARCH)-$(VENDOR)-linux + + BASE_INC := -I/usr/include \ + -I$(ROOT_DIR)../include \ +-- +2.25.1 + diff --git a/gala-gopher.spec b/gala-gopher.spec index 0d11123f2aadbe1434a336ff7c7bd3d9f66fdc2b..45613eac96310bdc68ff1096372f417648b60b1a 100644 --- a/gala-gopher.spec +++ b/gala-gopher.spec @@ -28,7 +28,7 @@ Summary: Intelligent ops toolkit for openEuler Name: gala-gopher Version: 2.0.0 -Release: 6 +Release: 7 License: Mulan PSL v2 URL: https://gitee.com/openeuler/gala-gopher Source: %{name}-%{version}.tar.gz @@ -97,6 +97,7 @@ Requires: lsof %endif Patch1: metric_total_size-may-be-a-float.patch +Patch2: Replace-openEuler-with-VENROR.patch %description gala-gopher is a low-overhead eBPF-based probes framework @@ -182,6 +183,9 @@ fi %attr(0550,root,root) /usr/libexec/gala-gopher/init_probes.sh %changelog +* Tue Apr 23 2024 huangwenhua - 2.0.0-6 - metric_total_size may be negative or float