From 2ed87b8aa94049f8f8f9d09d0feea2c4af2d9f3f Mon Sep 17 00:00:00 2001 From: wo_cow Date: Thu, 17 Nov 2022 22:12:29 +0800 Subject: [PATCH] resolve patch conflict (cherry picked from commit 5ecce6ef2d3c0295259d6a1d4fde9fe46fabeeb9) --- gala-gopher.spec | 13 ++++++++----- modify-to-adapt-to-oe2203-LTS-SP1-arm.patch | 16 ++++++++-------- modify-to-adapt-to-oe2203-LTS-SP1-x86.patch | 16 ++++++++-------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/gala-gopher.spec b/gala-gopher.spec index 27435c5..3b89fe1 100644 --- a/gala-gopher.spec +++ b/gala-gopher.spec @@ -4,7 +4,7 @@ Summary: Intelligent ops toolkit for openEuler Name: gala-gopher Version: 1.0.0 -Release: 6 +Release: 7 License: Mulan PSL v2 URL: https://gitee.com/openeuler/gala-gopher Source: %{name}-%{version}.tar.gz @@ -18,14 +18,14 @@ Requires: dmidecode python3-psycopg2 python3-yaml erlang-eflame Requires: flamegraph-stackcollapse patch0: add-vmlinux-for-2203LTS-2203LTS-SP1.patch +patch1: fix-pgsliprobe.patch +patch2: adapt-libbpf-v08.patch %ifarch x86_64 -patch1: modify-to-adapt-to-oe2203-LTS-SP1-x86.patch +patch3: modify-to-adapt-to-oe2203-LTS-SP1-x86.patch %endif %ifarch aarch64 -patch1: modify-to-adapt-to-oe2203-LTS-SP1-arm.patch +patch3: modify-to-adapt-to-oe2203-LTS-SP1-arm.patch %endif -patch2: fix-pgsliprobe.patch -patch3: adapt-libbpf-v08.patch %description gala-gopher is a low-overhead eBPF-based probes framework @@ -73,6 +73,9 @@ popd %changelog +* Thu Nov 17 2022 wo_cow - 1.0.0-7 +- resolve patch conflict + * Thu Nov 17 2022 wo_cow - 1.0.0-6 - adapt libbpf v0.8 diff --git a/modify-to-adapt-to-oe2203-LTS-SP1-arm.patch b/modify-to-adapt-to-oe2203-LTS-SP1-arm.patch index 24c77d5..b83b2a7 100644 --- a/modify-to-adapt-to-oe2203-LTS-SP1-arm.patch +++ b/modify-to-adapt-to-oe2203-LTS-SP1-arm.patch @@ -1,15 +1,15 @@ -From 82974fc559451d52897053314ffa66e2c9ed7cd6 Mon Sep 17 00:00:00 2001 +From be59848fc48885c656dda02565b55e84dc4bcb12 Mon Sep 17 00:00:00 2001 From: zhaoyuxing Date: Wed, 10 Aug 2022 17:12:16 +0800 Subject: [PATCH] modify vmlinux.h and version infos of oe-22.03 LTS SP1 arm --- - src/probes/extends/ebpf.probe/build.sh | 20 +++---------------- - src/probes/extends/ebpf.probe/src/mk/var.mk | 10 ++++------ + src/probes/extends/ebpf.probe/build.sh | 20 +++----------------- + src/probes/extends/ebpf.probe/src/mk/var.mk | 10 ++++------ 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/probes/extends/ebpf.probe/build.sh b/src/probes/extends/ebpf.probe/build.sh -index ab4aa3e..6a33a1b 100755 +index ab4aa3e..ff08ab0 100755 --- a/src/probes/extends/ebpf.probe/build.sh +++ b/src/probes/extends/ebpf.probe/build.sh @@ -82,23 +82,9 @@ function compile_probe() @@ -40,7 +40,7 @@ index ab4aa3e..6a33a1b 100755 cd ${SRC_DIR} echo "=======Begin to compile ebpf-based probes======:" ${EBPF_PROBES} diff --git a/src/probes/extends/ebpf.probe/src/mk/var.mk b/src/probes/extends/ebpf.probe/src/mk/var.mk -index 1a1e8db..d61b124 100644 +index 2522a6f..16a14d0 100644 --- a/src/probes/extends/ebpf.probe/src/mk/var.mk +++ b/src/probes/extends/ebpf.probe/src/mk/var.mk @@ -23,12 +23,10 @@ else ifeq ($(ARCH), aarch64) @@ -58,8 +58,8 @@ index 1a1e8db..d61b124 100644 +KER_VER_PATCH = 0 +KER_RELEASE = 126 - LINK_TARGET ?= -lpthread -lbpf -lelf -llog4cplus -lz -lconfig - EXTRA_CFLAGS ?= -g -O2 -Wall -fPIC + LIBBPF_VER = $(shell rpm -qa | grep libbpf-devel | awk -F'-' '{print $$3}') + LIBBPF_VER_MAJOR = $(shell echo $(LIBBPF_VER) | awk -F'.' '{print $$1}') -- -2.36.1 +2.27.0 diff --git a/modify-to-adapt-to-oe2203-LTS-SP1-x86.patch b/modify-to-adapt-to-oe2203-LTS-SP1-x86.patch index 9a26f00..9607783 100644 --- a/modify-to-adapt-to-oe2203-LTS-SP1-x86.patch +++ b/modify-to-adapt-to-oe2203-LTS-SP1-x86.patch @@ -1,15 +1,15 @@ -From 82974fc559451d52897053314ffa66e2c9ed7cd6 Mon Sep 17 00:00:00 2001 +From 5c1507c880fb8c80bfe6e1809cc03195e9fd9c7f Mon Sep 17 00:00:00 2001 From: zhaoyuxing Date: Wed, 10 Aug 2022 17:12:16 +0800 Subject: [PATCH] modify vmlinux.h and version infos of oe-22.03 LTS SP1 x86 --- - src/probes/extends/ebpf.probe/build.sh | 20 +++---------------- - src/probes/extends/ebpf.probe/src/mk/var.mk | 10 ++++------ + src/probes/extends/ebpf.probe/build.sh | 20 +++----------------- + src/probes/extends/ebpf.probe/src/mk/var.mk | 10 ++++------ 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/probes/extends/ebpf.probe/build.sh b/src/probes/extends/ebpf.probe/build.sh -index ab4aa3e..6a33a1b 100755 +index ab4aa3e..00f9bd8 100755 --- a/src/probes/extends/ebpf.probe/build.sh +++ b/src/probes/extends/ebpf.probe/build.sh @@ -82,23 +82,9 @@ function compile_probe() @@ -40,7 +40,7 @@ index ab4aa3e..6a33a1b 100755 cd ${SRC_DIR} echo "=======Begin to compile ebpf-based probes======:" ${EBPF_PROBES} diff --git a/src/probes/extends/ebpf.probe/src/mk/var.mk b/src/probes/extends/ebpf.probe/src/mk/var.mk -index 1a1e8db..d61b124 100644 +index 2522a6f..16a14d0 100644 --- a/src/probes/extends/ebpf.probe/src/mk/var.mk +++ b/src/probes/extends/ebpf.probe/src/mk/var.mk @@ -23,12 +23,10 @@ else ifeq ($(ARCH), aarch64) @@ -58,8 +58,8 @@ index 1a1e8db..d61b124 100644 +KER_VER_PATCH = 0 +KER_RELEASE = 126 - LINK_TARGET ?= -lpthread -lbpf -lelf -llog4cplus -lz -lconfig - EXTRA_CFLAGS ?= -g -O2 -Wall -fPIC + LIBBPF_VER = $(shell rpm -qa | grep libbpf-devel | awk -F'-' '{print $$3}') + LIBBPF_VER_MAJOR = $(shell echo $(LIBBPF_VER) | awk -F'.' '{print $$1}') -- -2.36.1 +2.27.0 -- Gitee