Use remote source for mbedtls crates

seL4 · Aug 15, 2023 · e088908 · e088908
1 parent 474e594
commit e088908
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 529 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -103,7 +103,4 @@ members = [
     "crates/sel4cp",
     "crates/sel4cp/macros",
     "crates/sel4cp/postcard",
-    "tmp/rust-mbedtls/mbedtls",
-    "tmp/rust-mbedtls/mbedtls-platform-support",
-    "tmp/rust-mbedtls/mbedtls-sys",
 ]
diff --git a/crates/private/tests/capdl/http-server/components/test/server-core/Cargo.toml b/crates/private/tests/capdl/http-server/components/test/server-core/Cargo.toml
@@ -19,7 +19,8 @@ sel4-panicking-env = { path = "../../../../../../../sel4-panicking/env" }
 tests-capdl-http-server-components-test-cpiofs = { path = "../cpiofs" }
 
 [dependencies.mbedtls]
-path = "../../../../../../../../tmp/rust-mbedtls/mbedtls"
+git = "https://github.com/nspin/rust-mbedtls"
+tag = "keep/6eef662dbf636d1ccf86078143b6854f"
 default-features = false
 features = ["no_std_deps"]
 

diff --git a/crates/private/tests/root-task/mbedtls/Cargo.toml b/crates/private/tests/root-task/mbedtls/Cargo.toml
@@ -12,17 +12,20 @@ sel4-logging = { path = "../../../../sel4-logging" }
 sel4-root-task = { path = "../../../../sel4-root-task" }
 
 [dependencies.mbedtls]
-path = "../../../../../tmp/rust-mbedtls/mbedtls"
+git = "https://github.com/nspin/rust-mbedtls"
+tag = "keep/6eef662dbf636d1ccf86078143b6854f"
 default-features = false
 features = ["no_std_deps", "debug"]
 
 [dependencies.mbedtls-platform-support]
-path = "../../../../../tmp/rust-mbedtls/mbedtls-platform-support"
+git = "https://github.com/nspin/rust-mbedtls"
+tag = "keep/6eef662dbf636d1ccf86078143b6854f"
 default-features = false
 features = []
 
 [dependencies.mbedtls-sys-auto]
-path = "../../../../../tmp/rust-mbedtls/mbedtls-sys"
+git = "https://github.com/nspin/rust-mbedtls"
+tag = "keep/6eef662dbf636d1ccf86078143b6854f"
 default-features = false
 features = []
 

diff --git a/crates/sel4-async/network/mbedtls/Cargo.toml b/crates/sel4-async/network/mbedtls/Cargo.toml
@@ -13,6 +13,7 @@ sel4-async-network = { path = ".." }
 sel4-async-network-mbedtls-mozilla-ca-list = { path = "./mozilla-ca-list" }
 
 [dependencies.mbedtls]
-path = "../../../../tmp/rust-mbedtls/mbedtls"
+git = "https://github.com/nspin/rust-mbedtls"
+tag = "keep/6eef662dbf636d1ccf86078143b6854f"
 default-features = false
 features = ["no_std_deps"]
diff --git a/...fest-sources/crates/private/tests/capdl/http-server/components/test/server-core/crate.nix b/...fest-sources/crates/private/tests/capdl/http-server/components/test/server-core/crate.nix
@@ -27,7 +27,7 @@ mk {
     sel4-async-timers
     sel4-panicking-env
     tests-capdl-http-server-components-test-cpiofs
-    mbedtls
+    # mbedtls
   ];
   features = {
     debug = [ "mbedtls/debug" ];

diff --git a/hacking/cargo-manifest-sources/crates/private/tests/root-task/mbedtls/crate.nix b/hacking/cargo-manifest-sources/crates/private/tests/root-task/mbedtls/crate.nix
@@ -7,9 +7,9 @@ mk {
     sel4-root-task
     sel4-logging
     sel4-newlib
-    mbedtls
-    mbedtls-platform-support
-    mbedtls-sys-auto
+    # mbedtls
+    # mbedtls-platform-support
+    # mbedtls-sys-auto
   ];
   dependencies = {
     inherit (versions) log;

diff --git a/hacking/cargo-manifest-sources/crates/sel4-async/network/mbedtls/crate.nix b/hacking/cargo-manifest-sources/crates/sel4-async/network/mbedtls/crate.nix
@@ -23,7 +23,7 @@ mk {
   nix.local.dependencies = with localCrates; [
     sel4-async-network
     sel4-async-network-mbedtls-mozilla-ca-list
-    mbedtls
+    # mbedtls
   ];
   nix.meta.requirements = [ "sel4" ];
   nix.meta.skip = true;

diff --git a/hacking/nix/scope/crates.nix b/hacking/nix/scope/crates.nix
@@ -37,19 +37,19 @@ let
         "assets"
       ];
     };
-    mbedtls-sys-auto = {
-      extraPaths = [
-        "build"
-        "vendor"
-      ];
-    };
-    mbedtls = {
-      extraPaths = [
-        "benches"
-        "examples"
-        "tests"
-      ];
-    };
+    # mbedtls-sys-auto = {
+    #   extraPaths = [
+    #     "build"
+    #     "vendor"
+    #   ];
+    # };
+    # mbedtls = {
+    #   extraPaths = [
+    #     "benches"
+    #     "examples"
+    #     "tests"
+    #   ];
+    # };
   };
 
   crates = lib.listToAttrs (lib.forEach workspaceMemberPaths (cratePath: rec {

diff --git a/hacking/nix/scope/generated-cargo-manifests/default.nix b/hacking/nix/scope/generated-cargo-manifests/default.nix
@@ -44,9 +44,9 @@ let
 
   externalCratePathAttrs = {
     # "virtio-drivers" = "tmp/virtio-drivers";
-    "mbedtls" = "tmp/rust-mbedtls/mbedtls";
-    "mbedtls-sys-auto" = "tmp/rust-mbedtls/mbedtls-sys";
-    "mbedtls-platform-support" = "tmp/rust-mbedtls/mbedtls-platform-support";
+    # "mbedtls" = "tmp/rust-mbedtls/mbedtls";
+    # "mbedtls-sys-auto" = "tmp/rust-mbedtls/mbedtls-sys";
+    # "mbedtls-platform-support" = "tmp/rust-mbedtls/mbedtls-platform-support";
   };
 
   cratePathAttrs = localCratePathAttrs // externalCratePathAttrs;
@@ -99,8 +99,8 @@ let
       };
 
       mbedtlsSource = {
-        # git = "https://github.com/nspin/rust-mbedtls";
-        # tag = "keep/6eef662dbf636d1ccf86078143b6854f";
+        git = "https://github.com/nspin/rust-mbedtls";
+        tag = "keep/6eef662dbf636d1ccf86078143b6854f";
       };
 
       mbedtlsWith = features: (mbedtlsSource // {