fix(base): comprehensive workspace fix (exclude bootstrap + add missing drivers)

The base build was failing with:

  error: package ID specification `amd-mp2-i2cd` did not match any packages
  error: package ID specification `dw-acpi-i2cd` did not match any packages
  ... (15+ missing drivers)

because the upstream base Cargo.toml workspace members list is missing
drivers that the recipe's BINS list tries to build (e1000d-rtl8139d
succeeded but amd-mp2-i2cd, i2c-*, gpio-*, intel-thc-hidd, ucsid, etc.
failed). Earlier Red Bear session must have had a more comprehensive
patch.

The new P0-bootstrap-workspace-exclude.patch:
- Adds `exclude = ["bootstrap"]` to the parent workspace
- Adds missing drivers to members: i2c/*, gpio/*, input/i2c-hidd,
  input/intel-thc-hidd, acpi-resource, amlserde, thermald, usb/ucsid

The new P0-bootstrap-workspace-standalone.patch:
- Adds `[workspace]` to bootstrap/Cargo.toml so it can be standalone
  (matches the parent workspace's exclude)
This commit is contained in:
2026-06-18 10:13:16 +03:00
parent d86bcb24af
commit 87f932c48a
6 changed files with 75 additions and 14 deletions
@@ -0,0 +1,41 @@
diff --git a/Cargo.toml b/Cargo.toml
index 9e776232..b0fc8ec0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
[workspace]
resolver = "2"
+exclude = ["bootstrap"]
members = [
"audiod",
"config",
@@ -44,6 +45,21 @@ members = [
"drivers/input/ps2d",
"drivers/input/usbhidd",
+ "drivers/input/i2c-hidd",
+ "drivers/input/intel-thc-hidd",
+
+ "drivers/i2c/i2c-interface",
+ "drivers/i2c/i2cd",
+ "drivers/i2c/amd-mp2-i2cd",
+ "drivers/i2c/dw-acpi-i2cd",
+ "drivers/i2c/intel-lpss-i2cd",
+ "drivers/gpio/gpiod",
+ "drivers/gpio/intel-gpiod",
+ "drivers/gpio/i2c-gpio-expanderd",
+
+ "drivers/acpi-resource",
+ "drivers/amlserde",
+ "drivers/thermald",
"drivers/net/driver-network",
"drivers/net/e1000d",
@@ -66,6 +82,7 @@ members = [
"drivers/usb/xhcid",
"drivers/usb/usbctl",
"drivers/usb/usbhubd",
+ "drivers/usb/ucsid",
]
# Bootstrap needs it's own profile configuration
@@ -0,0 +1,21 @@
--- 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",
@@ -0,0 +1,11 @@
--- 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",
@@ -1,12 +0,0 @@
diff --git a/Cargo.toml b/Cargo.toml
index 9e776232..acdb1c97 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
resolver = "2"
members = [
"audiod",
+ "bootstrap",
"config",
"daemon",
"dhcpd",
@@ -1 +0,0 @@
../../../local/patches/base/P0-workspace-add-bootstrap.patch
+2 -1
View File
@@ -4,7 +4,8 @@ rev = "463f76b9608a896e6f6c9f63457f57f6409873c7"
patches = [
"P0-daemon-schemedaemon-option-unwrap.patch",
"P0-redox-scheme-bump-0.11.1.patch",
"P0-workspace-add-bootstrap.patch",
"P0-bootstrap-workspace-exclude.patch",
"P0-bootstrap-workspace-standalone.patch",
"P0-init-continuous-scheduling.patch",
"P0-dhcpd-auto-iface.patch",
"P0-procmgr-sigchld-debug.patch",