From 330e3dcc93c7e5e874e049cd0ecf8fc1c30f2028 Mon Sep 17 00:00:00 2001 From: Fupan Li Date: Fri, 24 Dec 2021 17:37:47 +0800 Subject: [PATCH] agent: move the oci crate to upper libs Move the oci crate to upper libs thus it can be shared between agent and other rust runtimes. Fixes: #3348 Signed-off-by: Fupan Li --- src/agent/Cargo.toml | 3 +-- src/agent/rustjail/Cargo.toml | 2 +- src/{agent => libs}/oci/Cargo.toml | 0 src/{agent => libs}/oci/src/lib.rs | 0 src/{agent => libs}/oci/src/serialize.rs | 0 src/tools/agent-ctl/Cargo.toml | 2 +- 6 files changed, 3 insertions(+), 4 deletions(-) rename src/{agent => libs}/oci/Cargo.toml (100%) rename src/{agent => libs}/oci/src/lib.rs (100%) rename src/{agent => libs}/oci/src/serialize.rs (100%) diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index 4926660236..b39b487a22 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Kata Containers community "] edition = "2018" [dependencies] -oci = { path = "oci" } +oci = { path = "../libs/oci" } rustjail = { path = "rustjail" } protocols = { path = "protocols" } lazy_static = "1.3.0" @@ -66,7 +66,6 @@ tempfile = "3.1.0" [workspace] members = [ - "oci", "protocols", "rustjail", ] diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml index 7151525722..62e85ecfad 100644 --- a/src/agent/rustjail/Cargo.toml +++ b/src/agent/rustjail/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" serde = "1.0.91" serde_json = "1.0.39" serde_derive = "1.0.91" -oci = { path = "../oci" } +oci = { path = "../../libs/oci" } protocols = { path ="../protocols" } caps = "0.5.0" nix = "0.23.0" diff --git a/src/agent/oci/Cargo.toml b/src/libs/oci/Cargo.toml similarity index 100% rename from src/agent/oci/Cargo.toml rename to src/libs/oci/Cargo.toml diff --git a/src/agent/oci/src/lib.rs b/src/libs/oci/src/lib.rs similarity index 100% rename from src/agent/oci/src/lib.rs rename to src/libs/oci/src/lib.rs diff --git a/src/agent/oci/src/serialize.rs b/src/libs/oci/src/serialize.rs similarity index 100% rename from src/agent/oci/src/serialize.rs rename to src/libs/oci/src/serialize.rs diff --git a/src/tools/agent-ctl/Cargo.toml b/src/tools/agent-ctl/Cargo.toml index 8fc30dbb8b..303db21612 100644 --- a/src/tools/agent-ctl/Cargo.toml +++ b/src/tools/agent-ctl/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] protocols = { path = "../../agent/protocols", features = ["with-serde"] } rustjail = { path = "../../agent/rustjail" } -oci = { path = "../../agent/oci" } +oci = { path = "../../libs/oci" } clap = "2.33.0" lazy_static = "1.4.0"