From ea8073793e44c593e983e69eaa43a4f72799bfc5 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Mon, 4 Mar 2024 14:28:41 +0000 Subject: [PATCH] chore(aya-ebpf-macros): Rename bpf -> ebpf Signed-off-by: Dave Tucker --- .mergify.yml | 2 +- Cargo.toml | 4 ++-- {aya-bpf-macros => aya-ebpf-macros}/Cargo.toml | 2 +- {aya-bpf-macros => aya-ebpf-macros}/src/args.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/btf_tracepoint.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_device.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_skb.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sock.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sock_addr.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sockopt.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sysctl.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/fentry.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/fexit.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/kprobe.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/lib.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/lsm.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/map.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/perf_event.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/raw_tracepoint.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/sk_lookup.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/sk_msg.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/sk_skb.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/sock_ops.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/socket_filter.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/tc.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/tracepoint.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/uprobe.rs | 0 {aya-bpf-macros => aya-ebpf-macros}/src/xdp.rs | 0 ebpf/aya-ebpf/Cargo.toml | 2 +- ebpf/aya-ebpf/src/lib.rs | 2 +- 30 files changed, 6 insertions(+), 6 deletions(-) rename {aya-bpf-macros => aya-ebpf-macros}/Cargo.toml (95%) rename {aya-bpf-macros => aya-ebpf-macros}/src/args.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/btf_tracepoint.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_device.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_skb.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sock.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sock_addr.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sockopt.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/cgroup_sysctl.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/fentry.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/fexit.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/kprobe.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/lib.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/lsm.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/map.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/perf_event.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/raw_tracepoint.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/sk_lookup.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/sk_msg.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/sk_skb.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/sock_ops.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/socket_filter.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/tc.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/tracepoint.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/uprobe.rs (100%) rename {aya-bpf-macros => aya-ebpf-macros}/src/xdp.rs (100%) diff --git a/.mergify.yml b/.mergify.yml index eeb756f8..f2e48582 100644 --- 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: diff --git a/Cargo.toml b/Cargo.toml index 4c9492f0..6ebbc63a 100644 --- 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: diff --git a/aya-bpf-macros/Cargo.toml b/aya-ebpf-macros/Cargo.toml similarity index 95% rename from aya-bpf-macros/Cargo.toml rename to aya-ebpf-macros/Cargo.toml index db92baae..2b232e4a 100644 --- a/aya-bpf-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 diff --git a/aya-bpf-macros/src/args.rs b/aya-ebpf-macros/src/args.rs similarity index 100% rename from aya-bpf-macros/src/args.rs rename to aya-ebpf-macros/src/args.rs diff --git a/aya-bpf-macros/src/btf_tracepoint.rs b/aya-ebpf-macros/src/btf_tracepoint.rs similarity index 100% rename from aya-bpf-macros/src/btf_tracepoint.rs rename to aya-ebpf-macros/src/btf_tracepoint.rs diff --git a/aya-bpf-macros/src/cgroup_device.rs b/aya-ebpf-macros/src/cgroup_device.rs similarity index 100% rename from aya-bpf-macros/src/cgroup_device.rs rename to aya-ebpf-macros/src/cgroup_device.rs diff --git a/aya-bpf-macros/src/cgroup_skb.rs b/aya-ebpf-macros/src/cgroup_skb.rs similarity index 100% rename from aya-bpf-macros/src/cgroup_skb.rs rename to aya-ebpf-macros/src/cgroup_skb.rs diff --git a/aya-bpf-macros/src/cgroup_sock.rs b/aya-ebpf-macros/src/cgroup_sock.rs similarity index 100% rename from aya-bpf-macros/src/cgroup_sock.rs rename to aya-ebpf-macros/src/cgroup_sock.rs diff --git a/aya-bpf-macros/src/cgroup_sock_addr.rs b/aya-ebpf-macros/src/cgroup_sock_addr.rs similarity index 100% rename from aya-bpf-macros/src/cgroup_sock_addr.rs rename to aya-ebpf-macros/src/cgroup_sock_addr.rs diff --git a/aya-bpf-macros/src/cgroup_sockopt.rs b/aya-ebpf-macros/src/cgroup_sockopt.rs similarity index 100% rename from aya-bpf-macros/src/cgroup_sockopt.rs rename to aya-ebpf-macros/src/cgroup_sockopt.rs diff --git a/aya-bpf-macros/src/cgroup_sysctl.rs b/aya-ebpf-macros/src/cgroup_sysctl.rs similarity index 100% rename from aya-bpf-macros/src/cgroup_sysctl.rs rename to aya-ebpf-macros/src/cgroup_sysctl.rs diff --git a/aya-bpf-macros/src/fentry.rs b/aya-ebpf-macros/src/fentry.rs similarity index 100% rename from aya-bpf-macros/src/fentry.rs rename to aya-ebpf-macros/src/fentry.rs diff --git a/aya-bpf-macros/src/fexit.rs b/aya-ebpf-macros/src/fexit.rs similarity index 100% rename from aya-bpf-macros/src/fexit.rs rename to aya-ebpf-macros/src/fexit.rs diff --git a/aya-bpf-macros/src/kprobe.rs b/aya-ebpf-macros/src/kprobe.rs similarity index 100% rename from aya-bpf-macros/src/kprobe.rs rename to aya-ebpf-macros/src/kprobe.rs diff --git a/aya-bpf-macros/src/lib.rs b/aya-ebpf-macros/src/lib.rs similarity index 100% rename from aya-bpf-macros/src/lib.rs rename to aya-ebpf-macros/src/lib.rs diff --git a/aya-bpf-macros/src/lsm.rs b/aya-ebpf-macros/src/lsm.rs similarity index 100% rename from aya-bpf-macros/src/lsm.rs rename to aya-ebpf-macros/src/lsm.rs diff --git a/aya-bpf-macros/src/map.rs b/aya-ebpf-macros/src/map.rs similarity index 100% rename from aya-bpf-macros/src/map.rs rename to aya-ebpf-macros/src/map.rs diff --git a/aya-bpf-macros/src/perf_event.rs b/aya-ebpf-macros/src/perf_event.rs similarity index 100% rename from aya-bpf-macros/src/perf_event.rs rename to aya-ebpf-macros/src/perf_event.rs diff --git a/aya-bpf-macros/src/raw_tracepoint.rs b/aya-ebpf-macros/src/raw_tracepoint.rs similarity index 100% rename from aya-bpf-macros/src/raw_tracepoint.rs rename to aya-ebpf-macros/src/raw_tracepoint.rs diff --git a/aya-bpf-macros/src/sk_lookup.rs b/aya-ebpf-macros/src/sk_lookup.rs similarity index 100% rename from aya-bpf-macros/src/sk_lookup.rs rename to aya-ebpf-macros/src/sk_lookup.rs diff --git a/aya-bpf-macros/src/sk_msg.rs b/aya-ebpf-macros/src/sk_msg.rs similarity index 100% rename from aya-bpf-macros/src/sk_msg.rs rename to aya-ebpf-macros/src/sk_msg.rs diff --git a/aya-bpf-macros/src/sk_skb.rs b/aya-ebpf-macros/src/sk_skb.rs similarity index 100% rename from aya-bpf-macros/src/sk_skb.rs rename to aya-ebpf-macros/src/sk_skb.rs diff --git a/aya-bpf-macros/src/sock_ops.rs b/aya-ebpf-macros/src/sock_ops.rs similarity index 100% rename from aya-bpf-macros/src/sock_ops.rs rename to aya-ebpf-macros/src/sock_ops.rs diff --git a/aya-bpf-macros/src/socket_filter.rs b/aya-ebpf-macros/src/socket_filter.rs similarity index 100% rename from aya-bpf-macros/src/socket_filter.rs rename to aya-ebpf-macros/src/socket_filter.rs diff --git a/aya-bpf-macros/src/tc.rs b/aya-ebpf-macros/src/tc.rs similarity index 100% rename from aya-bpf-macros/src/tc.rs rename to aya-ebpf-macros/src/tc.rs diff --git a/aya-bpf-macros/src/tracepoint.rs b/aya-ebpf-macros/src/tracepoint.rs similarity index 100% rename from aya-bpf-macros/src/tracepoint.rs rename to aya-ebpf-macros/src/tracepoint.rs diff --git a/aya-bpf-macros/src/uprobe.rs b/aya-ebpf-macros/src/uprobe.rs similarity index 100% rename from aya-bpf-macros/src/uprobe.rs rename to aya-ebpf-macros/src/uprobe.rs diff --git a/aya-bpf-macros/src/xdp.rs b/aya-ebpf-macros/src/xdp.rs similarity index 100% rename from aya-bpf-macros/src/xdp.rs rename to aya-ebpf-macros/src/xdp.rs diff --git a/ebpf/aya-ebpf/Cargo.toml b/ebpf/aya-ebpf/Cargo.toml index c4506e6c..b585da8f 100644 --- 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 } diff --git a/ebpf/aya-ebpf/src/lib.rs b/ebpf/aya-ebpf/src/lib.rs index 9e6fb28e..20d75958 100644 --- 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};