Skip to content

Commit

Permalink
rmm: Use locally-linked ciborium and coset
Browse files Browse the repository at this point in the history
Two crates have been locally-linked to constrain `half` crate's
version to the one which does not cause a build error related to
neon target-feature.

Note that `git submodule update --init --depth 1 --recursive`
should be executed once for the existing islet repository to build
islet RMM successfully.

[before]
```
$ cargo tree
...
├── islet_rmm v0.0.1 (/home/changho/zpzigi754/islet/rmm)
│   ├── armv9a v0.0.1 (/home/changho/zpzigi754/islet/lib/armv9a)
│   ├── ciborium v0.2.2
│   │   ├── ciborium-io v0.2.2
│   │   ├── ciborium-ll v0.2.2
│   │   │   ├── ciborium-io v0.2.2
│   │   │   └── half v2.4.0         <-- the problematic crate
│   ├── coset v0.3.6
│   │   ├── ciborium v0.2.2 (*)
│   │   └── ciborium-io v0.2.2
...
```

[after]
```
$ cargo tree
...
├── islet_rmm v0.0.1 (/home/changho/zpzigi754/islet/rmm)
│   ├── armv9a v0.0.1 (/home/changho/zpzigi754/islet/lib/armv9a)
│   ├── ciborium v0.2.2 (/home/changho/zpzigi754/islet/third-party/ciborium/ciborium)
│   │   ├── ciborium-io v0.2.2 (/home/changho/zpzigi754/islet/third-party/ciborium/ciborium-io)
│   │   ├── ciborium-ll v0.2.2 (/home/changho/zpzigi754/islet/third-party/ciborium/ciborium-ll)
│   │   │   ├── ciborium-io v0.2.2 (/home/changho/zpzigi754/islet/third-party/ciborium/ciborium-io)
│   │   │   └── half v1.8.3
│   ├── coset v0.3.6 (/home/changho/zpzigi754/islet/third-party/coset)
│   │   ├── ciborium v0.2.2 (/home/changho/zpzigi754/islet/third-party/ciborium/ciborium) (*)
│   │   └── ciborium-io v0.2.2 (/home/changho/zpzigi754/islet/third-party/ciborium/ciborium-io)
...
```

Signed-off-by: Changho Choi <[email protected]>
  • Loading branch information
zpzigi754 committed Mar 22, 2024
1 parent 071810f commit 58c333f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rmm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2021"

[dependencies]
armv9a = { path = "../lib/armv9a" }
ciborium = { version = "*", default-features = false }
coset = "*"
ciborium = { version = "*", default-features = false, path = "../third-party/ciborium/ciborium" }
coset = { version = "*", path = "../third-party/coset" }
hex = { version = "*", default-features = false, features = ["alloc"] }
lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
linked_list_allocator = "0.10.4"
Expand Down

0 comments on commit 58c333f

Please sign in to comment.