Skip to content
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.

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

Upgrade bcc and libbpf to fix BPF program compilation on 6.10 and later kernels #2041

Merged
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/h2o/picohttpparser/archive/1d2b8a184e7ebe6651c30dcede37ba1d89691351.tar.gz"],
),
com_github_iovisor_bcc = dict(
sha256 = "d34f9484588a9c25be936c910c86f8b25b04e5b0c802d0630e77cc9a8a272aed",
strip_prefix = "bcc-e0698be7b797129cb113912e96ad741a551e2291",
sha256 = "416426fbe22d617d8aed088062f4489e69176136e99dc0b933df58e83d9175da",
strip_prefix = "bcc-e57be8465b9cf238f1c04b1c7e154fd1db85326d",
urls = [
"https://github.com/pixie-io/bcc/archive/e0698be7b797129cb113912e96ad741a551e2291.tar.gz",
"https://github.com/pixie-io/bcc/archive/e57be8465b9cf238f1c04b1c7e154fd1db85326d.tar.gz",
],
),
Comment on lines -130 to 135
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the pixie9 branch, which rebased our patches on top of v0.31.0 tag (latest bcc release).

com_github_iovisor_bpftrace = dict(
Expand All @@ -146,10 +146,10 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/jupp0r/prometheus-cpp/archive/81e208c250748657f1d5dab247e82c4429a931af.tar.gz"],
),
com_github_libbpf_libbpf = dict(
sha256 = "4d503428c7aead070a59630dd0906318a430b3e279a35f51ec601fbdd7d31eb6",
strip_prefix = "libbpf-3b0973892891744d20ae79e99c0d1a26a59c4222",
sha256 = "859a31e9101237338d46eb62a62cb8fcb342c9ce0f9b9137e5a3a728c088c338",
strip_prefix = "libbpf-42065ea6627ff6e1ab4c65e51042a70fbf30ff7c",
urls = [
"https://github.com/libbpf/libbpf/archive/3b0973892891744d20ae79e99c0d1a26a59c4222.tar.gz",
"https://github.com/libbpf/libbpf/archive/42065ea6627ff6e1ab4c65e51042a70fbf30ff7c.tar.gz",
Comment on lines -149 to +152
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the libbpf version that bcc v0.31.1 uses.

bcc

],
),
com_github_libuv_libuv = dict(
Expand Down
Loading