From fdf3f6860a6d5747aa9d63612ae1aac48683163c Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 13 Dec 2020 02:22:52 +0800 Subject: [PATCH] ugh fix more CI issues on "run" variant --- Cargo.lock | 12 +----------- Cargo.toml | 4 ++-- services/shell/Cargo.toml | 6 +++--- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c088c3ab6..941c734d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -800,6 +800,7 @@ version = "0.1.0" dependencies = [ "bitflags", "blitstr", + "com", "com_rs", "graphics-server", "log", @@ -1132,17 +1133,6 @@ dependencies = [ "syn", ] -[[package]] -name = "xous-names" -version = "0.1.0" -dependencies = [ - "heapless", - "log", - "log-server", - "utralib", - "xous", -] - [[package]] name = "xtask" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 8b9e74132..6fb241650 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ "services/log-server", "services/ticktimer-server", "services/com", - "services/xous-names", +# "services/xous-names", "svd2utra", "xtask", ] @@ -17,7 +17,7 @@ default-members = [ "services/log-server", "services/graphics-server", "services/ticktimer-server", - "services/xous-names", +# "services/xous-names", "services/com", ] diff --git a/services/shell/Cargo.toml b/services/shell/Cargo.toml index 29dbfd485..273df15ff 100644 --- a/services/shell/Cargo.toml +++ b/services/shell/Cargo.toml @@ -13,10 +13,10 @@ ticktimer-server = { path = "../ticktimer-server" } log-server = { path = "../log-server" } log = "0.4" -# com = { path = "../com"} -# blitstr = { path = "../../../blitstr" } - +com = { path = "../com"} com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "9a91a81f482ea8eba2f2de5d6c20b9bd399f39a9" } + +# blitstr = { path = "../../../blitstr" } blitstr = { git = "https://github.com/betrusted-io/blitstr.git", rev = "69f7c04b9f44a20571c4792c8fc9166f5d6b548d" }