diff -Nru bpfcc-0.26.0+ds/debian/changelog bpfcc-0.26.0+ds/debian/changelog --- bpfcc-0.26.0+ds/debian/changelog 2023-02-13 04:19:33.000000000 +0000 +++ bpfcc-0.26.0+ds/debian/changelog 2023-02-14 13:52:10.000000000 +0000 @@ -1,3 +1,12 @@ +bpfcc (0.26.0+ds-1ubuntu1) lunar; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Depend on linux-tools-generic instead of bpftool (See LP: #1981089) + - Export bpftool binary to avoid system trying to use the chroot kernel + (uname -r command) + + -- Gianfranco Costamagna Tue, 14 Feb 2023 14:52:10 +0100 + bpfcc (0.26.0+ds-1) unstable; urgency=medium * [b4a876d] New upstream version 0.26.0+ds @@ -5,6 +14,14 @@ -- Vasudev Kamath Mon, 13 Feb 2023 09:49:33 +0530 +bpfcc (0.25.0+ds-2ubuntu1) lunar; urgency=medium + + * Depend on linux-tools-generic instead of bpftool (See LP: #1981089) + * Export bpftool binary to avoid system trying to use the chroot kernel + (uname -r command) + + -- Gianfranco Costamagna Mon, 23 Jan 2023 19:35:49 +0100 + bpfcc (0.25.0+ds-2) unstable; urgency=medium * [9fe5665] Cleanup existing temporary kernel headers path. diff -Nru bpfcc-0.26.0+ds/debian/control bpfcc-0.26.0+ds/debian/control --- bpfcc-0.26.0+ds/debian/control 2023-02-13 04:19:11.000000000 +0000 +++ bpfcc-0.26.0+ds/debian/control 2023-02-13 09:16:10.000000000 +0000 @@ -30,7 +30,7 @@ python3-pyroute2, python3-distutils, python3:any | python3-all:any | python3-dev:any | python3-all-dev:any | dh-sequence-python3, - bpftool, + linux-tools-generic, clang Homepage: https://github.com/iovisor/bcc Vcs-Git: https://salsa.debian.org/debian/bpfcc.git diff -Nru bpfcc-0.26.0+ds/debian/rules bpfcc-0.26.0+ds/debian/rules --- bpfcc-0.26.0+ds/debian/rules 2022-05-25 05:25:28.000000000 +0000 +++ bpfcc-0.26.0+ds/debian/rules 2023-02-13 09:16:10.000000000 +0000 @@ -10,6 +10,7 @@ include /usr/share/dpkg/architecture.mk libbpf_tool_skip_arch := armhf s390x ppc64 +export BPFTOOL=$(shell echo /usr/lib/linux-tools-*/bpftool) # Disable tests as they require root to run export DEB_BUILD_MAINT_OPTIONS=nocheck export DEB_CPPFLAGS_MAINT_APPEND=-DCUSTOM_MACRO=true