fix: migrate all local recipe Cargo.toml deps from local/sources/ to recipes/core/base/ symlinks

Systemic fix: all local recipes (~150 references across 40+ Cargo.toml files)
now resolve libredox, redox_syscall, and redox-scheme through
recipes/core/base/ symlinks instead of local/sources/ paths.
Eliminates lockfile collision between Cargo's resolution of the same
package through different path strings (local/sources/ vs recipes/core/base/).

This is required because the base recipe's workspace Cargo.toml resolves
these deps through recipes/core/base/ (via symlink chain from the
recipe copy location), and Cargo treats different path strings to the
same directory as different packages.
This commit is contained in:
2026-07-09 15:31:01 +03:00
parent 048a4eaa3b
commit 550551d8bc
51 changed files with 183 additions and 183 deletions
+6 -6
View File
@@ -13,15 +13,15 @@ license = "MIT"
[workspace.dependencies]
rsext4 = "0.3"
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-path = "0.3.0"
log = "0.4"
env_logger = "0.11"
libc = "0.2"
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -7,8 +7,8 @@ license.workspace = true
[dependencies]
rsext4.workspace = true
redox_syscall = { path = "../../../../../../local/sources/syscall", workspace = true, optional = true }
libredox = { path = "../../../../../../local/sources/libredox", workspace = true, optional = true }
redox_syscall = { path = "../../../../../../recipes/core/base/syscall", workspace = true, optional = true }
libredox = { path = "../../../../../../recipes/core/base/libredox", workspace = true, optional = true }
log.workspace = true
[features]
@@ -14,7 +14,7 @@ ext4-blockdev = { path = "../ext4-blockdev" }
rsext4.workspace = true
redox_syscall.workspace = true
redox-scheme.workspace = true
libredox = { path = "../../../../../../local/sources/libredox", workspace = true, optional = true }
libredox = { path = "../../../../../../recipes/core/base/libredox", workspace = true, optional = true }
redox-path = { workspace = true, optional = true }
log.workspace = true
env_logger = { workspace = true, optional = true }
+6 -6
View File
@@ -16,15 +16,15 @@ license = "MIT"
[workspace.dependencies]
fatfs = "0.3.6"
fscommon = "0.1.1"
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-path = "0.3.0"
log = "0.4"
env_logger = "0.11"
libc = "0.2"
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -15,7 +15,7 @@ fatfs.workspace = true
fscommon.workspace = true
redox_syscall.workspace = true
redox-scheme.workspace = true
libredox = { path = "../../../../../../local/sources/libredox", workspace = true, optional = true }
libredox = { path = "../../../../../../recipes/core/base/libredox", workspace = true, optional = true }
redox-path = { workspace = true, optional = true }
log.workspace = true
env_logger = { workspace = true, optional = true }
+1 -1
View File
@@ -10,5 +10,5 @@ path = "src/main.rs"
[dependencies]
usb-core = { path = "../../usb-core/source" }
redox_syscall = { path = "../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../recipes/core/base/syscall" }
log = "0.4"
@@ -10,16 +10,16 @@ path = "src/main.rs"
[dependencies]
usb-core = { path = "../../usb-core/source" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-driver-sys = { path = "../../redox-driver-sys/source" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
[target.'cfg(target_os = "redox")'.dependencies]
redox-driver-sys = { path = "../../redox-driver-sys/source", features = ["redox"] }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
+1 -1
View File
@@ -10,5 +10,5 @@ path = "src/main.rs"
[dependencies]
usb-core = { path = "../../usb-core/source" }
redox_syscall = { path = "../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../recipes/core/base/syscall" }
log = "0.4"
@@ -10,11 +10,11 @@ path = "src/main.rs"
[dependencies]
usb-core = { path = "../../usb-core/source" }
syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
redox-driver-sys = { path = "../../redox-driver-sys/source" }
log = "0.4"
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
@@ -9,12 +9,12 @@ path = "src/main.rs"
[dependencies]
libc = "0.2"
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
@@ -6,4 +6,4 @@ description = "PCI bus backend for redox-driver-core"
[dependencies]
redox-driver-core = { path = "../redox-driver-core" }
redox_syscall = { path = "../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../recipes/core/base/syscall" }
@@ -6,8 +6,8 @@ description = "PCI bus backend for redox-driver-core"
[dependencies]
redox-driver-core = { path = "../../redox-driver-core/source" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
+1 -1
View File
@@ -10,5 +10,5 @@ path = "src/main.rs"
[dependencies]
usb-core = { path = "../../usb-core/source" }
redox_syscall = { path = "../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../recipes/core/base/syscall" }
log = "0.4"
@@ -10,12 +10,12 @@ path = "src/main.rs"
[dependencies]
usb-core = { path = "../../usb-core/source" }
syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
redox-driver-sys = { path = "../../redox-driver-sys/source" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = "0.4"
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
@@ -11,13 +11,13 @@ path = "src/main.rs"
[dependencies]
anyhow = "1"
log = "0.4"
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
redox_syscall = { path = "../../../../../local/sources/syscall", features = ["std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
redox_syscall = { path = "../../../../../recipes/core/base/syscall", features = ["std"] }
redox-driver-sys = { path = "../../redox-driver-sys/source" }
syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
inputd = { path = "../../../../sources/base/drivers/inputd" }
common = { path = "../../../../sources/base/drivers/common" }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
Binary file not shown.
Binary file not shown.
@@ -9,11 +9,11 @@ path = "src/main.rs"
[dependencies]
libc = "0.2"
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+1 -1
View File
@@ -8,5 +8,5 @@ name = "cpufreqd"
path = "src/main.rs"
[dependencies]
redox_syscall = { path = "../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../recipes/core/base/syscall" }
log = "0.4"
@@ -8,8 +8,8 @@ name = "cpufreqd"
path = "src/main.rs"
[dependencies]
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
log = "0.4"
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -8,11 +8,11 @@ name = "devfsd"
path = "src/main.rs"
[dependencies]
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
log = "0.4"
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+5 -5
View File
@@ -10,9 +10,9 @@ name = "diskd"
path = "src/main.rs"
[dependencies]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
log = "0.4"
[profile.release]
@@ -20,5 +20,5 @@ opt-level = 3
lto = true
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -12,7 +12,7 @@ path = "src/main.rs"
redox-driver-core = { path = "../../drivers/redox-driver-core" }
redox-driver-pci = { path = "../../drivers/redox-driver-pci" }
pcid_interface = { path = "../../../../local/sources/base/drivers/pcid", package = "pcid" }
redox_syscall = { path = "../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../recipes/core/base/syscall" }
log = "0.4"
toml = "0.8"
serde = { version = "1", features = ["derive"] }
@@ -12,13 +12,13 @@ path = "src/main.rs"
redox-driver-core = { path = "../../../drivers/redox-driver-core/source" }
redox-driver-pci = { path = "../../../drivers/redox-driver-pci/source" }
pcid_interface = { path = "../../../../../local/sources/base/drivers/pcid", package = "pcid" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall", features = ["std"] }
log = "0.4"
toml = "0.8"
serde = { version = "1", features = ["derive"] }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
@@ -8,7 +8,7 @@ name = "driver-params"
path = "src/main.rs"
[dependencies]
redox_syscall = { path = "../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../local/sources/redox-scheme" }
libredox = { path = "../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../recipes/core/base/syscall" }
redox-scheme = { path = "../../../../recipes/core/base/redox-scheme" }
libredox = { path = "../../../../recipes/core/base/libredox" }
log = "0.4"
@@ -8,12 +8,12 @@ name = "driver-params"
path = "src/main.rs"
[dependencies]
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
log = "0.4"
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -4,8 +4,8 @@ version = "0.3.0"
edition = "2021"
[dependencies]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
log = { version = "0.4", features = ["std"] }
thiserror = "2"
orbclient = { version = "0.3", default-features = false }
@@ -16,5 +16,5 @@ redox_event = "0.4"
[workspace]
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -5,15 +5,15 @@ edition = "2021"
[dependencies]
libc = "0.2"
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox_scheme = { path = "../../../../../local/sources/redox-scheme", package = "redox-scheme" }
libredox = { path = "../../../../../local/sources/libredox" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
redox_scheme = { path = "../../../../../recipes/core/base/redox-scheme", package = "redox-scheme" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
log = { version = "0.4", features = ["std"] }
sha2 = "0.10"
thiserror = "2"
toml = "0.8"
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+3 -3
View File
@@ -8,7 +8,7 @@ name = "hwrngd"
path = "source/src/main.rs"
[dependencies]
libredox = { path = "../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
@@ -8,10 +8,10 @@ name = "hwrngd"
path = "src/main.rs"
[dependencies]
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+4 -4
View File
@@ -5,11 +5,11 @@ edition = "2021"
[dependencies]
redox-driver-sys = { version = "0.3", path = "../../../drivers/redox-driver-sys/source" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
log = { version = "0.4", features = ["std"] }
[patch.crates-io]
redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -4,8 +4,8 @@ version = "0.3.0"
edition = "2021"
[dependencies]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -9,12 +9,12 @@ path = "src/main.rs"
[dependencies]
log = "0.4"
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme", package = "redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme", package = "redox-scheme" }
xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
common = { path = "../../../../../local/sources/base/drivers/common" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
@@ -9,10 +9,10 @@ path = "src/main.rs"
[dependencies]
libc = "0.2"
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -9,14 +9,14 @@ path = "src/main.rs"
[dependencies]
log = "0.4"
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
common = { path = "../../../../../local/sources/base/drivers/common" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
[target.'cfg(target_os = "redox")'.dependencies]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
@@ -9,14 +9,14 @@ path = "src/main.rs"
[dependencies]
log = "0.4"
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
common = { path = "../../../../../local/sources/base/drivers/common" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
[target.'cfg(target_os = "redox")'.dependencies]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
@@ -145,8 +145,8 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
orbclient = "0.3"
redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source" }
libredox = { path = "../../../../../local/sources/libredox" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
libredox = { path = "../../../../../recipes/core/base/libredox" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -4,8 +4,8 @@ version = "0.3.0"
edition = "2021"
[dependencies]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -6,8 +6,8 @@ edition = "2021"
[dependencies]
serde = { version = "1", features = ["derive"] }
serde_json = "1"
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
[lib]
name = "keymapd"
path = "src/lib.rs"
@@ -17,5 +17,5 @@ name = "redbear-keymapd"
path = "src/main.rs"
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -23,8 +23,8 @@ opt-level = 3
codegen-units = 1
[target.'cfg(target_os = "redox")'.dependencies]
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "redox_syscall", "protocol"] }
syscall = { package = "redox_syscall", path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "redox_syscall", "protocol"] }
syscall = { package = "redox_syscall", path = "../../../../../recipes/core/base/syscall" }
[target.'cfg(target_os = "linux")'.dependencies]
libc = "0.2"
@@ -12,8 +12,8 @@ zbus = { version = "5", default-features = false, features = ["tokio"] }
tokio = { version = "1", features = ["full"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
libredox = { path = "../../../../../local/sources/libredox" }
redox-syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall" }
# Patch tokio to recover from transient EBADF/EINVAL on Redox's scheme:event
# epoll. Without this, redbear-sessiond panics during early-boot scheme
# churn. The patch lives at local/patches/tokio/P0-epoll-redox-recovery.patch
@@ -22,5 +22,5 @@ redox-syscall = { path = "../../../../../local/sources/syscall", package = "redo
# epoll scheme is stabilized to never return EBADF/EINVAL under normal use).
[patch.crates-io]
tokio = { path = "../../../../../local/patches/tokio/vendored" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -16,8 +16,8 @@ anyhow = "1"
[target.'cfg(target_os = "redox")'.dependencies]
libc = "0.2"
libredox = { path = "../../../../../local/sources/libredox" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
libredox = { path = "../../../../../recipes/core/base/libredox" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -9,11 +9,11 @@ path = "src/main.rs"
[dependencies]
log = "0.4"
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
common = { path = "../../../../../local/sources/base/drivers/common" }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
@@ -9,14 +9,14 @@ path = "src/main.rs"
[dependencies]
log = "0.4"
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
xhcid = { path = "../../../../../local/sources/base/drivers/usb/xhcid" }
common = { path = "../../../../../local/sources/base/drivers/common" }
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
[target.'cfg(target_os = "redox")'.dependencies]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
[patch.crates-io]
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
@@ -13,10 +13,10 @@ dbus-nm = ["dep:zbus"]
[dependencies]
libc = "0.2"
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source" }
zbus = { version = "5", default-features = false, features = ["tokio"], optional = true }
@@ -24,5 +24,5 @@ zbus = { version = "5", default-features = false, features = ["tokio"], optional
redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source", features = ["redox"] }
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+3 -3
View File
@@ -9,7 +9,7 @@ path = "source/src/main.rs"
[dependencies]
libc = "0.2"
libredox = { path = "../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
@@ -9,10 +9,10 @@ path = "src/main.rs"
[dependencies]
libc = "0.2"
libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] }
libredox = { path = "../../../../../recipes/core/base/libredox", features = ["call", "std"] }
log = { version = "0.4", features = ["std"] }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
[patch.crates-io]
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
@@ -5,14 +5,14 @@ edition = "2021"
[dependencies]
libc = "0.2"
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
syscall = { path = "../../../../../local/sources/syscall", package = "redox_syscall", features = ["std"] }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
syscall = { path = "../../../../../recipes/core/base/syscall", package = "redox_syscall", features = ["std"] }
log = { version = "0.4", features = ["std"] }
thiserror = "2"
redbear-hwutils = { path = "../../redbear-hwutils/source" }
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
+5 -5
View File
@@ -76,7 +76,7 @@ suppaftp = { version = "6", optional = true }
tar = { version = "0.4", optional = true }
zip = { version = "2", default-features = false, optional = true }
redox_syscall = { path = "../../../../../local/sources/syscall" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
# Syntax highlighting
syntect = { version = "5", default-features = false, features = ["default-onig", "regex-onig"], optional = true }
@@ -148,9 +148,9 @@ assert_cmd = "2"
serde_yaml = "0.9"
[target.'cfg(target_os = "redox")'.dependencies]
libredox = { path = "../../../../../local/sources/libredox" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox_event = "0.4.6"
redox_syscall = { path = "../../../../../local/sources/syscall", features = ["std"] }
redox_syscall = { path = "../../../../../recipes/core/base/syscall", features = ["std"] }
redox_termios = "0.1.3"
[profile.release]
@@ -164,5 +164,5 @@ panic = "abort"
opt-level = 1
[patch.crates-io]
libredox = { path = "../../../../../local/sources/libredox" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
libredox = { path = "../../../../../recipes/core/base/libredox" }
redox_syscall = { path = "../../../../../recipes/core/base/syscall" }
Binary file not shown.