mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
the merge requested pulled multiple other crate versions backwards
this fixes it, hopefully.
This commit is contained in:
parent
c04cc0e61c
commit
0c52a7a3ff
4 changed files with 4 additions and 4 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -4819,7 +4819,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "xous-kernel"
|
name = "xous-kernel"
|
||||||
version = "0.9.18"
|
version = "0.9.19"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ description = "Core kernel for Xous, including task switching and memory managem
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
name = "xous-kernel"
|
name = "xous-kernel"
|
||||||
version = "0.9.18"
|
version = "0.9.19"
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
# Dependency versions enforced by Cargo.lock.
|
# Dependency versions enforced by Cargo.lock.
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
"xous-susres@0.1.18", // ticktimer registers with susres to coordinate time continuity across sleeps
|
"xous-susres@0.1.18", // ticktimer registers with susres to coordinate time continuity across sleeps
|
||||||
"xous-ticktimer@0.1.17", // "well known" service: thread scheduling
|
"xous-ticktimer@0.1.17", // "well known" service: thread scheduling
|
||||||
].to_vec();
|
].to_vec();
|
||||||
let xous_kernel_remote = "xous-kernel@0.9.18";
|
let xous_kernel_remote = "xous-kernel@0.9.19";
|
||||||
|
|
||||||
// ---- extract position independent args ----
|
// ---- extract position independent args ----
|
||||||
let lkey = get_flag("--lkey")?;
|
let lkey = get_flag("--lkey")?;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ pub fn check_project_consistency() -> Result<(), DynError> {
|
||||||
let check_pkgs = [
|
let check_pkgs = [
|
||||||
// this set updates with kernel API changes
|
// this set updates with kernel API changes
|
||||||
"xous@0.9.23",
|
"xous@0.9.23",
|
||||||
"xous-kernel@0.9.18",
|
"xous-kernel@0.9.19",
|
||||||
"xous-ipc@0.9.23",
|
"xous-ipc@0.9.23",
|
||||||
"xous-api-log@0.1.17",
|
"xous-api-log@0.1.17",
|
||||||
"xous-api-names@0.9.18",
|
"xous-api-names@0.9.18",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue