From cf87630f261223a7be7785aac085a965a54b5731 Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jeremy@system76.com> Date: Sat, 15 Jun 2019 15:45:37 -0600 Subject: [PATCH] Enable ring patch --- .cargo/config | 2 +- .gitmodules | 2 +- patches/ring | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cargo/config b/.cargo/config index c45f4316c..6e57e7c0b 100644 --- a/.cargo/config +++ b/.cargo/config @@ -5,7 +5,7 @@ paths = [ "patches/net2-rs", "patches/pb", "patches/platform-info", - #"patches/ring", + "patches/ring", "patches/tar-rs", "patches/tempfile", "patches/termsize", diff --git a/.gitmodules b/.gitmodules index 4bda32f67..bccd9a183 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "patches/ring"] path = patches/ring url = https://gitlab.redox-os.org/redox-os/ring.git - branch = redox-unix + branch = redox-unix-0.13.5 [submodule "patches/time"] path = patches/time url = https://gitlab.redox-os.org/redox-os/time.git diff --git a/patches/ring b/patches/ring index 1e1774799..61162b0ea 160000 --- a/patches/ring +++ b/patches/ring @@ -1 +1 @@ -Subproject commit 1e177479981854cb7d06bea12e0a6514d26e09a6 +Subproject commit 61162b0ea14d92df89a4d976f57712da991f26de -- GitLab