ecapture: support non-core btf mode (a1b23b79) · Commits · nix / nixpkgs

pkgs/by-name/ec/ecapture/package.nix

+21 −11

Original line number	Diff line number	Diff line
		{
		buildGoModule,
		fetchFromGitHub,
		stdenv,
		bpftools,
		lib,
		nspr,
		@@ -18,6 +17,9 @@
		bash,
		zsh,
		nix-update-script,
		llvmPackages,
		withNonBTF ? false,
		kernel ? null,
		}:

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

		nativeBuildInputs = [
		llvmPackages.libllvm
		clang
		fd
		bpftools
		@@ -94,13 +97,20 @@ buildGoModule rec {
		--replace-fail '"errors"' ' '
		'';

		postConfigure = ''
		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 ")
		'';

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;