fix: redox-drm lockfile collisions + missing relibc ENOTTY import

- Add redox-scheme symlink in recipes/core/base/ to resolve path collision
  when daemon workspace resolves ../redox-scheme from the recipe copy location
- Remove redundant libredox direct dep from redox-drm Cargo.toml
  (arrives transitively through daemon; direct dep creates lockfile collision)
- Align redox-drm's redox-scheme path to recipes/core/base/redox-scheme
  symlink to match daemon's workspace resolution path
- Fix missing ENOTTY import in relibc src/header/sys_ioctl/redox/mod.rs
This commit is contained in:
2026-07-09 15:00:32 +03:00
parent db9814f323
commit eb6e74f2ee
3 changed files with 12 additions and 5 deletions
+10 -4
View File
@@ -7,10 +7,16 @@ description = "DRM scheme daemon for Redox OS — provides GPU modesetting and b
[dependencies]
redox-driver-sys = { version = "0.3", path = "../../../drivers/redox-driver-sys/source" }
linux-kpi = { version = "0.3", path = "../../../drivers/linux-kpi/source" }
libredox = { path = "../../../../../local/sources/libredox" }
# libredox arrives transitively through daemon; keeping a direct dep
# here would collide with daemon's workspace resolution path
# (recipes/core/base/libredox symlink). The redox-drm source does not
# use libredox directly — it's only needed as a transitive dependency.
redox_syscall = { path = "../../../../../local/sources/syscall", features = ["std"] }
syscall04 = { package = "redox_syscall", version = "0.4" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
# Use the recipe-location symlink path to match daemon's workspace
# resolution, avoiding lockfile collision between
# local/sources/redox-scheme and recipes/core/base/redox-scheme
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
daemon = { path = "../../../../../recipes/core/base/source/daemon" }
log = "0.4"
thiserror = "2"
@@ -20,6 +26,6 @@ getrandom = "0.2"
[patch.crates-io]
redox-driver-sys = { path = "../../../drivers/redox-driver-sys/source" }
linux-kpi = { path = "../../../drivers/linux-kpi/source" }
libredox = { path = "../../../../../local/sources/libredox" }
redox-scheme = { path = "../../../../../local/sources/redox-scheme" }
# libredox omitted — resolved through daemon workspace transitive dep
redox-scheme = { path = "../../../../../recipes/core/base/redox-scheme" }
redox_syscall = { path = "../../../../../local/sources/syscall" }
+1
View File
@@ -0,0 +1 @@
../../../local/sources/redox-scheme