Skip to content

DLPX-81527 Move bcc to python3 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2022
Merged

DLPX-81527 Move bcc to python3 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/bcc-tools.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
usr/share/bcc/introspection/*
usr/share/bcc/tools/*
usr/share/bcc/tools/* usr/sbin/
usr/share/bcc/man/*
15 changes: 4 additions & 11 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9), cmake,
libclang-9-dev | libclang-8-dev | libclang-6.0-dev | libclang-3.8-dev [!arm64] | libclang-3.7-dev [!arm64],
clang-format-9 | clang-format-8 | clang-format-6.0 | clang-format-3.8 [!arm64] | clang-format-3.7 [!arm64] | clang-format,
libelf-dev, bison, flex, libfl-dev, libedit-dev, zlib1g-dev, git,
python (>= 2.7), python-netaddr, python-pyroute2 | python3-pyroute2, luajit,
python3:any, python3-netaddr, python3-pyroute2, luajit,
libluajit-5.1-dev, arping, inetutils-ping | iputils-ping, iperf, netperf,
ethtool, devscripts, python3, dh-python
ethtool, devscripts, dh-python
# add 'libdebuginfod-dev' to Build-Depends for libdebuginfod support
Homepage: https://github.com/iovisor/bcc

Expand All @@ -30,25 +30,18 @@ Architecture: any
Depends: libbcc (= ${binary:Version})
Description: Examples for BPF Compiler Collection (BCC)

Package: python-bcc
Architecture: all
Provides: python-bpfcc
Conflicts: python-bpfcc
Depends: libbcc (= ${binary:Version}), python, binutils
Description: Python wrappers for BPF Compiler Collection (BCC)

Package: python3-bcc
Architecture: all
Provides: python3-bpfcc
Conflicts: python3-bpfcc
Depends: libbcc (= ${binary:Version}), python3, binutils
Depends: libbcc (= ${binary:Version}), ${python3:Depends}, binutils
Description: Python3 wrappers for BPF Compiler Collection (BCC)

Package: bcc-tools
Architecture: all
Provides: bpfcc-tools
Conflicts: bpfcc-tools
Depends: python-bcc (= ${binary:Version})
Depends: python3-bcc (= ${binary:Version}), ${python3:Depends}
Description: Command line tools for BPF Compiler Collection (BCC)

Package: bcc-lua
Expand Down
1 change: 0 additions & 1 deletion debian/python-bcc.install
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: ([0-9.]+)
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: ([0-9.]+)(~|-)(.*),\1,p")

%:
dh $@ --buildsystem=cmake --parallel --with python2,python3
dh $@ --buildsystem=cmake --parallel --with python3

# tests cannot be run in parallel
override_dh_auto_test:
Expand All @@ -18,6 +18,10 @@ override_dh_auto_test:
# packages that were built to be installed.
#dh_auto_test -O--buildsystem=cmake -O--no-parallel

# Get the python scripts to use python3 by replacinge shebang /usr/bin/python
override_dh_python3:
dh_python3 --shebang=/usr/bin/python3

# FIXME: LLVM_DEFINITIONS is broken somehow in LLVM cmake upstream
override_dh_auto_configure:
dh_auto_configure -- -DREVISION_LAST=$(UPSTREAM_VERSION) -DREVISION=$(UPSTREAM_VERSION) -DLLVM_DEFINITIONS="-D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -DPYTHON_CMD="python2;python3"
dh_auto_configure -- -DREVISION_LAST=$(UPSTREAM_VERSION) -DREVISION=$(UPSTREAM_VERSION) -DLLVM_DEFINITIONS="-D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -DPYTHON_CMD="python3"