From d487e1d23f39a26ea927b39a80f20e064bcdafaf Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 27 Aug 2017 10:54:11 -0600 Subject: [PATCH] Make syscall a submodule --- .gitmodules | 3 +++ Cargo.lock | 12 +++++------- Cargo.toml | 2 +- syscall | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 .gitmodules create mode 160000 syscall diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5d903b9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "syscall"] + path = syscall + url = https://github.com/redox-os/syscall.git diff --git a/Cargo.lock b/Cargo.lock index 9c739ec..41e963e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,7 +6,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "goblin 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "raw-cpuid 3.0.0 (git+https://github.com/gz/rust-cpuid)", - "redox_syscall 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.31", "spin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "x86 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -26,7 +26,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "gcc" -version = "0.3.51" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -65,13 +65,12 @@ version = "3.0.0" source = "git+https://github.com/gz/rust-cpuid#d8ff30d61fb2ef4700c88cb787f47f4085863c90" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "redox_syscall" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.1.31" [[package]] name = "scroll" @@ -93,13 +92,12 @@ dependencies = [ [metadata] "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -"checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a" +"checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a" "checksum goblin 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81af14056c25d33759862c5ae2035452acb1255bfb1b16db57819f183921e259" "checksum linked_list_allocator 0.4.1 (git+https://github.com/redox-os/linked-list-allocator.git)" = "" "checksum plain 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "595830506990cbd6a1a08ed73bd9b40beb4692f38334885bf25a5daa654c6fae" "checksum raw-cpuid 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13b844e4049605ff38fed943f5c7b2c691fad68d9d5bf074d2720554c4e48246" "checksum raw-cpuid 3.0.0 (git+https://github.com/gz/rust-cpuid)" = "" -"checksum redox_syscall 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "8312fba776a49cf390b7b62f3135f9b294d8617f7a7592cfd0ac2492b658cd7b" "checksum scroll 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d916a75d18d4c559fa7312afe6f522fe5b63176e6591d02ed81017c22f8ea27" "checksum spin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1d16a26e2b789f86aabddbe91cb82ee2e822beb8a59840d631941b625ef77e53" "checksum x86 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "127728f29f7cfb243a9264c80fc7e57bd1abb3ab015850b05736efda2abe5859" diff --git a/Cargo.toml b/Cargo.toml index 746c704..b1a0c24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ alloc_kernel = { path = "alloc_kernel" } bitflags = "0.7" spin = "0.4" raw-cpuid = { git = "https://github.com/gz/rust-cpuid", branch = "master" } -redox_syscall = "0.1" +redox_syscall = { path = "syscall" } [dependencies.goblin] version = "0.0.10" diff --git a/syscall b/syscall new file mode 160000 index 0000000..71c51bd --- /dev/null +++ b/syscall @@ -0,0 +1 @@ +Subproject commit 71c51bdbbbac3500074a8ed15a2912f38ee7a0f6