Skip to content

Commit 753eb70

Browse files
Ivan Morettfacebook-github-bot
authored andcommitted
updating libbpf version to latest
Summary: In D77978567 `oss-katran-linux-getdeps` (https://www.internalfb.com/sandcastle/job/36028799188271308?no_redirect=1) fails due: ``` /data/sandcastle/temp/skycastle/fbcode_builder_getdeps/shipit/katran/katran/lib/BaseBpfAdapter.cpp:244:10: error: ‘struct bpf_map_create_opts’ has no member named ‘token_fd’ 244 | opts.token_fd = bpfTokenFd_; | ^~~~~~~~ /data/sandcastle/temp/skycastle/fbcode_builder_getdeps/shipit/katran/katran/lib/BaseBpfAdapter.cpp:245:23: error: ‘BPF_F_TOKEN_FD’ was not declared in this scope 245 | opts.map_flags |= BPF_F_TOKEN_FD; | ^~~~~~~~~~~~~~ /data/sandcastle/temp/skycastle/fbcode_builder_getdeps/shipit/katran/katran/lib/BaseBpfAdapter.cpp: In member function ‘int katran::BaseBpfAdapter::setBpfTokenFromFilePath(const char*)’: /data/sandcastle/temp/skycastle/fbcode_builder_getdeps/shipit/katran/katran/lib/BaseBpfAdapter.cpp:937:18: error: ‘bpf_token_create’ was not declared in this scope; did you mean ‘bpf_iter_create’? 937 | auto tokenFd = bpf_token_create(bpfFsFd, nullptr); | ^~~~~~~~~~~~~~~~ | bpf_iter_create ``` looking at the logs I see it's using 0.7.0: ``` -- Checking for module 'libbpf' -- Found libbpf, version 0.7.0 ``` getdeps manifests have libbpf at 0.7.0 while the prod version is at 1.6.2. Updating to use latest version. Checking libbpf usage in manifests: https://fburl.com/code/1whmrzqu Seems like the only user is Katran Reviewed By: genevievehelsel Differential Revision: D82586799 fbshipit-source-id: e2fade71ef507743d10c1c096c34b7d14180dcbf
1 parent 160409f commit 753eb70

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • build/fbcode_builder/manifests

build/fbcode_builder/manifests/libbpf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
name = libbpf
33

44
[download]
5-
url = https://github.com/libbpf/libbpf/archive/refs/tags/v0.7.0.tar.gz
6-
sha256 = 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361
5+
url = https://github.com/libbpf/libbpf/archive/refs/tags/v1.6.2.tar.gz
6+
sha256 = 16f31349c70764cba8e0fad3725cc9f52f6cf952554326aa0229daaa21ef4fbd
77

88
# BPF only builds on linux, so make it a NOP on other platforms
99
[build.not(os=linux)]
1010
builder = nop
1111

1212
[build.os=linux]
1313
builder = make
14-
subdir = libbpf-0.7.0/src
14+
subdir = libbpf-1.6.2/src
1515

1616
[make.build_args]
1717
BUILD_STATIC_ONLY=y

0 commit comments

Comments
 (0)