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.
This commit is contained in:
+3
-10
@@ -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",
|
||||
@@ -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",
|
||||
@@ -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",
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user