cleanup rev/revision manifest error

This commit is contained in:
bunnie 2023-05-03 22:53:54 +08:00
parent 2429cbd990
commit 7513f237e4
8 changed files with 13 additions and 54 deletions

14
Cargo.lock generated
View file

@ -613,7 +613,7 @@ dependencies = [
name = "com"
version = "0.1.0"
dependencies = [
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs)",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921)",
"llio",
"log",
"num-derive",
@ -639,7 +639,7 @@ source = "git+https://github.com/betrusted-io/com_rs?branch=main#891bdd3ca8e41f8
[[package]]
name = "com_rs"
version = "0.1.0"
source = "git+https://github.com/betrusted-io/com_rs#891bdd3ca8e41f81510d112483e178aea3e3a921"
source = "git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921#891bdd3ca8e41f81510d112483e178aea3e3a921"
[[package]]
name = "compiler_builtins"
@ -2375,7 +2375,7 @@ version = "0.7.0"
dependencies = [
"codec",
"com",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs)",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921)",
"content-plugin-api",
"gam",
"graphics-server",
@ -2421,7 +2421,7 @@ version = "0.1.0"
dependencies = [
"byteorder",
"com",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs)",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921)",
"llio",
"locales",
"log",
@ -3745,7 +3745,7 @@ dependencies = [
"cipher 0.3.0",
"codec",
"com",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs)",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921)",
"content-plugin-api",
"cos_table",
"curve25519-dalek",
@ -3917,7 +3917,7 @@ dependencies = [
"chrono",
"codec",
"com",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs)",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921)",
"content-plugin-api",
"crossbeam",
"digest 0.9.0",
@ -4686,7 +4686,7 @@ dependencies = [
"byteorder",
"cbor",
"chrono",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs)",
"com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921)",
"content-plugin-api",
"crypto-mac",
"ctap-crypto",

View file

@ -24,7 +24,7 @@ ime-plugin-shell = { path = "../../services/ime-plugin-shell"}
content-plugin-api = { path = "../../services/content-plugin-api"} # all content canvas providers must provide this API
codec = { path = "../../services/codec"}
com = { path = "../../services/com"}
com_rs = { git = "https://github.com/betrusted-io/com_rs", revision = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
llio = { path = "../../services/llio"}
net = { path = "../../services/net" }
pddb = { path = "../../services/pddb" }

View file

@ -54,7 +54,7 @@ base32 = "0.4.0"
sha2 = {path="../../services/engine-sha512"}
sntpc = {version = "0.3.1"}
net = {path="../../services/net"}
com_rs = { git = "https://github.com/betrusted-io/com_rs", revision = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
# performance profiling
perflib = {path="../../tools/perflib", optional = true}

View file

@ -1,41 +0,0 @@
# Imports
## Build Not Working: Why You're Most Likely Looking at This
If your build isn't working due to a failed import reference, it's probably because
one of the `xous-core` developers accidentally checked in a reference to a local directory
in one or more of the `Cargo.toml` files within this subdirectory.
Most likely, you can find the offending `Cargo.toml` file, and remove the local directory
reference and replace it with the commented-out gitref. In the worst case, the developer
failed to push up changes in the dependant crate, at which point you should open an issue
to get that fixed.
## #TIL: patch.crates-io
When we did this, we didn't know there was a thing such as `[patch.crates-io]` that allows for
overrides in cargo paths. Probably this system should be refactored to use this,
instead of the methodology outlined here.
## Rationale
We depend upon some packages that aren't in `crates.io` yet, but are also not
integrated into the `xous-core` repo. Reasons for this range from the preference
of the package's originator, to local cross-project dependencies (such as the `com-rs`
package, which is the API between the `betrusted-ec` firmware and `xous-core`) that
don't make sense to publish as a crate.
These are instead hosted in a separate, standa-lone github repo. The methodology
in this case is to refer to the git commit ref in the `Cargo.toml` for `xous-core`
integration.
However, we have situations where multiple crates within `xous-core` need
to refer to the same git commit ref, which leads to the opportunity for
inconsistent versions between sub-crates within `xous-core`.
`imports` are simple packages that re-export the contents of a stand-alone package,
allowing us a single location, common to all sub-crates within `xous-core`, to define a
single git commit ref. For local development, the git commit ref is replaced
with a local directory path.
The convention is to name the imported package based upon its root name
and then add `-ref` to the end, and then to `use import-ref as import` to
resolve the import into the correct name space.

View file

@ -7,7 +7,7 @@ version = "0.1.0"
# Dependency versions enforced by Cargo.lock.
[dependencies]
com_rs = { git = "https://github.com/betrusted-io/com_rs", revision = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
log = "0.4.14"
log-server = {package = "xous-api-log", version = "0.1.37"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.37"}

View file

@ -22,7 +22,7 @@ llio = {path = "../llio"}
com = {path = "../com"}
byteorder = { version = "1.0", default-features = false }
trng = {path = "../trng"}
com_rs = { git = "https://github.com/betrusted-io/com_rs", revision = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
modals = {path = "../modals"}
locales = {path = "../../locales"}
utralib = { version = "0.1.17", optional = true, default-features = false }

View file

@ -55,7 +55,7 @@ chrono = {version = "0.4.19", default-features = false, features = ["std"]}
base64 = "0.20.0"
cos_table = {path="../../libs/cos_table"}
# used to parse net connectivity results
com_rs = { git = "https://github.com/betrusted-io/com_rs", revision = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
# for net testing
threadpool = "1.8.1"

View file

@ -41,7 +41,7 @@ crossbeam = "0.8.2"
sha2 = {path="../engine-sha512"}
digest = "0.9.0"
xous-semver = "0.1.2"
com_rs = { git = "https://github.com/betrusted-io/com_rs", revision = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
utralib = {version = "0.1.17", optional = true, default-features = false }