chore(aya-ebpf-macros): Rename bpf -> ebpf

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
7 months ago · ea8073793e
parent 41c61560ea
commit ea8073793e
30 changed files with 6 additions and 6 deletions
--- a/.mergify.yml
+++ b/.mergify.yml
@ -52,7 +52,7 @@ pull_request_rules:

  - name: add labels for aya-bpf PRs
    conditions:
-      - files~=^(aya-bpf-macros|bpf/aya-bpf(-(cty|bindings))?)/
+      - files~=^(aya-ebpf-macros|bpf/aya-bpf(-(cty|bindings))?)/
    actions:
      label:
        add:
--- a/Cargo.toml
+++ b/Cargo.toml
@ -11,7 +11,7 @@ members = [
    "xtask",

    # macros
-    "aya-bpf-macros",
+    "aya-ebpf-macros",
    "aya-log-ebpf-macros",

    # ebpf crates
@ -35,7 +35,7 @@ default-members = [
    # tests, and that doesn't work unless they've been built with `cargo xtask`.
    "xtask",

-    "aya-bpf-macros",
+    "aya-ebpf-macros",
    "aya-log-ebpf-macros",

    # ebpf crates are omitted; they must be built with:
--- a/aya-ebpf-macros/Cargo.toml
+++ b/aya-ebpf-macros/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "aya-bpf-macros"
+name = "aya-ebpf-macros"
 version = "0.1.0"
 description = "Proc macros used by aya-ebpf"
 authors.workspace = true
--- a/aya-ebpf-macros/src/args.rs
+++ b/aya-ebpf-macros/src/args.rs
--- a/aya-ebpf-macros/src/btf_tracepoint.rs
+++ b/aya-ebpf-macros/src/btf_tracepoint.rs
--- a/aya-ebpf-macros/src/cgroup_device.rs
+++ b/aya-ebpf-macros/src/cgroup_device.rs
--- a/aya-ebpf-macros/src/cgroup_skb.rs
+++ b/aya-ebpf-macros/src/cgroup_skb.rs
--- a/aya-ebpf-macros/src/cgroup_sock.rs
+++ b/aya-ebpf-macros/src/cgroup_sock.rs
--- a/aya-ebpf-macros/src/cgroup_sock_addr.rs
+++ b/aya-ebpf-macros/src/cgroup_sock_addr.rs
--- a/aya-ebpf-macros/src/cgroup_sockopt.rs
+++ b/aya-ebpf-macros/src/cgroup_sockopt.rs
--- a/aya-ebpf-macros/src/cgroup_sysctl.rs
+++ b/aya-ebpf-macros/src/cgroup_sysctl.rs
--- a/aya-ebpf-macros/src/fentry.rs
+++ b/aya-ebpf-macros/src/fentry.rs
--- a/aya-ebpf-macros/src/fexit.rs
+++ b/aya-ebpf-macros/src/fexit.rs
--- a/aya-ebpf-macros/src/kprobe.rs
+++ b/aya-ebpf-macros/src/kprobe.rs
--- a/aya-ebpf-macros/src/lib.rs
+++ b/aya-ebpf-macros/src/lib.rs
--- a/aya-ebpf-macros/src/lsm.rs
+++ b/aya-ebpf-macros/src/lsm.rs
--- a/aya-ebpf-macros/src/map.rs
+++ b/aya-ebpf-macros/src/map.rs
--- a/aya-ebpf-macros/src/perf_event.rs
+++ b/aya-ebpf-macros/src/perf_event.rs
--- a/aya-ebpf-macros/src/raw_tracepoint.rs
+++ b/aya-ebpf-macros/src/raw_tracepoint.rs
--- a/aya-ebpf-macros/src/sk_lookup.rs
+++ b/aya-ebpf-macros/src/sk_lookup.rs
--- a/aya-ebpf-macros/src/sk_msg.rs
+++ b/aya-ebpf-macros/src/sk_msg.rs
--- a/aya-ebpf-macros/src/sk_skb.rs
+++ b/aya-ebpf-macros/src/sk_skb.rs
--- a/aya-ebpf-macros/src/sock_ops.rs
+++ b/aya-ebpf-macros/src/sock_ops.rs
--- a/aya-ebpf-macros/src/socket_filter.rs
+++ b/aya-ebpf-macros/src/socket_filter.rs
--- a/aya-ebpf-macros/src/tc.rs
+++ b/aya-ebpf-macros/src/tc.rs
--- a/aya-ebpf-macros/src/tracepoint.rs
+++ b/aya-ebpf-macros/src/tracepoint.rs
--- a/aya-ebpf-macros/src/uprobe.rs
+++ b/aya-ebpf-macros/src/uprobe.rs
--- a/aya-ebpf-macros/src/xdp.rs
+++ b/aya-ebpf-macros/src/xdp.rs
--- a/ebpf/aya-ebpf/Cargo.toml
+++ b/ebpf/aya-ebpf/Cargo.toml
@ -10,7 +10,7 @@ edition.workspace = true

 [dependencies]
 aya-ebpf-cty = { path = "../aya-ebpf-cty" }
-aya-bpf-macros = { path = "../../aya-bpf-macros" }
+aya-ebpf-macros = { path = "../../aya-ebpf-macros" }
 aya-ebpf-bindings = { path = "../aya-ebpf-bindings" }
 const-assert = { workspace = true, optional = true }

--- a/ebpf/aya-ebpf/src/lib.rs
+++ b/ebpf/aya-ebpf/src/lib.rs
@ -29,8 +29,8 @@ pub mod programs;

 use core::ffi::c_void;

-pub use aya_bpf_macros as macros;
 pub use aya_ebpf_cty as cty;
+pub use aya_ebpf_macros as macros;
 use cty::{c_int, c_long};
 use helpers::{bpf_get_current_comm, bpf_get_current_pid_tgid, bpf_get_current_uid_gid};