From 72978e963ef51f7e48c4f53768fec509f50193d8 Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Thu, 26 Dec 2024 13:45:23 +0100 Subject: [PATCH] Patch redox-rt, syscall. --- Cargo.lock | 21 ++++++++++----------- Cargo.toml | 10 +++++++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f88f5e6c0..02ce92c312 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,7 +30,7 @@ dependencies = [ [[package]] name = "generic-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc#5ea71a02c7f9e436ed0dcf53bc7a5bdb311279cf" +source = "git+https://gitlab.redox-os.org/4lDO2/relibc.git?branch=userspace_proc#e93311da1f12c942118cbde2b38643f574348606" [[package]] name = "goblin" @@ -51,9 +51,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libredox" @@ -99,9 +99,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -132,7 +132,7 @@ checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717" [[package]] name = "redox-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc#5ea71a02c7f9e436ed0dcf53bc7a5bdb311279cf" +source = "git+https://gitlab.redox-os.org/4lDO2/relibc.git?branch=userspace_proc#e93311da1f12c942118cbde2b38643f574348606" dependencies = [ "bitflags", "generic-rt", @@ -143,8 +143,8 @@ dependencies = [ [[package]] name = "redox-scheme" -version = "0.2.3" -source = "git+https://gitlab.redox-os.org/redox-os/redox-scheme.git?tag=v0.2.3#dc6a047842353ed49c1788396d9135de2c3d7382" +version = "0.6.0" +source = "git+https://gitlab.redox-os.org/redox-os/redox-scheme.git#aee599d75a51cda40c23ca91689b1c92cc4a8557" dependencies = [ "libredox", "redox_syscall", @@ -152,9 +152,8 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" +version = "0.5.11" +source = "git+https://gitlab.redox-os.org/4lDO2/syscall.git?branch=nuke_proc#8a80d1f58bc92d8c0eb73a939420fb30fe1e85d0" dependencies = [ "bitflags", ] diff --git a/Cargo.toml b/Cargo.toml index f00f646349..8c7370749d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,9 +15,10 @@ hashbrown = { version = "0.14", default-features = false, features = [ ] } linked_list_allocator = "0.10" redox-initfs = { git = "https://gitlab.redox-os.org/redox-os/redox-initfs.git", default-features = false } -redox_syscall = "0.5.4" -redox-scheme = { git = "https://gitlab.redox-os.org/redox-os/redox-scheme.git", tag = "v0.2.3" } -redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc", default-features = false } +redox_syscall = { version = "0.5.4", default-features = false } +redox-scheme = { git = "https://gitlab.redox-os.org/redox-os/redox-scheme.git" } +#redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc", default-features = false } +redox-rt = { git = "https://gitlab.redox-os.org/4lDO2/relibc.git", branch = "userspace_proc", default-features = false } redox-path = "0.3.1" [profile.release] @@ -26,3 +27,6 @@ lto = "fat" [profile.dev] panic = "abort" + +[patch.crates-io] +redox_syscall = { git = "https://gitlab.redox-os.org/4lDO2/syscall.git", branch = "nuke_proc" }