b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #229458 from martinetd/libbpf

Browse source 
libbpf: upgrade to 1.2.0
This commit is contained in:
Robert Scott 2023-05-06 16:39:29 +01:00 committed by GitHub
parent 5303a4df9c 5e8a27296b
commit 3d40c1b0e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/tests/bpf.nix
View file

@ -26,8 +26,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
" printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() "
"}'"))
# module BTF (bpftrace >= 0.17)
print(machine.succeed("bpftrace -e 'kfunc:nft_trans_alloc_gfp { "
" printf(\"portid: %d\\n\",args->ctx->portid); "
# test is currently disabled on aarch64 as kfunc does not work there yet
# https://github.com/iovisor/bpftrace/issues/2496
print(machine.succeed("uname -m | grep aarch64 || "
"bpftrace -e 'kfunc:nft_trans_alloc_gfp { "
" printf(\"portid: %d\\n\", args->ctx->portid); "
"} BEGIN { exit() }'"))
'';
})

4
pkgs/os-specific/linux/libbpf/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libbpf";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
rev = "v${version}";
sha256 = "sha256-/vt6IA1o0gjFtXUWhEKIZ1DUWIN2LOvrhLfFzJBACGY=";
sha256 = "sha256-NimK4pdYcai21hZHdP1mBX1MOlNY61iDJ+PDYwpRuVE=";
};
nativeBuildInputs = [ pkg-config ];