import bcc-0.19.0-4.el8

This commit is contained in:
CentOS Sources 2021-07-16 04:20:47 +00:00 committed by Andrew Lukoshko
parent 6d75a5a710
commit b3222632c3
4 changed files with 40 additions and 10 deletions

View File

@ -1 +1 @@
14adea5e3cffc1b5ceda96d4ad6f1044c81f6838 SOURCES/bcc-src-with-submodule.tar.gz
96882747089d093b8933456d9c7905407bde7fd9 SOURCES/bcc-0.19.0.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/bcc-src-with-submodule.tar.gz
SOURCES/bcc-0.19.0.tar.gz

View File

@ -0,0 +1,27 @@
From d25f87677b554d9cbdc609c020a2baa59e442443 Mon Sep 17 00:00:00 2001
From: Jerome Marchand <jmarchan@redhat.com>
Date: Wed, 2 Jun 2021 10:57:43 +0200
Subject: [PATCH] Define missing BPF_* macros
We're currently missing BPF_MAP_TYPE_TASK_STORAGE. This could be
fixed by a future rebase. In the mean time, let's have a temporary
fix.
diff --git a/introspection/bps.c b/introspection/bps.c
index 0eae675e..1108e417 100644
--- a/introspection/bps.c
+++ b/introspection/bps.c
@@ -49,6 +49,10 @@ static const char * const prog_type_strings[] = {
[BPF_PROG_TYPE_SK_LOOKUP] = "sk_lookup",
};
+#ifndef BPF_MAP_TYPE_TASK_STORAGE
+#define BPF_MAP_TYPE_TASK_STORAGE (BPF_MAP_TYPE_INODE_STORAGE + 1)
+#endif
+
static const char * const map_type_strings[] = {
[BPF_MAP_TYPE_UNSPEC] = "unspec",
[BPF_MAP_TYPE_HASH] = "hash",
--
2.31.1

View File

@ -9,15 +9,14 @@
Name: bcc
Version: 0.19.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: BPF Compiler Collection (BCC)
License: ASL 2.0
URL: https://github.com/iovisor/bcc
# Upstream now provides a release with the git submodule embedded in it
Source0: %{url}/releases/download/v%{version}/%{name}-src-with-submodule.tar.gz
#Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: %{name}-%{version}-Manpages-remove-unstable-statement.patch
Patch1: %{name}-%{version}-Fix-BPF-src_file-foo.patch
Patch2: %{name}-%{version}-Define-missing-BPF_-macros.patch
# Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches
@ -40,8 +39,10 @@ BuildRequires: pkgconfig(luajit)
%endif
BuildRequires: libbpf-devel >= 0.0.9, libbpf-static >= 0.0.9
Requires: %{name}-tools = %{version}-%{release}
Requires: libbpf >= 0.0.9
Requires: tar
Recommends: kernel-devel
Recommends: %{name}-tools = %{version}-%{release}
%description
BCC is a toolkit for creating efficient kernel tracing and manipulation
@ -97,14 +98,12 @@ Standalone tool to run BCC tracers written in Lua
Summary: Command line tools for BPF Compiler Collection (BCC)
Requires: python3-%{name} = %{version}-%{release}
Requires: python3-netaddr
Requires: tar
Recommends: kernel-devel
%description tools
Command line tools for BPF Compiler Collection (BCC)
%prep
%autosetup -p1 -n %{name}
%autosetup -p1
%build
%cmake . \
@ -214,6 +213,10 @@ done
%changelog
* Fri Jul 02 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-4
- Build bcc from standard sources
- Don't require bcc-tools by default
* Wed Jun 09 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-3
- Rebuild on LLVM 12