From 0aaf64781fdcedc50917b4a79aca5eb11d8e67ad Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 3 Oct 2022 02:25:00 +0800 Subject: [PATCH] add refs to remote susres --- Cargo.lock | 98 ++++++++++++++++++++++++++++------------------- Cargo.toml | 4 +- xtask/src/main.rs | 8 ++-- 3 files changed, 65 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a78c01c4..6d205396c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -535,8 +535,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -556,9 +556,9 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-susres", "xous-ticktimer", ] @@ -1171,8 +1171,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -1288,7 +1288,7 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-susres", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ticktimer", ] @@ -1506,8 +1506,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -1570,8 +1570,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -1931,8 +1931,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -1967,8 +1967,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -2041,9 +2041,9 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-susres", "xous-ticktimer", ] @@ -2246,9 +2246,9 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-susres", "xous-ticktimer", ] @@ -2518,8 +2518,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", "zeroize", "zeroize_derive", @@ -3035,7 +3035,7 @@ dependencies = [ "winapi", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-names 0.9.7", + "xous-names", ] [[package]] @@ -3118,9 +3118,9 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-susres", "xous-ticktimer", "zeroize", ] @@ -3387,8 +3387,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -3469,8 +3469,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -3568,8 +3568,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -3632,9 +3632,9 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-susres", "xous-ticktimer", ] @@ -3938,8 +3938,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -4107,9 +4107,9 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-susres", "xous-ticktimer", ] @@ -4132,7 +4132,7 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-susres", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ticktimer", ] @@ -4234,8 +4234,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-susres", "xous-ticktimer", ] @@ -4724,6 +4724,37 @@ dependencies = [ "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "xous-api-susres" +version = "0.9.0" +dependencies = [ + "log", + "num-derive", + "num-traits", + "rkyv", + "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-log", + "xous-api-names", + "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "xous-api-susres" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae5443e5d56aa07c289d9e0eca8bd01f82f80c263abf14cc6f2942f2dfae9eb8" +dependencies = [ + "log", + "num-derive", + "num-traits", + "rkyv", + "utralib", + "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-log", + "xous-api-names", + "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "xous-ipc" version = "0.9.9" @@ -4775,7 +4806,7 @@ dependencies = [ [[package]] name = "xous-names" -version = "0.9.0" +version = "0.9.8" dependencies = [ "log", "num-derive", @@ -4788,20 +4819,6 @@ dependencies = [ "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "xous-names" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024a7c3479b9cc1198dfeb9b3a09829fbb6a41f6761ef1c495a75898dba58877" -dependencies = [ - "log", - "num-derive", - "num-traits", - "rkyv", - "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "xous-riscv" version = "0.5.6" @@ -4830,6 +4847,7 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4845,24 +4863,24 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-susres", ] [[package]] name = "xous-tts-backend" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d0fd1ceeb73a0eb226efc0f772dd643c25bc59b04db4bb593b4273d7253624" +checksum = "5d62723f89376b9aed6e88fb3d6ec94f4d8bd343aa1e44b8ca871bde915691ce" dependencies = [ "log", "num-derive", "num-traits", "rkyv", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-names", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-names 0.9.7", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index cbeed6cce..a2eee0093 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,6 +57,7 @@ members = [ "services/ime-plugin-api", "services/content-plugin-api", "services/llio", + "services/susres", "services/codec", "services/engine-sha512", "services/engine-25519", @@ -97,7 +98,8 @@ exclude = [ "xtask", # exclude the API crates, as they are domiciled here but referenced via crates.io "api/log-server", - "api/xous-names" + "api/xous-names", + "api/susres", ] [profile.release] diff --git a/xtask/src/main.rs b/xtask/src/main.rs index b3b358e0e..61f7fd0a4 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -88,10 +88,10 @@ fn main() -> Result<(), Box> { // packages located on crates.io. For testing non-local build configs that are less // concerned about software supply chain and more focused on developer convenience. let base_pkgs_remote = [ - "xous-ticktimer", // "well known" service: thread scheduling - "xous-log@0.1.0", // "well known" service: debug logging - "xous-names@0.9.0", // "well known" service: manage inter-server connection lookup - "xous-susres", // ticktimer registers with susres to coordinate time continuity across sleeps + "xous-ticktimer", // "well known" service: thread scheduling + "xous-log@0.1.0", // "well known" service: debug logging + "xous-names@0.9.8", // "well known" service: manage inter-server connection lookup + "xous-susres@0.1.0", // ticktimer registers with susres to coordinate time continuity across sleeps ].to_vec(); let xous_kernel_remote = "xous-kernel@0.9.2";