From addd4de7d5e8638cae183ce52a5a1f7e290dbe6c Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 6 Jul 2019 17:59:15 +0200
Subject: [PATCH] Add tokio patches
This resolves the build errors for drivers.
---
.cargo/config | 2 ++
.gitmodules | 3 +++
patches/mio | 2 +-
patches/tokio | 1 +
4 files changed, 7 insertions(+), 1 deletion(-)
create mode 160000 patches/tokio
diff --git a/.cargo/config b/.cargo/config
index 6e57e7c0b..9952f0e4d 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -2,6 +2,8 @@ paths = [
"patches/atty",
"patches/liblibc",
"patches/mio",
+ "patches/tokio/tokio",
+ "patches/tokio/tokio-reactor",
"patches/net2-rs",
"patches/pb",
"patches/platform-info",
diff --git a/.gitmodules b/.gitmodules
index bccd9a183..842668527 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
path = patches/mio
url = https://gitlab.redox-os.org/redox-os/mio.git
branch = redox-unix
+[submodule "patches/tokio"]
+ path = patches/tokio
+ url = git@gitlab.redox-os.org:redox-os/tokio.git
diff --git a/patches/mio b/patches/mio
index 58b70e490..c9a70849c 160000
--- a/patches/mio
+++ b/patches/mio
@@ -1 +1 @@
-Subproject commit 58b70e4906d927139c499bb4bb29a990b35588fc
+Subproject commit c9a70849ced97387e2607c9c466d23b130ec8901
diff --git a/patches/tokio b/patches/tokio
new file mode 160000
index 000000000..880522af6
--- /dev/null
+++ b/patches/tokio
@@ -0,0 +1 @@
+Subproject commit 880522af62a59db82fafdc7bd7c8c58ec3302428
--
GitLab