Skip to content

Commit c5c34dd

Browse files
committed
Move mctp-usb-embassy into the workspace
mctp-usb-embassy now sets default-features = false for usb-embassy, to avoid pulling in usbd-hid feature which previously prevented builds (via ssmarshal https://gitlab.com/robigalia/ssmarshal/-/issues/5). mctp-estack workspace dependency is now default-features = false. Signed-off-by: Matt Johnston <[email protected]>
1 parent 0e51090 commit c5c34dd

File tree

4 files changed

+72
-13
lines changed

4 files changed

+72
-13
lines changed

Cargo.lock

Lines changed: 60 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[workspace]
2-
members = [ "pldm-fw-cli", "standalone" ]
3-
exclude = [ "mctp-usb-embassy" ]
2+
members = [ "pldm-fw-cli", "mctp-usb-embassy", "standalone" ]
43
resolver = "2"
54

65
[workspace.package]
@@ -20,7 +19,7 @@ enumset = "1.1"
2019
env_logger = "0.11.3"
2120
heapless = "0.8"
2221
log = "0.4"
23-
mctp-estack = { version = "0.1", path = "mctp-estack" }
22+
mctp-estack = { version = "0.1", path = "mctp-estack", default-features = false }
2423
mctp-linux = { version = "0.2", path = "mctp-linux" }
2524
mctp = { version = "0.2", path = "mctp", default-features = false }
2625
num-derive = { version = "0.4", default-features = false }

mctp-usb-embassy/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[package]
22
name = "mctp-usb-embassy"
33
description = "MCTP over USB transport for embassy-usb"
4-
edition = "2021"
54
version = "0.1.0"
6-
license = "MIT OR Apache-2.0"
7-
repository = "https://github.com/CodeConstruct/mctp-rs"
5+
edition.workspace = true
6+
license.workspace = true
7+
repository.workspace = true
88
categories = ["network-programming", "embedded", "no-std"]
99
rust-version = "1.82"
1010

1111
[dependencies]
12-
defmt = { version = "0.3", optional = true }
12+
defmt = { workspace = true, optional = true }
1313
embassy-futures = { version = "0.1" }
1414
embassy-usb-driver = { version = "0.2" }
15-
embassy-usb = { version = "0.5" }
16-
heapless = "0.8"
17-
log = { version = "0.4", optional = true }
18-
mctp-estack = { version = "0.1", path = "../mctp-estack", default-features = false }
19-
mctp = { version = "0.2", path = "../mctp", default-features = false }
15+
embassy-usb = { version = "0.5", default-features = false }
16+
heapless = { workspace = true }
17+
log = { workspace = true, optional = true }
18+
mctp-estack = { workspace = true }
19+
mctp = { workspace = true, default-features = false }
2020

2121
[features]
2222
default = ["log"]

standalone/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ categories = ["network-programming"]
1010
[dependencies]
1111
embedded-io-async = { workspace = true }
1212
log = { workspace = true }
13-
mctp-estack = { workspace = true }
13+
mctp-estack = { workspace = true, default-features = true }
1414
mctp = { workspace = true }
1515
smol = { workspace = true }
1616

0 commit comments

Comments
 (0)