diff --git a/Cargo.lock b/Cargo.lock index ad49099eb9..b78f4cdc52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bootstrap" @@ -63,9 +63,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "plain" @@ -75,18 +75,18 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "redox-exec" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#780e6ff81c6973625f8e6132673479250fcc9d76" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#6ff5691d189945a51b997a6e729646592015cb68" dependencies = [ "goblin", "plain", @@ -111,9 +111,8 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +version = "0.5.0" +source = "git+https://gitlab.redox-os.org/redox-os/syscall.git#7163519226f89f47d77118af27495de231ad9092" dependencies = [ "bitflags", ] @@ -155,9 +154,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.40" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 9c7c863cac..922db2af88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,9 @@ crate-type = ["staticlib"] hashbrown = { version = "0.14", default-features = false, features = ["inline-more"] } linked_list_allocator = "0.10" redox-initfs = { git = "https://gitlab.redox-os.org/redox-os/redox-initfs.git", default-features = false } +#redox-exec = { git = "https://gitlab.redox-os.org/redox-os/relibc.git" } redox-exec = { git = "https://gitlab.redox-os.org/redox-os/relibc.git" } -redox_syscall = "0.4" +redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git" } [profile.release] panic = "abort" diff --git a/src/exec.rs b/src/exec.rs index 37f7781a17..ae21e5267e 100644 --- a/src/exec.rs +++ b/src/exec.rs @@ -41,6 +41,8 @@ pub fn main() -> ! { const CWD: &[u8] = b"/scheme/initfs"; let extrainfo = redox_exec::ExtraInfo { cwd: Some(CWD), + sigprocmask: 0, + sigignmask: 0, }; let path = "/scheme/initfs/bin/init";