79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
From ce5349ae6bcc922130bd19cbed5224727ee21c9a Mon Sep 17 00:00:00 2001
|
|
From: Vchanger <348085547@qq.com>
|
|
Date: Sun, 4 Dec 2022 21:51:03 +0800
|
|
Subject: [PATCH] simplify vmlinux.h management with different kernel versions
|
|
|
|
---
|
|
build/build.sh | 2 ++
|
|
src/probes/extends/ebpf.probe/build.sh | 12 ++++--------
|
|
src/probes/extends/ebpf.probe/src/mk/var.mk | 4 ++--
|
|
3 files changed, 8 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/build/build.sh b/build/build.sh
|
|
index 7d259e3..40171e3 100755
|
|
--- a/build/build.sh
|
|
+++ b/build/build.sh
|
|
@@ -17,6 +17,8 @@ DAEMON_FOLDER=${PROJECT_FOLDER}/src/daemon
|
|
TAILOR_PATH=${PROJECT_FOLDER}/tailor.conf
|
|
TAILOR_PATH_TMP=${TAILOR_PATH}.tmp
|
|
|
|
+export LINUX_VER="${2:-$(uname -r)}"
|
|
+
|
|
function load_tailor()
|
|
{
|
|
if [ -f ${TAILOR_PATH} ]; then
|
|
diff --git a/src/probes/extends/ebpf.probe/build.sh b/src/probes/extends/ebpf.probe/build.sh
|
|
index 05a1547..dcc7ffe 100755
|
|
--- a/src/probes/extends/ebpf.probe/build.sh
|
|
+++ b/src/probes/extends/ebpf.probe/build.sh
|
|
@@ -6,24 +6,20 @@ PRJ_DIR=$(dirname $(readlink -f "$0"))
|
|
TOOLS_DIR=${PRJ_DIR}/tools
|
|
SRC_DIR=${PRJ_DIR}/src
|
|
VMLINUX_DIR=${SRC_DIR}/include
|
|
-LINUX_VER=$(uname -r)
|
|
DEP_LIST=(elfutils-devel libbpf libbpf-devel clang llvm)
|
|
|
|
-function gen_vmlinux_header_file()
|
|
+function add_bpftool()
|
|
{
|
|
cd ${TOOLS_DIR}
|
|
if [ ! -f "bpftool" ];then
|
|
ln -s bpftool_${ARCH} bpftool
|
|
fi
|
|
- ./gen_vmlinux_h.sh
|
|
}
|
|
|
|
-function add_bpftool()
|
|
+function gen_vmlinux_header_file()
|
|
{
|
|
- cd ${TOOLS_DIR}
|
|
- if [ ! -f "bpftool" ];then
|
|
- ln -s bpftool_${ARCH} bpftool
|
|
- fi
|
|
+ add_bpftool
|
|
+ ./gen_vmlinux_h.sh
|
|
}
|
|
|
|
function check_dep()
|
|
diff --git a/src/probes/extends/ebpf.probe/src/mk/var.mk b/src/probes/extends/ebpf.probe/src/mk/var.mk
|
|
index fc33e22..8990bda 100644
|
|
--- a/src/probes/extends/ebpf.probe/src/mk/var.mk
|
|
+++ b/src/probes/extends/ebpf.probe/src/mk/var.mk
|
|
@@ -23,11 +23,11 @@ else ifeq ($(ARCH), aarch64)
|
|
ARCH = arm64
|
|
endif
|
|
|
|
-KER_VER = $(shell uname -r | awk -F'-' '{print $$1}')
|
|
+KER_VER = $(shell echo $(LINUX_VER) | 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}')
|
|
-RELEASE_INFOS = $(shell uname -r | awk -F'-' '{print $$2}')
|
|
+RELEASE_INFOS = $(shell echo $(LINUX_VER) | awk -F'-' '{print $$2}')
|
|
KER_RELEASE = $(shell echo $(RELEASE_INFOS) | awk -F'.' '{print $$1}')
|
|
|
|
LIBBPF_VER = $(shell rpm -qa | grep libbpf-devel | awk -F'-' '{print $$3}')
|
|
--
|
|
2.33.0
|
|
|