Sync from SUSE:SLFO:Main bcc revision f5ba5f8ff32318c1eaff7b676083395e
This commit is contained in:
commit
ab4056c97e
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||||
BIN
bcc-0.30.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
bcc-0.30.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
1321
bcc.changes
Normal file
1321
bcc.changes
Normal file
File diff suppressed because it is too large
Load Diff
267
bcc.spec
Normal file
267
bcc.spec
Normal file
@ -0,0 +1,267 @@
|
|||||||
|
#
|
||||||
|
# spec file for package bcc
|
||||||
|
#
|
||||||
|
# Copyright (c) 2024 SUSE LLC
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%if 0%{?suse_version} > 1500
|
||||||
|
%ifarch %ix86 x86_64
|
||||||
|
%{!?with_lua: %global with_lua 1}
|
||||||
|
%else
|
||||||
|
%{!?with_lua: %global with_lua 0}
|
||||||
|
%endif
|
||||||
|
%else
|
||||||
|
%{!?with_lua: %global with_lua 0}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Use default LLVM on openSUSE unless it is not yet supported
|
||||||
|
%if 0%{?suse_version} >= 1600 || 0%{?is_opensuse}
|
||||||
|
%if 0%{?product_libs_llvm_ver} > 17
|
||||||
|
%define llvm_major_version 17
|
||||||
|
%else
|
||||||
|
%define llvm_major_version %{nil}
|
||||||
|
%endif
|
||||||
|
%else
|
||||||
|
# Hard-code latest LLVM for SLES, the default version is too old
|
||||||
|
%if 0%{?sle_version} == 150600
|
||||||
|
%define llvm_major_version 17
|
||||||
|
%else
|
||||||
|
%if 0%{?sle_version} == 150500
|
||||||
|
%define llvm_major_version 15
|
||||||
|
%else
|
||||||
|
%if 0%{?sle_version} == 150400
|
||||||
|
%define llvm_major_version 11
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Name: bcc
|
||||||
|
Version: 0.30.0
|
||||||
|
Release: 0
|
||||||
|
Summary: BPF Compiler Collection (BCC)
|
||||||
|
License: Apache-2.0
|
||||||
|
Group: Development/Tools/Other
|
||||||
|
URL: https://github.com/iovisor/bcc
|
||||||
|
Source: https://github.com/iovisor/bcc/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
# PATCH-FIX-UPSTREAM build-remove-llvm-dev-dependency-from-libbcc.patch -- based on PR 5018
|
||||||
|
Patch1: build-remove-llvm-dev-dependency-from-libbcc.patch
|
||||||
|
ExcludeArch: ppc s390
|
||||||
|
BuildRequires: bison
|
||||||
|
BuildRequires: cmake >= 2.8.7
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: libbpf-devel
|
||||||
|
BuildRequires: libelf-devel
|
||||||
|
BuildRequires: llvm%{llvm_major_version}-devel
|
||||||
|
%if 0%{?suse_version} > 1320
|
||||||
|
BuildRequires: clang%{llvm_major_version}-devel
|
||||||
|
BuildRequires: llvm%{llvm_major_version}-gold
|
||||||
|
%else
|
||||||
|
BuildRequires: libstdc++-devel
|
||||||
|
%endif
|
||||||
|
%if %{with_lua}
|
||||||
|
BuildRequires: luajit-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: pkg-config
|
||||||
|
BuildRequires: python3-base
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
|
||||||
|
%description
|
||||||
|
BCC is a toolkit for creating efficient kernel tracing and manipulation
|
||||||
|
programs, and includes several useful tools and examples. It makes use
|
||||||
|
of eBPF (Extended Berkeley Packet Filters), a feature that was first
|
||||||
|
added to Linux 3.15. Much of what BCC uses requires Linux 4.1 and above.
|
||||||
|
|
||||||
|
%package -n libbcc0
|
||||||
|
Summary: Shared library from the BPF Compiler Collection
|
||||||
|
Group: System/Libraries
|
||||||
|
Requires: kernel >= 4.1.0
|
||||||
|
Requires: kernel-devel >= 4.1.0
|
||||||
|
Requires: (kernel-debug-devel if kernel-debug)
|
||||||
|
Requires: (kernel-default-devel if (kernel-default or kernel-default-base))
|
||||||
|
Requires: (kernel-kvmsmall-devel if kernel-kvmsmall)
|
||||||
|
Requires: (kernel-pae-devel if kernel-pae)
|
||||||
|
Requires: (kernel-vanilla-devel if kernel-vanilla)
|
||||||
|
|
||||||
|
%description -n libbcc0
|
||||||
|
Shared Library from the BPF Compiler Collection.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Header files for the BPF Compiler Collection
|
||||||
|
Group: Development/Languages/C and C++
|
||||||
|
Requires: libbcc0 = %{version}
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Headers and pkg-config build descriptions for developing BCC programs.
|
||||||
|
|
||||||
|
%package -n python3-bcc
|
||||||
|
Summary: Python3 bindings for the BPF Compiler Collection
|
||||||
|
Group: Development/Languages/Python
|
||||||
|
Requires: libbcc0 = %{version}
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description -n python3-bcc
|
||||||
|
Python 3.x bindings for the BPF Compiler Collection.
|
||||||
|
|
||||||
|
%package lua
|
||||||
|
Summary: Lua interpreter for the BPF Compiler Collection
|
||||||
|
Group: Development/Languages/Other
|
||||||
|
Requires: libbcc0 = %{version}
|
||||||
|
|
||||||
|
%description lua
|
||||||
|
Lua interpreter for the BPF Compiler Collection.
|
||||||
|
|
||||||
|
%package examples
|
||||||
|
Summary: Examples from the BPF Compiler Collection
|
||||||
|
Group: Documentation/Other
|
||||||
|
Requires: python3-bcc = %{version}
|
||||||
|
Recommends: netperf
|
||||||
|
Recommends: python3-netaddr
|
||||||
|
Recommends: python3-pyroute2
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description examples
|
||||||
|
Python and C examples from the BPF Compiler Collection.
|
||||||
|
|
||||||
|
%package tools
|
||||||
|
Summary: Tracing tools from the BPF Compiler Collection
|
||||||
|
# ausyscall from audit is required by syscount.py
|
||||||
|
Group: System/Monitoring
|
||||||
|
Requires: audit
|
||||||
|
Requires: python3-bcc = %{version}
|
||||||
|
Requires: python3-pyelftools
|
||||||
|
|
||||||
|
%description tools
|
||||||
|
Python tracing scripts from the BPF Compiler Collection.
|
||||||
|
|
||||||
|
%package docs
|
||||||
|
Summary: BPF Compiler Collection documentation
|
||||||
|
Group: Documentation/Other
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description docs
|
||||||
|
Documentation on how to write programs with the BPF Compiler Collection.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
# Prevent the cpp examples from compilation and installation
|
||||||
|
# Those programs are statically linked and huge in binary size.
|
||||||
|
sed -i "/add_subdirectory(cpp)/d" examples/CMakeLists.txt
|
||||||
|
|
||||||
|
# Remove the lua scripts if bcc-lua is disabled
|
||||||
|
%if %{with_lua} == 0
|
||||||
|
sed -i "/add_subdirectory(lua)/d" examples/CMakeLists.txt
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Install bps to /usr/bin
|
||||||
|
sed -i "s,share/bcc/introspection,bin," introspection/CMakeLists.txt
|
||||||
|
|
||||||
|
export LD_LIBRARY_PATH="%{_builddir}/usr/lib64"
|
||||||
|
export PATH="%{_builddir}/usr/bin":$PATH
|
||||||
|
|
||||||
|
mkdir build
|
||||||
|
pushd build
|
||||||
|
CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" cmake \
|
||||||
|
-DCMAKE_USE_LIBBPF_PACKAGE=yes \
|
||||||
|
-DPYTHON_CMD=python3 \
|
||||||
|
-DREVISION_LAST=%{version} \
|
||||||
|
-DREVISION=%{version} \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
%if 0%{?suse_version} > 1320
|
||||||
|
-DENABLE_LLVM_SHARED=1 \
|
||||||
|
%endif
|
||||||
|
%if %{with_lua}
|
||||||
|
-DLUAJIT_INCLUDE_DIR=`pkg-config --variable=includedir luajit` \
|
||||||
|
-DLUAJIT_LIBRARY=%{_libdir}/lib`pkg-config --variable=libname luajit`.so \
|
||||||
|
-DENABLE_NO_PIE=OFF \
|
||||||
|
%endif
|
||||||
|
%ifarch %arm || %ix86
|
||||||
|
-DENABLE_USDT=OFF \
|
||||||
|
%endif
|
||||||
|
-DENABLE_TESTS=OFF \
|
||||||
|
..
|
||||||
|
make %{?_smp_mflags} VERBOSE=1
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Fix up #!-lines.
|
||||||
|
find tools/ examples/ -type f -exec \
|
||||||
|
sed -Ei '1s|^#!/usr/bin/env python3?|#!/usr/bin/python3|' {} +
|
||||||
|
find tools/ examples/ -type f -exec \
|
||||||
|
sed -Ei '1s|^#!/usr/bin/env bcc-lua|#!/usr/bin/bcc-lua|' {} +
|
||||||
|
find tools/ examples/ -type f -exec \
|
||||||
|
sed -i '1s|/bin/python$|/bin/python3|g' {} +
|
||||||
|
|
||||||
|
%install
|
||||||
|
pushd build
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150500
|
||||||
|
# Remove bps due to the incomplete support in kernel (bsc#1085403)
|
||||||
|
rm -f %{buildroot}/%{_bindir}/bps
|
||||||
|
%endif
|
||||||
|
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Remove the static libraries
|
||||||
|
rm -f %{buildroot}/%{_libdir}/libbcc*.a
|
||||||
|
|
||||||
|
%post -n libbcc0 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libbcc0 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%files -n bcc-devel
|
||||||
|
%{_libdir}/libbcc.so
|
||||||
|
%{_libdir}/libbcc_bpf.so
|
||||||
|
%dir %{_includedir}/bcc/
|
||||||
|
%{_includedir}/bcc/*
|
||||||
|
%{_libdir}/pkgconfig/libbcc.pc
|
||||||
|
|
||||||
|
%files -n libbcc0
|
||||||
|
%license LICENSE.txt
|
||||||
|
%{_libdir}/libbcc.so.*
|
||||||
|
%{_libdir}/libbcc_bpf.so.*
|
||||||
|
|
||||||
|
%files -n python3-bcc
|
||||||
|
%{python3_sitelib}/bcc*
|
||||||
|
|
||||||
|
%if %{with_lua}
|
||||||
|
%files lua
|
||||||
|
%{_bindir}/bcc-lua
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files examples
|
||||||
|
%dir %{_datadir}/bcc/
|
||||||
|
%dir %{_datadir}/bcc/examples/
|
||||||
|
%{_datadir}/bcc/examples/*
|
||||||
|
|
||||||
|
%files tools
|
||||||
|
%dir %{_datadir}/bcc/
|
||||||
|
%dir %{_datadir}/bcc/tools/
|
||||||
|
%{_datadir}/bcc/tools/*
|
||||||
|
%dir %{_datadir}/bcc/man/
|
||||||
|
%{_datadir}/bcc/man/*
|
||||||
|
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150500
|
||||||
|
%{_bindir}/bps
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files docs
|
||||||
|
%doc README.md FAQ.txt
|
||||||
|
%doc docs/kernel-versions.md docs/reference_guide.md
|
||||||
|
%doc docs/tutorial_bcc_python_developer.md docs/tutorial.md
|
||||||
|
|
||||||
|
%changelog
|
||||||
49
build-remove-llvm-dev-dependency-from-libbcc.patch
Normal file
49
build-remove-llvm-dev-dependency-from-libbcc.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
From 5b8e284d06743e21be814913f187957e43122751 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Manu Bretelle <chantr4@gmail.com>
|
||||||
|
Date: Wed, 29 May 2024 14:38:22 -0700
|
||||||
|
Subject: [PATCH 1/2] build: remove llvm-dev dependency from libbcc
|
||||||
|
|
||||||
|
In #4737 I added depedency on llvm-config.h in order to discover what LLVM version
|
||||||
|
is being used. This was only meant to be used at build time.
|
||||||
|
By adding llvm-config.h in bpf_module.h, a public header of libbcc, I introduced
|
||||||
|
a dependency on llvm-dev to libbcc which is unnecessary.
|
||||||
|
|
||||||
|
This change removes the include from `bpf_module.h`, which should be enough, and
|
||||||
|
add it to `bpf_module.cc` instead.
|
||||||
|
|
||||||
|
Fixes #4997
|
||||||
|
|
||||||
|
Signed-off-by: Manu Bretelle <chantr4@gmail.com>
|
||||||
|
---
|
||||||
|
src/cc/bpf_module.cc | 1 +
|
||||||
|
src/cc/bpf_module.h | 2 --
|
||||||
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
|
||||||
|
index 91ab9af6..c0dd0119 100644
|
||||||
|
--- a/src/cc/bpf_module.cc
|
||||||
|
+++ b/src/cc/bpf_module.cc
|
||||||
|
@@ -17,6 +17,7 @@
|
||||||
|
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <linux/bpf.h>
|
||||||
|
+#include <llvm/Config/llvm-config.h>
|
||||||
|
#if LLVM_VERSION_MAJOR <= 16
|
||||||
|
#include <llvm-c/Transforms/IPO.h>
|
||||||
|
#endif
|
||||||
|
diff --git a/src/cc/bpf_module.h b/src/cc/bpf_module.h
|
||||||
|
index 56786e90..fc491cfe 100644
|
||||||
|
--- a/src/cc/bpf_module.h
|
||||||
|
+++ b/src/cc/bpf_module.h
|
||||||
|
@@ -22,8 +22,6 @@
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
-#include <llvm/Config/llvm-config.h>
|
||||||
|
-
|
||||||
|
#include "bcc_exception.h"
|
||||||
|
#include "table_storage.h"
|
||||||
|
|
||||||
|
--
|
||||||
|
2.45.1
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user