Skip to content

ecapture: support non-core btf mode #418733

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
Aleksanaa merged 1 commit into from
Jul 5, 2025
Merged

ecapture: support non-core btf mode #418733

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
32 changes: 21 additions & 11 deletions pkgs/by-name/ec/ecapture/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
buildGoModule,
fetchFromGitHub,
stdenv,
bpftools,
lib,
nspr,
Expand All @@ -18,6 +17,9 @@
bash,
zsh,
nix-update-script,
llvmPackages,
withNonBTF ? false,
kernel ? null,
}:

buildGoModule rec {
Expand All @@ -33,6 +35,7 @@ buildGoModule rec {
};

nativeBuildInputs = [
llvmPackages.libllvm
clang
fd
bpftools
Expand Down Expand Up @@ -94,16 +97,23 @@ buildGoModule rec {
--replace-fail '"errors"' ' '
'';

postConfigure = ''
sed -i '/git/d' Makefile
sed -i '/git/d' variables.mk

substituteInPlace Makefile \
--replace-fail '/bin/bash' '${lib.getExe bash}'

make ebpf
go-bindata -pkg assets -o "assets/ebpf_probe.go" $(find user/bytecode -name "*.o" -printf "./%p ")
'';
postConfigure =
''
sed -i '/git/d' Makefile
sed -i '/git/d' variables.mk

substituteInPlace Makefile \
--replace-fail '/bin/bash' '${lib.getExe bash}'
''
+ lib.optionalString withNonBTF ''
substituteInPlace variables.mk \
--replace-fail "-emit-llvm" "-emit-llvm -I${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/include -Wno-error=implicit-function-declaration"
KERN_BUILD_PATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build KERN_SRC_PATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source make ebpf_noncore
''
+ ''
make ebpf
go-bindata -pkg assets -o "assets/ebpf_probe.go" $(find user/bytecode -name "*.o" -printf "./%p ")
'';

checkFlags =
let
Expand Down
5 changes: 5 additions & 0 deletions pkgs/top-level/linux-kernels.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,11 @@ in

dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { };

ecapture = callPackage ../by-name/ec/ecapture/package.nix {
withNonBTF = true;
inherit kernel;
};

exfat-nofuse =
if lib.versionOlder kernel.version "5.8" then callPackage ../os-specific/linux/exfat { } else null;

Expand Down
Loading