Unverified Commit 3d40c1b0 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #229458 from martinetd/libbpf 

libbpf: upgrade to 1.2.0
parents 5303a4df 5e8a2729

nixos/tests/bpf.nix

+5 −2
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ 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 { "

    # 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() }'"))

  '';

pkgs/os-specific/linux/libbpf/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];