Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xous-rs: remove unused features. #253

Merged
merged 6 commits into from
Oct 25, 2022
Merged

xous-rs: remove unused features. #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14b92de
Remove baremetal cfg detection in build script
jeandudey Oct 25, 2022
f5176ea
Remove xous-rs unused features
jeandudey Oct 25, 2022
0ee9ec1
bump version numbers for crate publication
bunnie Oct 25, 2022
cc87391
fix dangling kernel dep
bunnie Oct 25, 2022
8d82f5b
update verifiers and locksgis
bunnie Oct 25, 2022
c987d5d
undo version inc on utra dependencies, which were not bumped
bunnie Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
224 changes: 112 additions & 112 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/xous-api-log/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ authors = ["Sean Cross <sean@xobs.io>"]
description = "Log server API"
edition = "2018"
name = "xous-api-log"
version = "0.1.13"
version = "0.1.14"
license = "MIT OR Apache-2.0"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/xous-book/"

# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.19"
xous-ipc = "0.9.19"
xous = "0.9.20"
xous-ipc = "0.9.20"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
Expand Down
8 changes: 4 additions & 4 deletions api/xous-api-names/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ authors = ["bunnie <bunnie@kosagi.com>"]
description = "Xous microkernel OS inter-process name resolution server"
edition = "2018"
name = "xous-api-names"
version = "0.9.14"
version = "0.9.15"
license = "MIT OR Apache-2.0"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/"

# Dependency versions enforced by Cargo.lock.
[dependencies]
log-server = {package = "xous-api-log", version = "0.1.13"}
xous = "0.9.19"
xous-ipc = "0.9.19"
log-server = {package = "xous-api-log", version = "0.1.14"}
xous = "0.9.20"
xous-ipc = "0.9.20"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
log = "0.4.14"
Expand Down
14 changes: 7 additions & 7 deletions api/xous-api-susres/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "xous-api-susres"
version = "0.9.12"
version = "0.9.13"
authors = ["bunnie <bunnie@kosagi.com>"]
edition = "2018"
description = "Manager of suspend/resume operations"
Expand All @@ -10,10 +10,10 @@ homepage = "https://betrusted.io/xous-book/"

# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.19"
xous-ipc = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
xous = "0.9.20"
xous-ipc = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
Expand All @@ -22,9 +22,9 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
utralib = { version = "0.1.7", optional = true, default-features = false }

[features]
precursor = ["utralib/precursor", "xous/precursor"]
precursor = ["utralib/precursor"]
hosted = ["utralib/hosted"]
renode = ["utralib/renode", "xous/renode"]
renode = ["utralib/renode"]
sus_reboot = [] # when selected, suspend triggers an immediate reboot instead of suspend. For testing only.
debugprint = []
default = []
12 changes: 6 additions & 6 deletions api/xous-api-ticktimer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ authors = ["bunnie <bunnie@kosagi.com>", "Sean Cross <sean@xobs.io>"]
description = "Provide high-resolution, non-rollover system time"
edition = "2018"
name = "xous-api-ticktimer"
version = "0.9.12"
version = "0.9.13"
license = "MIT OR Apache-2.0"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/xous-book/"

# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.19"
xous-ipc = "0.9.19"
log-server = {package = "xous-api-log", version = "0.1.13"}
susres = {package = "xous-api-susres", version = "0.9.12"}
xous-names = {package = "xous-api-names", version = "0.9.14"}
xous = "0.9.20"
xous-ipc = "0.9.20"
log-server = {package = "xous-api-log", version = "0.1.14"}
susres = {package = "xous-api-susres", version = "0.9.13"}
xous-names = {package = "xous-api-names", version = "0.9.15"}
log = "0.4.14"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
num-derive = {version = "0.3.3", default-features = false}
Expand Down
10 changes: 5 additions & 5 deletions apps/ball/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ description = "Ball demo app"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = "0.9.19"
xous-ipc = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.12" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
xous = "0.9.20"
xous-ipc = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.13" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
gam = {path = "../../services/gam" }
trng = {path = "../../services/trng"}
modals = {path = "../../services/modals"}
Expand Down
8 changes: 4 additions & 4 deletions apps/hello/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = "0.9.19"
xous-ipc = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
xous = "0.9.20"
xous-ipc = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}
Expand Down
10 changes: 5 additions & 5 deletions apps/mtxcli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ description = "Matrix chat"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = "0.9.19"
xous-ipc = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.12" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
xous = "0.9.20"
xous-ipc = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.13" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}
Expand Down
10 changes: 5 additions & 5 deletions apps/repl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ description = "REPL demo app"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = "0.9.19"
xous-ipc = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.12" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
xous = "0.9.20"
xous-ipc = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.13" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}
Expand Down
12 changes: 6 additions & 6 deletions apps/vault/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ edition = "2018"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = "0.9.19"
xous-ipc = "0.9.19"
xous = "0.9.20"
xous-ipc = "0.9.20"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
log-server = { package = "xous-api-log", version = "0.1.13" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
log-server = { package = "xous-api-log", version = "0.1.14" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}
Expand All @@ -21,7 +21,7 @@ usbd-human-interface-device = "0.2.1"
pddb = {path = "../../services/pddb" }
modals = {path = "../../services/modals" }
trng = {path="../../services/trng"}
susres = {package = "xous-api-susres", version = "0.9.12"}
susres = {package = "xous-api-susres", version = "0.9.13"}
ime-plugin-api = {path = "../../services/ime-plugin-api"}
content-plugin-api = {path = "../../services/content-plugin-api"} # all content canvas providers must provide this API
ctap-crypto = {path = "libraries/crypto"}
Expand All @@ -31,7 +31,7 @@ byteorder = { version = "1.4.3", default-features = false }
arrayref = "0.3.6"
subtle = { version = "2.2.3", default-features = false, features = ["nightly"] }
rand_core = "0.6.3"
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.13"}

# ux formatting
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
Expand Down
2 changes: 1 addition & 1 deletion apps/vault/libraries/crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cbor = { path = "../cbor" }
arrayref = "0.3.6"
subtle = { version = "2.2.3", default-features = false}
trng = {path = "../../../../services/trng"}
xous-names = {package = "xous-api-names", version = "0.9.14"}
xous-names = {package = "xous-api-names", version = "0.9.15"}
rand_core = "0.6.3"
p256 = {version = "0.10.1", default-features = false, features = ["ecdsa", "ecdh", "std"]}
cbc = "0.1.2"
Expand Down
6 changes: 3 additions & 3 deletions imports/getrandom/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ js-sys = { version = "0.3", optional = true }
wasm-bindgen-test = "0.3.18"

[target.'cfg(target_os = "xous")'.dependencies]
xous-names = {package = "xous-api-names", version = "0.9.14"}
xous = "0.9.19"
xous-ipc = "0.9.19"
xous-names = {package = "xous-api-names", version = "0.9.15"}
xous = "0.9.20"
xous-ipc = "0.9.20"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}


Expand Down
11 changes: 6 additions & 5 deletions kernel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ description = "Core kernel for Xous, including task switching and memory managem
license = "MIT OR Apache-2.0"
edition = "2018"
name = "xous-kernel"
version = "0.9.12"
version = "0.9.13"
resolver = "2"

