From 74bdc1bc805c564afedb8a7ad52518e5ef020a56 Mon Sep 17 00:00:00 2001 From: vasilito Date: Thu, 9 Jul 2026 15:25:53 +0300 Subject: [PATCH] fix: align redox-driver-sys + linux-kpi path deps to recipes/core/base/ symlinks All local fork deps (libredox, redox_syscall, redox-scheme) now consistently resolve through recipes/core/base/ symlinks, matching daemon workspace resolution. Eliminates lockfile collision between local/sources/ and recipes/core/base/ paths. --- local/recipes/drivers/linux-kpi/source/Cargo.toml | 8 ++++---- local/recipes/drivers/redox-driver-sys/source/Cargo.toml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/local/recipes/drivers/linux-kpi/source/Cargo.toml b/local/recipes/drivers/linux-kpi/source/Cargo.toml index 4ac2cf1e92..14a0a1e403 100644 --- a/local/recipes/drivers/linux-kpi/source/Cargo.toml +++ b/local/recipes/drivers/linux-kpi/source/Cargo.toml @@ -6,8 +6,8 @@ description = "Linux Kernel API compatibility layer for Redox OS (LinuxKPI-style license = "MIT" [dependencies] -libredox = { path = "../../../../../local/sources/libredox" } -redox_syscall = { path = "../../../../../local/sources/syscall", features = ["std"] } +libredox = { path = "../../../../../recipes/core/base/libredox" } +redox_syscall = { path = "../../../../../recipes/core/base/syscall", features = ["std"] } log = "0.4" thiserror = "2" lazy_static = "1.4" @@ -17,5 +17,5 @@ redox-driver-sys = { path = "../../redox-driver-sys/source" } crate-type = ["rlib", "staticlib"] [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" } diff --git a/local/recipes/drivers/redox-driver-sys/source/Cargo.toml b/local/recipes/drivers/redox-driver-sys/source/Cargo.toml index 628008dc20..2a1af1bc06 100644 --- a/local/recipes/drivers/redox-driver-sys/source/Cargo.toml +++ b/local/recipes/drivers/redox-driver-sys/source/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" description = "Safe Rust wrappers for Redox OS scheme-based hardware access" [dependencies] -libredox = { path = "../../../../../local/sources/libredox" } -redox_syscall = { path = "../../../../../local/sources/syscall", features = ["std"] } +libredox = { path = "../../../../../recipes/core/base/libredox" } +redox_syscall = { path = "../../../../../recipes/core/base/syscall", features = ["std"] } log = "0.4" thiserror = "2" bitflags = "2" @@ -30,5 +30,5 @@ harness = false required-features = ["redox"] [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" }