From 95b4c5ecfd869beb0f8f05075da02b95d3b430d9 Mon Sep 17 00:00:00 2001
From: vasilito <adminpupkin@gmail.com>
Date: Thu, 18 Jun 2026 10:18:14 +0300
Subject: [PATCH] fix(base): clean up workspace patches; only
 add-missing-drivers needed

Earlier we over-included workspace patches. After closer inspection:

- Upstream Cargo.toml ALREADY has `exclude = ["bootstrap"]` at the end
  of the workspace members list (line 72). No need to add another.
- Upstream bootstrap/Cargo.toml ALREADY has `[workspace]` declaration.
  No need to add another.

The only real gap was the missing driver members (i2c, gpio, intel-thc-hidd,
acpi-resource, amlserde, thermald, ucsid). The P0-add-missing-driver-members.patch
fixes that alone.

Removed the redundant P0-bootstrap-workspace-{fix,exclude,standalone} patches.
---
 ...ch => P0-add-missing-driver-members.patch} | 13 +++---------
 .../base/P0-bootstrap-workspace-fix.patch     | 21 -------------------
 .../P0-bootstrap-workspace-standalone.patch   | 11 ----------
 recipes/core/base/recipe.toml                 |  3 +--
 4 files changed, 4 insertions(+), 44 deletions(-)
 rename local/patches/base/{P0-bootstrap-workspace-exclude.patch => P0-add-missing-driver-members.patch} (78%)
 delete mode 100644 local/patches/base/P0-bootstrap-workspace-fix.patch
 delete mode 100644 local/patches/base/P0-bootstrap-workspace-standalone.patch

diff --git a/local/patches/base/P0-bootstrap-workspace-exclude.patch b/local/patches/base/P0-add-missing-driver-members.patch
similarity index 78%
rename from local/patches/base/P0-bootstrap-workspace-exclude.patch
rename to local/patches/base/P0-add-missing-driver-members.patch
index ae9fc381d9..4e67a60028 100644
--- a/local/patches/base/P0-bootstrap-workspace-exclude.patch
+++ b/local/patches/base/P0-add-missing-driver-members.patch
@@ -1,15 +1,8 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 9e776232..b0fc8ec0 100644
+index 9e776232..69b0f147 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -1,5 +1,6 @@
- [workspace]
- resolver = "2"
-+exclude = ["bootstrap"]
- members = [
-     "audiod",
-     "config",
-@@ -44,6 +45,21 @@ members = [
+@@ -44,6 +44,21 @@ members = [
  
      "drivers/input/ps2d",
      "drivers/input/usbhidd",
@@ -31,7 +24,7 @@ index 9e776232..b0fc8ec0 100644
  
      "drivers/net/driver-network",
      "drivers/net/e1000d",
-@@ -66,6 +82,7 @@ members = [
+@@ -66,6 +81,7 @@ members = [
      "drivers/usb/xhcid",
      "drivers/usb/usbctl",
      "drivers/usb/usbhubd",
diff --git a/local/patches/base/P0-bootstrap-workspace-fix.patch b/local/patches/base/P0-bootstrap-workspace-fix.patch
deleted file mode 100644
index 803d9d3bd9..0000000000
--- a/local/patches/base/P0-bootstrap-workspace-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -2,6 +2,7 @@
- resolver = "2"
-+exclude = ["bootstrap"]
- members = [
-     "audiod",
--    "bootstrap",
-     "config",
-     "daemon",
---- a/bootstrap/Cargo.toml
-+++ b/bootstrap/Cargo.toml
-@@ -6,6 +6,8 @@
- edition = "2024"
- license = "MIT"
- 
-+[workspace]
-+
- [dependencies]
- hashbrown = { version = "0.15", default-features = false, features = [
-     "inline-more",
diff --git a/local/patches/base/P0-bootstrap-workspace-standalone.patch b/local/patches/base/P0-bootstrap-workspace-standalone.patch
deleted file mode 100644
index 1e9cd486fd..0000000000
--- a/local/patches/base/P0-bootstrap-workspace-standalone.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bootstrap/Cargo.toml
-+++ b/bootstrap/Cargo.toml
-@@ -6,6 +6,8 @@
- edition = "2024"
- license = "MIT"
- 
-+[workspace]
-+
- [dependencies]
- hashbrown = { version = "0.15", default-features = false, features = [
-     "inline-more",
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index 2169b2014e..d3de79d3e5 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -4,8 +4,7 @@ rev = "463f76b9608a896e6f6c9f63457f57f6409873c7"
 patches = [
     "P0-daemon-schemedaemon-option-unwrap.patch",
     "P0-redox-scheme-bump-0.11.1.patch",
-    "P0-bootstrap-workspace-exclude.patch",
-    "P0-bootstrap-workspace-standalone.patch",
+    "P0-add-missing-driver-members.patch",
     "P0-init-continuous-scheduling.patch",
     "P0-dhcpd-auto-iface.patch",
     "P0-procmgr-sigchld-debug.patch",