From 002d85b06084939727ea2482d80d8bbfdf74346b Mon Sep 17 00:00:00 2001 From: kwb0523 Date: Wed, 30 Aug 2023 17:15:51 +0800 Subject: [PATCH] use the BTF info in kernel-debuginfo for Kmesh.ko --- 0001-fix-miss-btf-in-ko-and-ebpf-over-limit.patch | 2 +- Kmesh.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/0001-fix-miss-btf-in-ko-and-ebpf-over-limit.patch b/0001-fix-miss-btf-in-ko-and-ebpf-over-limit.patch index bbfa77a..d930184 100644 --- a/0001-fix-miss-btf-in-ko-and-ebpf-over-limit.patch +++ b/0001-fix-miss-btf-in-ko-and-ebpf-over-limit.patch @@ -34,7 +34,7 @@ index a266e19..f9a20e2 100755 export PATH=$PATH:$ROOT_DIR/vendor/google.golang.org/protobuf/cmd/protoc-gen-go/ cp $ROOT_DIR/depends/include/5.10.0-60.18.0.50.oe2203/bpf_helper_defs_ext.h $ROOT_DIR/bpf/include/ -+ cp /sys/kernel/btf/vmlinux /usr/lib/modules/`uname -r`/build/ ++ cp /usr/lib/debug/lib/modules/`uname -r`/vmlinux /usr/lib/modules/`uname -r`/build/ } function install() { diff --git a/Kmesh.spec b/Kmesh.spec index 1d5af97..408a29f 100644 --- a/Kmesh.spec +++ b/Kmesh.spec @@ -1,7 +1,7 @@ %global _find_debuginfo_opts --keep-section ".BTF" Name: Kmesh Version: 0.3.0 -Release: 5 +Release: 6 Summary: %{name} is a eBPF-based service mesh kernel solution License: ASL 2.0 and GPL-2.0 URL: https://gitee.com/openeuler/%{name} @@ -14,6 +14,7 @@ BuildRequires: clang >= 10.0.1 llvm >= 10.0.1 BuildRequires: libbpf-devel kernel-devel >= 6.4 BuildRequires: libboundscheck BuildRequires: uname-build-checks +BuildRequires: kernel-debuginfo Requires: bpftool Requires: libbpf @@ -114,6 +115,9 @@ rm -rf %{buildroot} %attr(0500,root,root) /usr/bin/kmesh-stop-post.sh %changelog +* Wed Aug 30 2023 JofDiamonds - 0.3.0-6 +- use the BTF info in kernel-debuginfo for Kmesh.ko + * Mon Aug 28 2023 JofDiamonds - 0.3.0-5 - keep BTF section in kmesh.ko -- Gitee