various small fixups in crates.io to local source sync checks

This commit is contained in:
bunnie 2022-10-14 17:43:08 +08:00
parent 158ea5bb2d
commit f2ae008c25
4 changed files with 150 additions and 137 deletions

264
Cargo.lock generated
View file

@ -31,7 +31,7 @@ dependencies = [
"cipher 0.4.3",
"hex-literal",
"log",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
]
@ -65,7 +65,7 @@ version = "0.1.0"
dependencies = [
"hex-literal",
"log",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
]
@ -175,11 +175,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -532,12 +532,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -553,12 +553,12 @@ dependencies = [
"trng",
"typenum",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -611,7 +611,7 @@ dependencies = [
"graphics-server",
"log",
"rkyv",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
]
@ -1046,11 +1046,11 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1168,12 +1168,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1285,7 +1285,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
@ -1503,12 +1503,12 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1545,9 +1545,9 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
"wasm-bindgen-test",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1567,12 +1567,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1657,10 +1657,10 @@ dependencies = [
"num-derive",
"num-traits",
"tts-frontend",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1794,11 +1794,11 @@ dependencies = [
"rkyv",
"tts-frontend",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1810,9 +1810,9 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1825,11 +1825,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1844,11 +1844,11 @@ dependencies = [
"rkyv",
"tts-frontend",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1928,12 +1928,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1948,7 +1948,7 @@ version = "0.1.0"
dependencies = [
"log",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-ticktimer",
]
@ -1964,12 +1964,12 @@ dependencies = [
"rkyv",
"spinor",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2020,7 +2020,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
@ -2038,12 +2038,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -2203,11 +2203,11 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2227,11 +2227,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2267,12 +2267,12 @@ dependencies = [
"smoltcp",
"trng",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -2539,12 +2539,12 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"zeroize",
"zeroize_derive",
]
@ -2572,7 +2572,7 @@ version = "0.1.0"
dependencies = [
"log",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3014,11 +3014,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3057,9 +3057,9 @@ dependencies = [
"untrusted",
"web-sys",
"winapi",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3139,12 +3139,12 @@ dependencies = [
"tts-frontend",
"usb-device-xous",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
"zeroize",
]
@ -3408,12 +3408,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3490,12 +3490,12 @@ dependencies = [
"utralib",
"webpki-roots",
"x25519-dalek",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3546,7 +3546,7 @@ dependencies = [
name = "spawn"
version = "0.1.0"
dependencies = [
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3589,12 +3589,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3653,12 +3653,12 @@ dependencies = [
"trng",
"usb-device-xous",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -3690,7 +3690,7 @@ dependencies = [
[[package]]
name = "svd2utra"
version = "0.1.1"
version = "0.1.2"
dependencies = [
"convert_case",
"quick-xml",
@ -3698,9 +3698,9 @@ dependencies = [
[[package]]
name = "svd2utra"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "febce5fedefca45dd6d3596751bd1b55b968eb633539badd1bda52d21bc62e09"
checksum = "d2fca16343c94db8bebd2d68d803f0b8e301f6ecb1a0bb74384158b481f31f57"
dependencies = [
"convert_case",
"quick-xml",
@ -3762,7 +3762,7 @@ dependencies = [
name = "test-spawn"
version = "0.1.0"
dependencies = [
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3875,7 +3875,7 @@ dependencies = [
"log",
"pem",
"ring",
"svd2utra 0.1.1",
"svd2utra 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"xmas-elf",
"xous-semver",
]
@ -3959,12 +3959,12 @@ dependencies = [
"rand_chacha 0.3.1",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3977,11 +3977,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-tts-backend",
]
@ -4128,12 +4128,12 @@ dependencies = [
"usbd-human-interface-device 0.2.1",
"utralib",
"vcell",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -4153,7 +4153,7 @@ dependencies = [
"usbd-human-interface-device 0.1.1",
"utralib",
"vcell",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
@ -4202,11 +4202,11 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "utralib"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d971fbaf8c63df988891d895a14edcc4b2fafb2e4ceaf815bf9a329870a579"
checksum = "f163872f1b1ba17d51d44608b498d7c608718c73b81399c5b86a461ba22957d3"
dependencies = [
"svd2utra 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"svd2utra 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4255,12 +4255,12 @@ dependencies = [
"tts-frontend",
"usb-device-xous",
"usbd-human-interface-device 0.2.1",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4704,7 +4704,7 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]]
name = "xous"
version = "0.9.15"
version = "0.9.16"
dependencies = [
"compiler_builtins",
"lazy_static",
@ -4713,99 +4713,99 @@ dependencies = [
[[package]]
name = "xous"
version = "0.9.15"
version = "0.9.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99ff721cd63b190faf8c19eb232d0c3c127def6d44ad764b6fc8c786388dcb90"
checksum = "e420cce1a2b9d6561eb5bec17fa596e8abb75608fade820a8c654650cbe816c7"
dependencies = [
"lazy_static",
]
[[package]]
name = "xous-api-log"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99b2a27b124a6b6db3a7706ee01931cc046e882e9c3d3c23a8ed8b799e1cbdd8"
checksum = "78a5c9b8c6aa242e6868a349b6595e15c1cd3e74923306730aed752759f7e524"
dependencies = [
"log",
"num-derive",
"num-traits",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-names"
version = "0.9.10"
version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8a2e28c323a2a238c632bd84799c5ef9bfb15a713e400cc32b9ec8f16c5b143"
checksum = "6996efbb210c6a1b7c152b0fac5ca89be4c7b98f513476bde5bf02166092f114"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-susres"
version = "0.9.7"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b01f8972f3805a3a1f13ce9e7a6dec1dfb8c017433dcb6477b506d220dcf814a"
checksum = "2dd8d7b6e6a96e8df41ad4a4cedb3f16be4d8d18f2d858a3747e4bbddf37b81b"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-ticktimer"
version = "0.9.7"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15208c5050833fc70b69d148ce256ba40682113472baa3f0f316550dec97632f"
checksum = "96eb00e9cd49a61fa4fc902271a7ae787b68a935d7befb605c0731f4ab02b56a"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
[[package]]
name = "xous-ipc"
version = "0.9.15"
version = "0.9.16"
dependencies = [
"bitflags",
"rkyv",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-ipc"
version = "0.9.15"
version = "0.9.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50a78d9b507ae10259a8397759b05d9d5e1e516f3d8096f9f42f5be3899a966e"
checksum = "4f70759dac1b047ef6edae3b65176be97b823d7c3fb0065a35715bf935ddb9c2"
dependencies = [
"bitflags",
"rkyv",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-kernel"
version = "0.9.8"
version = "0.9.9"
dependencies = [
"bitflags",
"crossbeam-channel",
@ -4815,36 +4815,36 @@ dependencies = [
"rand_chacha 0.3.1",
"stats_alloc",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-riscv",
]
[[package]]
name = "xous-log"
version = "0.1.6"
version = "0.1.7"
dependencies = [
"log",
"num-derive",
"num-traits",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-names"
version = "0.9.14"
version = "0.9.15"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4865,6 +4865,22 @@ checksum = "6ed3278bb4e7be4895c1c597434e5269f7357ffb800ebc644f0398bb008a15ad"
[[package]]
name = "xous-susres"
version = "0.1.10"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"utralib",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-ticktimer"
version = "0.1.9"
dependencies = [
"log",
@ -4872,28 +4888,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-ticktimer"
version = "0.1.8"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"utralib",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -4907,9 +4907,9 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4922,7 +4922,7 @@ dependencies = [
"rustc_version 0.4.0",
"serde",
"serde_json",
"svd2utra 0.1.1",
"svd2utra 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile",
"ureq",
"zip",

View file

@ -252,6 +252,11 @@ impl Builder {
self.features.push(feature.into());
self
}
/// remove a feature previously added by a previous call
pub fn remove_feature<'a>(&'a mut self, feature: &str) -> &'a mut Builder {
self.features.retain(|x| x != feature);
self
}
/// add a feature to be passed on to just the loader
pub fn add_loader_feature<'a>(&'a mut self, feature: &str) -> &'a mut Builder {
self.loader_features.push(feature.into());
@ -524,7 +529,7 @@ impl Builder {
// confirm the kernel can build before quitting
let _ = self.builder(
&vec![CrateSpec::Local("xous-kernel".into())],
&self.features,
&self.kernel_features,
&target,
self.stream,
&vec![],

View file

@ -213,6 +213,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("renode-remote") => {
builder.target_renode()
.add_services(&base_pkgs_remote.into_iter().map(String::from).collect())
.remove_feature("timestamp") // crates.io package can't have a timestamp
.use_kernel(xous_kernel_remote);
}

View file

@ -66,7 +66,8 @@ pub fn verify(spec: CrateSpec) -> Result<(), DynError> {
};
let subdir = format!("./{}/{}/", subdir, name);
// handle special cases of xous kernel and ipc crates
let src_path = if name != "xous" && name != "xous-ipc" && name != "xous-kernel" {
let src_path = if name != "xous" && name != "xous-ipc" && name != "xous-kernel"
&& name != "utralib" && name != "svd2utra" {
Path::new(&subdir)
} else {
if name == "xous" {
@ -75,6 +76,10 @@ pub fn verify(spec: CrateSpec) -> Result<(), DynError> {
Path::new("./xous-ipc")
} else if name == "xous-kernel" {
Path::new("./kernel")
} else if name == "utralib" {
Path::new("./utralib")
} else if name == "svd2utra" {
Path::new("./svd2utra")
} else {
panic!("Consistency error: special case handling did not find either xous or xous-ipc");
}
@ -188,10 +193,12 @@ fn compare_dirs(src: &Path, other: &Path) -> Result<bool, DynError> {
let mut src_file = src.to_path_buf();
src_file.push(&fname);
// println!("comparing {} <-> {}", src_file.as_os_str().to_str().unwrap(), other_file.as_os_str().to_str().unwrap());
if src_file.as_os_str().to_str().unwrap().contains("ticktimer")
&& fname.as_os_str().to_str().unwrap() == "version.rs" {
if (src_file.as_os_str().to_str().unwrap().contains("ticktimer")
&& fname.as_os_str().to_str().unwrap() == "version.rs")
|| src_file.as_os_str().to_str().unwrap().contains("Cargo.lock") {
// don't compare the version.rs, as it's supposed to be different due to the timestamp
// println!("skipping ticktimer version.rs");
// don't compare Cargo.lock files that happen to be checked into packages
// println!("skipping ticktimer version.rs or Cargo.lock file"); // this line is helpful to ensure our skip exception isn't too broad.
} else {
match compare_files(&src_file, &other_file) {
Ok(true) => {},