diff --git a/local/AGENTS.md b/local/AGENTS.md index 32dec2faf4..4412a2c36f 100644 --- a/local/AGENTS.md +++ b/local/AGENTS.md @@ -517,6 +517,21 @@ If we can fetch fresh upstream sources tomorrow, provision sources from `sources If a change exists only inside an upstream-owned `recipes/*/source/` tree, then it is **not yet preserved**, even if the current build happens to pass. +### Local fork recipe directories must not carry patch files + +When a recipe's `[source]` uses `path = ".../local/sources//"`, the local fork +**is** the patch. The recipe directory (`recipes/core//`) **MUST NOT** contain +`.patch` files or symlinks. Patch files from the pre-fork era must be applied as commits to +the `submodule/` branch (or, if kept for historical reference, archived under +`local/docs/archived/` or `local/patches/archived/` and never symlinked into a recipe +directory). Leaving patch files in a `path`-source recipe directory creates the false +impression that the build system applies them, which leads to exactly the kind of duplicate +fix work we just saw with `sem_open`. + +The cookbook **does not apply patches for `path` sources**. If a component needs patches, +it must use a `git` source pointing at a `submodule/` branch, or the patches +must be merged into the local fork branch. + ### GOLDEN RULE — Red Bear adapts to upstream, never the reverse **When upstream Redox changes a dependency version, API, or ABI, Red Bear adapts.** diff --git a/local/recipes/system/driver-manager/source/Cargo.toml b/local/recipes/system/driver-manager/source/Cargo.toml index 58077f495f..e00c8ef3e4 100644 --- a/local/recipes/system/driver-manager/source/Cargo.toml +++ b/local/recipes/system/driver-manager/source/Cargo.toml @@ -13,6 +13,7 @@ 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"] } log = "0.4" toml = "0.8" serde = { version = "1", features = ["derive"] } diff --git a/local/sources/bootloader b/local/sources/bootloader index e7bc6a56dc..6c3c312819 160000 --- a/local/sources/bootloader +++ b/local/sources/bootloader @@ -1 +1 @@ -Subproject commit e7bc6a56dcc7222b8349d2fbe0e5d422b4c71920 +Subproject commit 6c3c3128198f0fbac7364b03bb79dddebc45be3c diff --git a/local/sources/installer b/local/sources/installer index e604868baf..d90f84883e 160000 --- a/local/sources/installer +++ b/local/sources/installer @@ -1 +1 @@ -Subproject commit e604868baf05bbcc7615b3fef4523c5055db6b4c +Subproject commit d90f84883e410233749b620ba6e7f04d989eaed7 diff --git a/local/sources/kernel b/local/sources/kernel index 71f189ba04..1b22d324ab 160000 --- a/local/sources/kernel +++ b/local/sources/kernel @@ -1 +1 @@ -Subproject commit 71f189ba047ee6976ed71a7343409f46017109cd +Subproject commit 1b22d324abd8b5b4767a168c8f8789ef11d5e892 diff --git a/local/sources/libredox b/local/sources/libredox index 4a578129b2..d6fa513ca7 160000 --- a/local/sources/libredox +++ b/local/sources/libredox @@ -1 +1 @@ -Subproject commit 4a578129b2e5f6d676b5404f0343cf9d599b1292 +Subproject commit d6fa513ca7c46e0d2d83ad0f397ec4e937d22b5f diff --git a/local/sources/redoxfs b/local/sources/redoxfs index f29cbc3dfe..e6be9134d8 160000 --- a/local/sources/redoxfs +++ b/local/sources/redoxfs @@ -1 +1 @@ -Subproject commit f29cbc3dfecf81d5bf57eef6274a92ecd3f61ad9 +Subproject commit e6be9134d8395f9ec6dcd46cb972c3c48aabe532 diff --git a/local/sources/relibc b/local/sources/relibc index c81fe5fc98..3e4dbfbe7a 160000 --- a/local/sources/relibc +++ b/local/sources/relibc @@ -1 +1 @@ -Subproject commit c81fe5fc98090789af1d11823010cd627d854e31 +Subproject commit 3e4dbfbe7a0106239812dea5680968d903a46418 diff --git a/local/sources/userutils b/local/sources/userutils index e5c076b0ea..e913bacaa3 160000 --- a/local/sources/userutils +++ b/local/sources/userutils @@ -1 +1 @@ -Subproject commit e5c076b0ea6654c9ad16df7107921cea8bc90836 +Subproject commit e913bacaa33910a6ec3347cfb350d97c919a19e4