# Dependency versions enforced by Cargo.lock.
[dependencies]
bitflags = "1.2.1"
stats_alloc = { version = "0.1.8", optional = true }
xous-kernel = { package = "xous", version = "0.9.19", features = [
xous-kernel = { package = "xous", version = "0.9.20", features = [
"forget-memory-messages",
] }
utralib = { version = "0.1.7", optional = true, default_features = false }

[target.'cfg(any(windows,unix))'.dev-dependencies]
xous-kernel = { package = "xous", version = "0.9.19", features = [
xous-kernel = { package = "xous", version = "0.9.20", features = [
"forget-memory-messages",
"processes-as-threads",
] }
Expand All @@ -26,9 +26,10 @@ xous-kernel = { package = "xous", version = "0.9.19", features = [
riscv = { version = "0.5.6", package = "xous-riscv" } # source is in "../imports/riscv-0.5.6"

[features]
precursor = ["utralib/precursor", "xous-kernel/precursor"]
precursor = ["utralib/precursor"]
hosted = ["utralib/hosted"]
renode = ["utralib/renode", "xous-kernel/renode"]
renode = ["utralib/renode"]

debug-print = []
gdb-stub = []
print-panics = []
Expand Down
4 changes: 2 additions & 2 deletions services/aes-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ version = "0.1.0"
# Dependency versions enforced by Cargo.lock.
[dependencies]
log = "0.4.14"
log-server = {package = "xous-api-log", version = "0.1.13"}
log-server = {package = "xous-api-log", version = "0.1.14"}
hex-literal = "0.3.1"
xous = "0.9.19"
xous = "0.9.20"

[features]
default = []
Expand Down
4 changes: 2 additions & 2 deletions services/aes/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ description = "AES library for Xous"

# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
xous = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
log = "0.4.14"
hex-literal = "0.3.1"
cipher = "0.4.2"
Expand Down
16 changes: 8 additions & 8 deletions services/codec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ description = "Audio CODEC server"

# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.12" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
xous = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.13" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.12"}
susres = {package = "xous-api-susres", version = "0.9.13"}
llio = {path = "../llio"}
trng = {path = "../trng"}

xous-ipc = "0.9.19"
xous-ipc = "0.9.20"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}

utralib = { version = "0.1.7", optional = true, default-features = false }

[features]
precursor = ["utralib/precursor", "xous/precursor"]
precursor = ["utralib/precursor"]
hosted = ["utralib/hosted"]
renode = ["utralib/renode", "xous/renode"]
renode = ["utralib/renode"]
default = []
16 changes: 8 additions & 8 deletions services/com/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ version = "0.1.0"
[dependencies]
com_rs-ref = {path = "../../imports/com_rs-ref"}
log = "0.4.14"
log-server = {package = "xous-api-log", version = "0.1.13"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.12"}
susres = {package = "xous-api-susres", version = "0.9.12"}
log-server = {package = "xous-api-log", version = "0.1.14"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.13"}
susres = {package = "xous-api-susres", version = "0.9.13"}
typenum = "1.12"
xous = "0.9.19"
xous-ipc = "0.9.19"
xous-names = {package = "xous-api-names", version = "0.9.14"}
xous = "0.9.20"
xous-ipc = "0.9.20"
xous-names = {package = "xous-api-names", version = "0.9.15"}
trng = {path = "../trng"}
llio = {path = "../llio"}

Expand All @@ -30,9 +30,9 @@ utralib = {version = "0.1.7", optional = true, default-features = false }
[target.'cfg(any(windows,unix))'.dependencies]

[features]
precursor = ["utralib/precursor", "xous/precursor"]
precursor = ["utralib/precursor"]
hosted = ["utralib/hosted"]
renode = ["utralib/renode", "xous/renode"]
renode = ["utralib/renode"]
debugprint = []
default = [] # "debugprint"
fccagent = []
Expand Down
4 changes: 2 additions & 2 deletions services/content-plugin-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ description = "Content Canvas Plugin Common APIs"

# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.19"
xous = "0.9.20"
rkyv = { version = "0.4.3", default_features = false }
graphics-server = { path="../graphics-server"} # this is used by the IMEF portion of the API
xous-names = {package = "xous-api-names", version = "0.9.14"} # used by the IMEF for registering listeners
xous-names = {package = "xous-api-names", version = "0.9.15"} # used by the IMEF for registering listeners
log = "0.4.14"

14 changes: 7 additions & 7 deletions services/dns/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ description = "Xous DNS resolver"

# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.19"
log-server = { package = "xous-api-log", version = "0.1.13" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.12" }
xous-names = { package = "xous-api-names", version = "0.9.14" }
xous = "0.9.20"
log-server = { package = "xous-api-log", version = "0.1.14" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.13" }
xous-names = { package = "xous-api-names", version = "0.9.15" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
net = {path = "../net"}
xous-ipc = "0.9.19"
xous-ipc = "0.9.20"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
trng = {path = "../trng"}

utralib = { version = "0.1.7", optional = true, default-features = false }

[features]
precursor = ["utralib/precursor", "xous/precursor"]
precursor = ["utralib/precursor"]
hosted = ["utralib/hosted"]
renode = ["utralib/renode", "xous/renode"]
renode = ["utralib/renode"]
default = []
Loading