diff --git a/1001-Skiping-cases-in-libbpf-tools.patch b/1001-Skiping-cases-in-libbpf-tools.patch deleted file mode 100644 index 1afa2d8dab842f9e436b61dae8b53ebe18746402..0000000000000000000000000000000000000000 --- a/1001-Skiping-cases-in-libbpf-tools.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f67a5908c55568e369e4ab5b36b90aeb38c93caa Mon Sep 17 00:00:00 2001 -Message-Id: -From: "Kun(llfl)" -Date: Thu, 9 Feb 2023 14:53:53 +0800 -Subject: [PATCH 1001/1001] Skiping cases in libbpf-tools - -Signed-off-by: Kun(llfl) ---- - libbpf-tools/Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libbpf-tools/Makefile b/libbpf-tools/Makefile -index a48b4e2..bb4b012 100644 ---- a/libbpf-tools/Makefile -+++ b/libbpf-tools/Makefile -@@ -57,7 +57,6 @@ APPS = \ - funclatency \ - gethostlatency \ - hardirqs \ -- javagc \ - klockstat \ - ksnoop \ - llcstat \ --- -2.39.0 - diff --git a/1002-bcc-fix-man-pages-install-dir.patch b/1001-bcc-fix-man-pages-install-dir.patch similarity index 81% rename from 1002-bcc-fix-man-pages-install-dir.patch rename to 1001-bcc-fix-man-pages-install-dir.patch index 0a257e5e2863ae1272189c1b8036eecabbc2f4e3..317891a38fbb7c75db32d24b1bf1f69e658e399b 100644 --- a/1002-bcc-fix-man-pages-install-dir.patch +++ b/1001-bcc-fix-man-pages-install-dir.patch @@ -1,5 +1,5 @@ ---- bcc-0.26.0/man/man8/CMakeLists.txt.orig 2023-02-11 00:02:06.078836658 +0800 -+++ bcc-0.26.0/man/man8/CMakeLists.txt 2023-02-11 00:03:09.599836658 +0800 +--- bcc-0.24.0/man/man8/CMakeLists.txt.orig 2023-02-11 00:02:06.078836658 +0800 ++++ bcc-0.24.0/man/man8/CMakeLists.txt 2023-02-11 00:03:09.599836658 +0800 @@ -1,12 +1,2 @@ -find_program(GZIP gzip) file(GLOB FILES *.8) diff --git a/v0.26.0.tar.gz b/bcc-0.25.0.tar.gz similarity index 40% rename from v0.26.0.tar.gz rename to bcc-0.25.0.tar.gz index 8c8723932aab63b88ef7185158d7066450bb8238..8e29830181c2114664ff192fc3e28e743c403c0f 100644 Binary files a/v0.26.0.tar.gz and b/bcc-0.25.0.tar.gz differ diff --git a/bcc.spec b/bcc.spec index b5588159801e8a8c72cddb339ed2bb037cf177be..1d1eb99286545ea73f12667f26a93e3d6b48c450 100644 --- a/bcc.spec +++ b/bcc.spec @@ -2,25 +2,21 @@ %global with_llvm_shared 1 -# Ignore the lua dependency for now -%bcond_with ignore_lua - Name: bcc -Version: 0.26.0 +Version: 0.25.0 Release: %{anolis_release}%{?dist} Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc -Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch1000: 1000-bcc-anolis-ali-enhanced-tools-for-fs-schedule-sys.patch -Patch1001: 1001-Skiping-cases-in-libbpf-tools.patch -Patch1002: 1002-bcc-fix-man-pages-install-dir.patch +Patch1001: 1001-bcc-fix-man-pages-install-dir.patch ExclusiveArch: x86_64 aarch64 BuildRequires: bison -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 2.8.7 BuildRequires: flex BuildRequires: libxml2-devel BuildRequires: python3-devel @@ -29,12 +25,10 @@ BuildRequires: elfutils-debuginfod-client-devel BuildRequires: llvm-devel BuildRequires: clang-devel BuildRequires: ncurses-devel -BuildRequires: libbpf-devel >= 1.0.0, libbpf-static >= 1.0.0 -%if %{without ignore_lua} BuildRequires: pkgconfig(luajit) -%endif +BuildRequires: libbpf-devel >= 0.0.5, libbpf-static >= 0.0.5 -Requires: libbpf >= 1.0.0 +Requires: libbpf >= 0.0.5 Requires: tar Recommends: kernel-devel @@ -79,14 +73,13 @@ BuildArch: noarch Python3 bindings for BPF Compiler Collection (BCC) -%if %{without ignore_lua} %package lua Summary: Standalone tool to run BCC tracers written in Lua Requires: %{name} = %{version}-%{release} %description lua Standalone tool to run BCC tracers written in Lua -%endif + %package tools Summary: Command line tools for BPF Compiler Collection (BCC) @@ -108,6 +101,7 @@ Command line libbpf tools for BPF Compiler Collection (BCC) %prep %autosetup -p1 + %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3 \ @@ -154,10 +148,12 @@ mkdir -p %{buildroot}/%{_sbindir} cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/ %files +%dir %{abidir} %doc README.md %license LICENSE.txt %{_libdir}/lib%{name}.so.* %{_libdir}/libbcc_bpf.so.* +%{abidir}/lib%{name}*.dump %files devel %exclude %{_libdir}/lib%{name}*.a @@ -165,7 +161,6 @@ cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/ %{_libdir}/libbcc_bpf.so %{_libdir}/pkgconfig/lib%{name}.pc %{_includedir}/%{name}/ -%{abidir}/lib%{name}*.dump %files -n python3-%{name} %{python3_sitelib}/%{name}* @@ -180,19 +175,17 @@ cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/ %{_datadir}/%{name}/introspection/ %{_mandir}/man8/* -%if %{without ignore_lua} %files lua %{_bindir}/bcc-lua -%endif %files -n libbpf-tools %{_sbindir}/bpf-* %changelog -* Tue Dec 13 2022 Kun(llfl) - 0.26.0-1 -- update version to 0.26.0 -- add ali enhanced tools for fs schedule and sys -- optimise spec file +* Wed Feb 15 2023 Chunmei Xu - 0.25.0-1 +- update to 0.25.0 +- add ali enhenced tools for fs, schedule and sys +- fix man pages installation dir (Funda Wang) * Thu May 5 2022 mgb01105731 - 0.24.0-1 - Init from upstream version 0.24.0