Merge pull request #3355 from lifupan/main

move the oci and protocols crates from agent to upper libs

src/agent/Cargo.lock

@@ -1104,8 +1104,6 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "protobuf",
- "serde",
- "serde_json",
  "ttrpc",
  "ttrpc-codegen",
 ]

src/agent/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
 edition = "2018"
 
 [dependencies]
-oci = { path = "oci" }
+oci = { path = "../libs/oci" }
 rustjail = { path = "rustjail" }
-protocols = { path = "protocols" }
+protocols = { path = "../libs/protocols" }
 lazy_static = "1.3.0"
 ttrpc = { version = "0.5.0", features = ["async", "protobuf-codec"], default-features = false }
 protobuf = "=2.14.0"
@@ -66,8 +66,6 @@ tempfile = "3.1.0"
 
 [workspace]
 members = [
-    "oci",
-    "protocols",
     "rustjail",
 ]
 

src/agent/rustjail/Cargo.toml

@@ -8,8 +8,8 @@ edition = "2018"
 serde = "1.0.91"
 serde_json = "1.0.39"
 serde_derive = "1.0.91"
-oci = { path = "../oci" }
-protocols = { path ="../protocols" }
+oci = { path = "../../libs/oci" }
+protocols = { path ="../../libs/protocols" }
 caps = "0.5.0"
 nix = "0.23.0"
 scopeguard = "1.0.0"

src/tools/agent-ctl/Cargo.toml

@@ -10,9 +10,9 @@ authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
 edition = "2018"
 
 [dependencies]
-protocols = { path = "../../agent/protocols", features = ["with-serde"] }
+protocols = { path = "../../libs/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"