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.

Sign up for GitHub

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

Jump to bottom

fix(xtask): corrected bpf to ebpf for path to aya-ebpf-bindings in codegen #917

Merged
merged 1 commit into from
Apr 1, 2024
Merged

fix(xtask): corrected bpf to ebpf for path to aya-ebpf-bindings in codegen #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions xtask/src/codegen/aya.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fn codegen_internal_btf_bindings(libbpf_dir: &Path) -> Result<(), anyhow::Error>

let bindings = bindgen
.generate()
.map_err(|_| anyhow!("bindgen failed"))?
.map_err(|op| anyhow!("bindgen failed - {op}"))?
.to_string();

// write the bindings, with the original helpers removed
Expand Down Expand Up @@ -216,7 +216,7 @@ fn codegen_bindings(opts: &SysrootOptions, libbpf_dir: &Path) -> Result<(), anyh

let bindings = bindgen
.generate()
.map_err(|_| anyhow!("bindgen failed"))?
.map_err(|op| anyhow!("bindgen failed - {op}"))?
.to_string();

// write the bindings, with the original helpers removed
Expand Down
4 changes: 2 additions & 2 deletions xtask/src/codegen/aya_ebpf_bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub fn codegen(opts: &SysrootOptions, libbpf_dir: &Path) -> Result<(), anyhow::E
riscv64_sysroot,
} = opts;

let dir = PathBuf::from("bpf/aya-ebpf-bindings");
let dir = PathBuf::from("ebpf/aya-ebpf-bindings");

let builder = || {
let mut bindgen = bindgen::bpf_builder()
Expand Down Expand Up @@ -95,7 +95,7 @@ pub fn codegen(opts: &SysrootOptions, libbpf_dir: &Path) -> Result<(), anyhow::E

let bindings = bindgen
.generate()
.map_err(|_| anyhow!("bindgen failed"))?
.map_err(|op| anyhow!("bindgen failed - {op}"))?
.to_string();

let mut tree = parse_str::<syn::File>(&bindings).unwrap();
Expand Down