diff --git a/Cargo.lock b/Cargo.lock index f483ba76a89362da315db2dedcaf99d64800391a..e189651c9cde8be491e476fcf9a4bd7c38b61aac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "aho-corasick" version = "0.7.20" @@ -26,62 +11,21 @@ dependencies = [ "memchr", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anyhow" version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "basic" -version = "0.2.4" +version = "0.2.5" dependencies = [ "bitflags", "caps", @@ -140,7 +84,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blkid_rs" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "bindgen", @@ -148,12 +92,6 @@ dependencies = [ "libc", ] -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - [[package]] name = "byteorder" version = "1.4.3" @@ -202,7 +140,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroup" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "bitflags", @@ -213,21 +151,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "time", - "wasm-bindgen", - "winapi", -] - [[package]] name = "clang-sys" version = "1.6.1" @@ -245,14 +168,11 @@ version = "3.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6" dependencies = [ - "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", "lazy_static", - "strsim", - "termcolor", "textwrap", ] @@ -315,11 +235,11 @@ dependencies = [ [[package]] name = "constants" -version = "0.2.4" +version = "0.2.5" [[package]] name = "core" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "bitflags", @@ -335,21 +255,6 @@ dependencies = [ "snafu", ] -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -381,7 +286,7 @@ dependencies = [ [[package]] name = "device" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "bitflags", @@ -462,7 +367,7 @@ dependencies = [ [[package]] name = "event" -version = "0.2.4" +version = "0.2.5" dependencies = [ "constants", "libc", @@ -498,16 +403,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "fnmatch-regex" version = "0.2.0" @@ -545,19 +440,13 @@ dependencies = [ [[package]] name = "fstab" -version = "0.2.4" +version = "0.2.5" dependencies = [ "inotify", "log", "nix", ] -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - [[package]] name = "getrandom" version = "0.2.10" @@ -569,12 +458,6 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - [[package]] name = "glob" version = "0.3.1" @@ -615,7 +498,6 @@ dependencies = [ "lmdb-rkv-sys", "once_cell", "page_size", - "serde", "synchronoise", "url", "zerocopy", @@ -640,15 +522,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.2" @@ -663,7 +536,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hostname_setup" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "constants", @@ -683,29 +556,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "idna" version = "0.4.0" @@ -733,10 +583,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ "bitflags", - "futures-core", "inotify-sys", "libc", - "tokio", ] [[package]] @@ -763,7 +611,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -783,15 +631,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "js-sys" -version = "0.3.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "kernlog" version = "0.3.1" @@ -871,7 +710,7 @@ dependencies = [ [[package]] name = "libtests" -version = "0.2.4" +version = "0.2.5" [[package]] name = "linux-raw-sys" @@ -911,7 +750,7 @@ dependencies = [ [[package]] name = "macros" -version = "0.2.4" +version = "0.2.5" dependencies = [ "proc-macro2", "quote", @@ -942,15 +781,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "mio" version = "0.8.8" @@ -965,7 +795,7 @@ dependencies = [ [[package]] name = "mount" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "core", @@ -1035,24 +865,6 @@ dependencies = [ "notify", ] -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.7.2" @@ -1103,12 +915,6 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pin-project-lite" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" - [[package]] name = "pkg-config" version = "0.3.27" @@ -1162,8 +968,6 @@ checksum = "0941606b9934e2d98a3677759a971756eb821f75764d0e0d26946d08e74d9104" dependencies = [ "bitflags", "byteorder", - "chrono", - "flate2", "hex", "lazy_static", "libc", @@ -1269,7 +1073,7 @@ dependencies = [ [[package]] name = "random_seed" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "libc", @@ -1280,7 +1084,7 @@ dependencies = [ [[package]] name = "rc-local-generator" -version = "0.2.4" +version = "0.2.5" dependencies = [ "libc", "log", @@ -1321,12 +1125,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -1412,7 +1210,7 @@ dependencies = [ [[package]] name = "service" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "cgroup", @@ -1441,9 +1239,6 @@ name = "siphasher" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -dependencies = [ - "serde", -] [[package]] name = "snafu" @@ -1469,7 +1264,7 @@ dependencies = [ [[package]] name = "socket" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "confique", @@ -1484,22 +1279,6 @@ dependencies = [ "serde", ] -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strum" version = "0.23.0" @@ -1524,7 +1303,7 @@ dependencies = [ [[package]] name = "switch_root" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "constants", @@ -1577,8 +1356,8 @@ dependencies = [ ] [[package]] -name = "sysmaster" -version = "0.2.4" +name = "sysMaster" +version = "0.2.5" dependencies = [ "kernlog", "log", @@ -1588,8 +1367,8 @@ dependencies = [ ] [[package]] -name = "sysmaster-core" -version = "0.2.4" +name = "sysmaster" +version = "0.2.5" dependencies = [ "basic", "bitflags", @@ -1621,7 +1400,7 @@ dependencies = [ [[package]] name = "sysmonitor" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "nix", @@ -1633,7 +1412,7 @@ dependencies = [ [[package]] name = "target" -version = "0.2.4" +version = "0.2.5" dependencies = [ "basic", "core", @@ -1658,15 +1437,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "textwrap" version = "0.15.2" @@ -1719,21 +1489,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" -dependencies = [ - "autocfg", - "backtrace", - "libc", - "mio", - "pin-project-lite", - "socket2", - "windows-sys 0.48.0", -] - [[package]] name = "toml" version = "0.5.11" @@ -1815,63 +1570,9 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasm-bindgen" -version = "0.2.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" - [[package]] name = "watchdog" -version = "0.2.4" +version = "0.2.5" dependencies = [ "nix", ] @@ -1918,15 +1619,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.1", -] - [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index 3236b3471cd776b2c57da544d85701c8648ace34..e3ce3f71feab3ef827b153208ec20963095aa7f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,10 @@ [package] -name = "sysmaster" -version = "0.2.4" +name = "sysMaster" +version = "0.2.5" authors = ["sysmaster"] +homepage = "http://www.sysmaster.org" +keywords = ["sysmaster", "pid1", "os"] +license = "MulanPSL-2.0" edition = "2021" build = "build.rs" @@ -11,6 +14,11 @@ name = "init" path = "init/src/main.rs" [dependencies] +log = { version = "=0.4.14", default_features = false, features = ["std"] } +mio = { version = "0.8.8", default_features = false, features = [ + "os-poll", + "os-ext", +] } nix = { version = "0.24", default-features = false, features = [ "fs", "net", @@ -20,11 +28,6 @@ nix = { version = "0.24", default-features = false, features = [ ] } kernlog = "0.3.1" tempfile = "=3.6.0" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -mio = { version = "0.8.8", default_features = false, features = [ - "os-poll", - "os-ext", -] } # 此为开发配置文件, 给 `cargo build` 所使用. [profile.dev] diff --git a/core/coms/mount/Cargo.toml b/core/coms/mount/Cargo.toml index 5f6a11728463a045fbacc4711811607ea591b2da..de06ac8a0db112c903df13525c116c32469728fc 100755 --- a/core/coms/mount/Cargo.toml +++ b/core/coms/mount/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mount" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,17 +10,17 @@ crate-type = ["dylib", "lib"] name = "mount" [dependencies] +basic = { path = "../../../libs/basic" } +core = { path = "../../libcore", default-features = false } event = { path = "../../../libs/event" } macros = { path = "../../../libs/macros" } -basic = { path = "../../../libs/basic" } -core = { path = "../../libcore" } -nix = "0.24" -log = { version = "=0.4.14", default_features = false, features = ["std"] } epoll = "=4.3.1" -libc = "0.2.*" -serde = "1.0.130" -once_cell = { version = "=1.7.2" } +libc = { version = "0.2.*", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } +once_cell = { version = "=1.7.2", default-features = false } +serde = { version = "1.0.130", default-features = false } [features] default = ["noplugin"] diff --git a/core/coms/service/Cargo.toml b/core/coms/service/Cargo.toml index 1e3290f1cbaeed8cb497d138c255da34f4f1b16f..bd958c561bae65671939e9224b79dfb72be0ee09 100755 --- a/core/coms/service/Cargo.toml +++ b/core/coms/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "service" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,20 +10,20 @@ crate-type = ["dylib", "lib"] name = "service" [dependencies] -constants = { path = "../../../libs/constants" } basic = { path = "../../../libs/basic" } -macros = { path = "../../../libs/macros" } -cgroup = { path = "../../../libs/cgroup" } +cgroup = { path = "../../../libs/cgroup", default-features = false } +constants = { path = "../../../libs/constants" } +core = { path = "../../libcore", default-features = false } event = { path = "../../../libs/event" } +macros = { path = "../../../libs/macros" } watchdog = { path = "../../../libs/watchdog" } -core = { path = "../../libcore" } -nix = "0.24" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -serde = "1.0.130" -confique = { version = "0.1.3", default-features = false, features = ['toml'] } -libc = "0.2.*" -once_cell = { version = "=1.7.2" } +confique = { version = "0.1.3", default-features = false } +libc = { version = "0.2.*", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } +once_cell = { version = "=1.7.2", default-features = false } +serde = { version = "1.0.130", default-features = false } [dev-dependencies] diff --git a/core/coms/socket/Cargo.toml b/core/coms/socket/Cargo.toml index 69ae6396658a293ee5414c79a92a7c0674d89b75..020acf2d42ee2d673eda220c74fb024ed217d4bb 100755 --- a/core/coms/socket/Cargo.toml +++ b/core/coms/socket/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "socket" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,17 +10,17 @@ crate-type = ["dylib", "lib"] name = "socket" [dependencies] -constants = { path = "../../../libs/constants" } basic = { path = "../../../libs/basic" } +constants = { path = "../../../libs/constants" } +core = { path = "../../libcore", default-features = false } event = { path = "../../../libs/event" } macros = { path = "../../../libs/macros" } -core = { path = "../../libcore" } -nix = "0.24" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -serde = "1.0.130" -confique = { version = "0.1.3", default-features = false, features = ['toml'] } -once_cell = { version = "=1.7.2" } +confique = { version = "0.1.3", default-features = false, features = ["toml"] } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } +once_cell = { version = "=1.7.2", default-features = false } +serde = { version = "1.0.130", default-features = false } [dev-dependencies] libtests = { path = "../../../libs/libtests" } diff --git a/core/coms/target/Cargo.toml b/core/coms/target/Cargo.toml index ff7242851587f60cfb6eb5133b2281350c670d79..c0f55c888e39585fc95663c2291725f250906276 100755 --- a/core/coms/target/Cargo.toml +++ b/core/coms/target/Cargo.toml @@ -1,24 +1,23 @@ [package] name = "target" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [lib] crate-type = ["dylib", "lib"] name = "target" [dependencies] basic = { path = "../../../libs/basic" } +core = { path = "../../libcore", default-features = false } macros = { path = "../../../libs/macros" } -core = { path = "../../libcore" } -nix = "0.24" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -serde = "1.0.130" -once_cell = { version = "=1.7.2" } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } +once_cell = { version = "=1.7.2", default-features = false } +serde = { version = "1.0.130", default-features = false } [features] default = ["noplugin"] diff --git a/core/libcore/Cargo.toml b/core/libcore/Cargo.toml index c8c4ece3444e9e9330567f611201b11392475c9a..3c31814f17d81ae3ed77950c41715807c1e18d0c 100755 --- a/core/libcore/Cargo.toml +++ b/core/libcore/Cargo.toml @@ -1,27 +1,26 @@ [package] name = "core" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] # internal libraries +basic = { path = "../../libs/basic" } cgroup = { path = "../../libs/cgroup" } event = { path = "../../libs/event" } -basic = { path = "../../libs/basic" } # third libraries bitflags = "1.3.2" -confique = { version = "0.1.3", default-features = false, features = ['toml'] } -heed = "0.10.6" -libc = "0.2.*" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -nix = "0.24" -regex = { version = "1.6.0", default-features = false, features = ["std"] } -serde = "1.0.130" -snafu = "0.7" +confique = { version = "0.1.3", default-features = false } +heed = { version = "0.10.6", features = ["lmdb"], default-features = false } +libc = { version = "0.2.*", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } +regex = { version = "1.6.0", default-features = false } +serde = { version = "1.0.130", default-features = false } +snafu = { version = "0.7", default-features = false } [features] default = ["noplugin"] diff --git a/core/sctl/Cargo.toml b/core/sctl/Cargo.toml index 938520adb22ebf726318d9a0dc9b442c56fa5c87..d84825ce87035130caa16ac890298a95839cb36f 100755 --- a/core/sctl/Cargo.toml +++ b/core/sctl/Cargo.toml @@ -6,8 +6,11 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = { version = "3.1.8", features = ["derive"] } -cmdproto = { path = "../../libs/cmdproto" } basic = { path = "../../libs/basic" } -nix = "0.24" +clap = { version = "3.1.8", features = [ + "derive", + "std", +], default-features = false } +cmdproto = { path = "../../libs/cmdproto" } constants = { path = "../../libs/constants" } +nix = { version = "0.24", default-features = false } diff --git a/core/sysmaster/Cargo.toml b/core/sysmaster/Cargo.toml index cf761c44ed34ad6e12d11588784da7a0c1df9dac..21a64ac64a66a8f18248ab397aa87b8a7772735b 100755 --- a/core/sysmaster/Cargo.toml +++ b/core/sysmaster/Cargo.toml @@ -1,9 +1,10 @@ [package] -name = "sysmaster-core" -version = "0.2.4" +name = "sysmaster" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + [[bin]] name = "sysmaster" path = "src/main.rs" @@ -13,12 +14,12 @@ path = "../../libs/libtests" [dependencies] # internal libraries -core = { path = "../libcore" } -cgroup = { path = "../../libs/cgroup" } -event = { path = "../../libs/event" } basic = { path = "../../libs/basic" } +cgroup = { path = "../../libs/cgroup", default-features = false } cmdproto = { path = "../../libs/cmdproto" } constants = { path = "../../libs/constants" } +core = { path = "../libcore", default-features = false } +event = { path = "../../libs/event" } mount = { path = "../coms/mount", optional = true } service = { path = "../coms/service", optional = true } socket = { path = "../coms/socket", optional = true } @@ -26,20 +27,23 @@ target = { path = "../coms/target", optional = true } # third libraries bitflags = "1.3.2" -confique = { version = "0.1.3", default-features = false, features = ['toml'] } +confique = { version = "0.1.3", default-features = false } +clap = { version = "3.1.8", features = [ + "derive", + "std", +], default-features = false } dynamic_reload = { version = "0.10.0", optional = true } +fnmatch-regex = "0.2.0" lazy_static = "1.4.0" -libc = "0.2.*" -once_cell = { version = "=1.7.2" } -log = { version = "=0.4.14", default_features = false, features = ["std"] } -nix = "0.24" -regex = { version = "1.6.0", default-features = false, features = ["std"] } -serde = "1.0.130" -siphasher = { version = "0.3", features = ["serde"] } +libc = { version = "0.2.*", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false, features = ["reboot"] } +once_cell = { version = "=1.7.2", default-features = false } +regex = { version = "1.6.0", default-features = false } +serde = { version = "1.0.130", default-features = false } +siphasher = { version = "0.3", default-features = false } +snafu = { version = "0.7", default-features = false } walkdir = "2" -fnmatch-regex = "0.2.0" -snafu = "0.7" -clap = { version = "3.1.8", features = ["derive"] } [features] default = ["linux", "noplugin", "mount", "socket", "service", "target"] diff --git a/exts/devmaster/Cargo.toml b/exts/devmaster/Cargo.toml index c8dd20435680b8d1c2c8aba6606f18ceedd7a825..1a5f659d3dba5b747d2f0a0b4d96a7f21c119d59 100644 --- a/exts/devmaster/Cargo.toml +++ b/exts/devmaster/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "devmaster" -version = "0.2.4" +version = "0.2.5" edition = "2021" default-run = "devmaster" diff --git a/exts/fstab/Cargo.toml b/exts/fstab/Cargo.toml index df38f4626019a82851a3f434d51e12663189da62..14a686034ea6e31152675c5298857f62f5523ebe 100644 --- a/exts/fstab/Cargo.toml +++ b/exts/fstab/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "fstab" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -inotify = "0.9.2" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -nix = "0.24" +inotify = { version = "0.9.2", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } diff --git a/exts/hostname_setup/Cargo.toml b/exts/hostname_setup/Cargo.toml index 75975e46c69e4dd30c4aae7dcc7bbc5c7878e234..fb509272b0a6dd1363ddca8472563e81c72f773d 100644 --- a/exts/hostname_setup/Cargo.toml +++ b/exts/hostname_setup/Cargo.toml @@ -1,11 +1,17 @@ [package] name = "hostname_setup" -version = "0.2.4" +version = "0.2.5" edition = "2021" +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + [dependencies] -nix = "0.24" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -libc = "0.2.*" -constants = { path = "../../libs/constants" } basic = { path = "../../libs/basic" } +constants = { path = "../../libs/constants" } + +libc = { version = "0.2.*", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false, features = [ + "mount", + "hostname", +] } diff --git a/exts/random_seed/Cargo.toml b/exts/random_seed/Cargo.toml index 8bf88b2d4d501fe885f5e8bf6ec6230d3bf1b878..22a3b23b0034cba70862c7e7b9b6310b791ad571 100644 --- a/exts/random_seed/Cargo.toml +++ b/exts/random_seed/Cargo.toml @@ -1,13 +1,14 @@ [package] name = "random_seed" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] basic = { path = "../../libs/basic" } -nix = "0.24" -libc = "0.2.*" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -xattr = "0.2.3" + +libc = { version = "0.2.*", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } +xattr = { version = "0.2.3", default-features = false } diff --git a/exts/rc-local-generator/Cargo.toml b/exts/rc-local-generator/Cargo.toml index 3cbfe4dc7fd0681e15dd5130b2834fcdd826f46d..677b1e1c00434a989b197a8c633ffb6b51b271ac 100644 --- a/exts/rc-local-generator/Cargo.toml +++ b/exts/rc-local-generator/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "rc-local-generator" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = { version = "=0.4.14", default_features = false, features = ["std"] } -libc = { version = "0.2" } +log = { version = "=0.4.14", default_features = false } +libc = { version = "0.2", default-features = false } diff --git a/exts/switch_root/Cargo.toml b/exts/switch_root/Cargo.toml index 8e38aa598bc5a7ea4e67d543ffe756a3f4e11c1f..153303563541b96134100728f9beaee3874fccbf 100644 --- a/exts/switch_root/Cargo.toml +++ b/exts/switch_root/Cargo.toml @@ -1,13 +1,14 @@ [package] name = "switch_root" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nix = "0.24" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -libc = "0.2.*" -constants = { path = "../../libs/constants" } basic = { path = "../../libs/basic" } +constants = { path = "../../libs/constants" } + +libc = { version = "0.2.*", default-features = false } +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false, features = ["mount"] } diff --git a/exts/sysmonitor/Cargo.toml b/exts/sysmonitor/Cargo.toml index 1314e887229c3c3275733f5b46bca9cdc464f3e8..6086555460a93b895699a1093cb32553fdb5e10e 100644 --- a/exts/sysmonitor/Cargo.toml +++ b/exts/sysmonitor/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "sysmonitor" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] basic = { path = "../../libs/basic" } -procfs = "0.12.0" -serde = "1.0.130" +procfs = { version = "0.12.0", default-features = false } +serde = { version = "1.0.130", default-features = false } serde_derive = "1.0.130" toml = "0.5.8" -nix = "0.24" +nix = { version = "0.24", default-features = false } diff --git a/libs/basic/Cargo.toml b/libs/basic/Cargo.toml index eea4028e4760636306a22bc623da5fb4d9c6c481..87243c7024c16dde73d66239710eee141221cb6b 100644 --- a/libs/basic/Cargo.toml +++ b/libs/basic/Cargo.toml @@ -1,26 +1,34 @@ [package] name = "basic" -version = "0.2.4" -authors = ["overweight "] +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde = "1.0.130" -libc = "0.2.140" -log = { version = "=0.4.14", default_features = false, features = ["std"] } -snafu = "0.7" -procfs = "0.12.0" -nix = "0.24" -pathdiff = "0.2.1" +constants = { path = "../constants" } + +bitflags = "1.3.2" caps = "0.5.5" lazy_static = "1.4.0" -bitflags = "1.3.2" +libc = { version = "0.2.140", default-features = false } +log = { version = "=0.4.14", default_features = false, features = ["std"] } +nix = { version = "0.24", features = [ + "dir", + "signal", + "poll", + "resource", + "net", + "ioctl", + "user", +], default-features = false } +pathdiff = "0.2.1" pkg-config = "0.3" +procfs = { version = "0.12.0", default-features = false } rand = "0.8.5" +serde = { version = "1.0.130", default-features = false } +snafu = { version = "0.7", features = ["std"], default-features = false } time = "=0.1.45" -constants = { path = "../constants" } [dev-dependencies] libtests = { path = "../libtests" } diff --git a/libs/blkid_rs/Cargo.toml b/libs/blkid_rs/Cargo.toml index a74d46f00a53b5abe9bdb62030536bda95390350..123c8c05de8b93921de90807df8cd048d23d81be 100644 --- a/libs/blkid_rs/Cargo.toml +++ b/libs/blkid_rs/Cargo.toml @@ -1,8 +1,10 @@ [package] name = "blkid_rs" -version = "0.2.4" +version = "0.2.5" edition = "2021" +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + [build-dependencies.bindgen] default_features = false features = ["runtime"] @@ -12,5 +14,5 @@ version = "0.63.0" basic = { path = "../basic" } [dependencies] -libc = "0.2.*" bitflags = "1.3.2" +libc = { version = "0.2.*", default-features = false } diff --git a/libs/cgroup/Cargo.toml b/libs/cgroup/Cargo.toml index b125d9661243e092d6a25e685b9f4edf21e0e0a4..bc9d386ab4876a037340b3b38766c576f8c482fb 100644 --- a/libs/cgroup/Cargo.toml +++ b/libs/cgroup/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "cgroup" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] basic = { path = "../basic" } -log = { version = "=0.4.14", default_features = false, features = ["std"] } -nix = "0.24" bitflags = "1.3.2" +log = { version = "=0.4.14", default_features = false } +nix = { version = "0.24", default-features = false } regex = { version = "1.6.0", default-features = false, features = ["std"] } +snafu = { version = "0.7", default-features = false } walkdir = "2" -snafu = "0.7" [features] default = ["linux"] diff --git a/libs/cmdproto/Cargo.toml b/libs/cmdproto/Cargo.toml index b3538c8e856d52ce0cb1a174b1f9bf1e6b931de4..0aae8441efbac8ad34b057dd7c9bd6e0492097a5 100644 --- a/libs/cmdproto/Cargo.toml +++ b/libs/cmdproto/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -prost = "0.9" # 处理 protobuf 的代码 -http = "0.2" # 我们使用 HTTP status code 所以引入这个类型库 -snafu = "0.7" -nix = "0.24" +http = "0.2" # 我们使用 HTTP status code 所以引入这个类型库 +nix = { features = ["socket"], default-features = false, version = "0.24" } +prost = "0.9" # 处理 protobuf 的代码 +snafu = { features = ["std"], default-features = false, version = "0.7" } [build-dependencies] prost-build = "0.9" # 编译 protobuf diff --git a/libs/constants/Cargo.toml b/libs/constants/Cargo.toml index f0552de348c2bec29647398708a5e088a6da5b3a..b8d2d38d199bbb2d91ef6cbbb6f4d56862d86701 100644 --- a/libs/constants/Cargo.toml +++ b/libs/constants/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "constants" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/libs/device/Cargo.toml b/libs/device/Cargo.toml index 519dacba344aec551a1d55ab574a276514cf35a8..ccf609ee2a4a88481c672bc8331d76eae0abf181 100644 --- a/libs/device/Cargo.toml +++ b/libs/device/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "device" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -11,11 +11,11 @@ basic = { path = "../basic" } event = { path = "../event" } # third libraries -nix = "0.24" -libc = "0.2.140" -snafu = "0.7" bitflags = "1.3.2" -log = { version = "=0.4.14", default_features = false, features = ["std"] } fnmatch-regex = "0.2.0" -regex = "1.7.0" +libc = { default-features = false, version = "0.2.140" } +log = { version = "=0.4.14", default_features = false } loopdev = "0.4.0" +nix = { default-features = false, version = "0.24" } +regex = { default-features = false, version = "1.7.0" } +snafu = { default-features = false, version = "0.7" } diff --git a/libs/event/Cargo.toml b/libs/event/Cargo.toml index e032f04f12b7ebbcea10bbb2f62310be9de60a26..363f7e47379c176f608d859b22cdcef8d98cfee3 100644 --- a/libs/event/Cargo.toml +++ b/libs/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "event" -version = "0.2.4" +version = "0.2.5" authors = ["overweight "] edition = "2021" @@ -8,9 +8,13 @@ edition = "2021" [dependencies] constants = { path = "../constants" } -libc = { version = "0.2" } -nix = { version = "0.24" } -snafu = { version = "0.7" } + +libc = { version = "0.2", default-features = false } +nix = { version = "0.24", default-features = false, features = [ + "inotify", + "ucontext", +] } +snafu = { version = "0.7", default-features = false, features = ["std"] } [dev-dependencies.libtests] path = "../libtests" diff --git a/libs/input_event_codes_rs/Cargo.toml b/libs/input_event_codes_rs/Cargo.toml index b7bfc0a33db25327ca8c03925a805fa501b866ca..0f34dc98a3f9e581ba8701cae74ffa3421935b10 100644 --- a/libs/input_event_codes_rs/Cargo.toml +++ b/libs/input_event_codes_rs/Cargo.toml @@ -1,8 +1,10 @@ [package] name = "input_event_codes_rs" -version = "0.2.4" +version = "0.2.5" edition = "2021" +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + [build-dependencies.bindgen] default_features = false features = ["runtime"] diff --git a/libs/kmod_rs/Cargo.toml b/libs/kmod_rs/Cargo.toml index 925ba7a4a10b82077614a81f6f705571d23a76f4..f13d44e7807eb2f6b11ffc5ad64e09c8ab63836c 100644 --- a/libs/kmod_rs/Cargo.toml +++ b/libs/kmod_rs/Cargo.toml @@ -3,8 +3,11 @@ name = "kmod_rs" version = "0.1.0" edition = "2021" +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + [dependencies] -log = { version = "=0.4.14", default_features = false, features = ["std"] } -kmod-sys = "0.2.0" -nix = "0.24" basic = { path = "../basic" } + +kmod-sys = "0.2.0" +log = { version = "=0.4.14", default_features = false } +nix = { default-features = false, version = "0.24" } diff --git a/libs/libtests/Cargo.toml b/libs/libtests/Cargo.toml index b14166c54722cd205aea07682fce7ae8ead304e2..1bc03f17b08b72f9b44e8c2cdbc39dc2de50a725 100644 --- a/libs/libtests/Cargo.toml +++ b/libs/libtests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libtests" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/libs/macros/Cargo.toml b/libs/macros/Cargo.toml index e7d178a816e6cf8bcac598b476be37275fdc1712..de0d89985b25d2eb2755ac1995a80313f8dbd100 100644 --- a/libs/macros/Cargo.toml +++ b/libs/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "macros" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -9,9 +9,9 @@ edition = "2021" proc-macro = true [dependencies] -syn = { version = "1.0", features = ["extra-traits"] } -quote = { version = "1.0" } proc-macro2 = { version = "1.0" } -strum = { version = "0.23", features = ["derive"] } +quote = { version = "1.0" } serde = "1.0.130" +strum = { version = "0.23", features = ["derive"] } +syn = { version = "1.0", features = ["extra-traits"] } toml = "0.5.8" diff --git a/libs/watchdog/Cargo.toml b/libs/watchdog/Cargo.toml index 458b55dea985cd15a61a34ed97684941e8579ae4..368f91a504a5f7f3e9983404a3c3d1aae120dfad 100644 --- a/libs/watchdog/Cargo.toml +++ b/libs/watchdog/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "watchdog" -version = "0.2.4" +version = "0.2.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nix = "0.24" +nix = { features = ["ioctl"], default-features = false, version = "0.24" }