From 19d39068cff2cbbbb417181e7b3b7dfb67ff1070 Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Tue, 21 Apr 2026 16:15:17 +0100
Subject: [PATCH] Expose USB tools in base runtime surfaces

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 local/scripts/test-xhci-device-lifecycle-qemu.sh | 9 ++++-----
 recipes/core/base-initfs/recipe.toml             | 4 +++-
 recipes/core/base/recipe.toml                    | 8 +++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/local/scripts/test-xhci-device-lifecycle-qemu.sh b/local/scripts/test-xhci-device-lifecycle-qemu.sh
index 78e5c637..b6bdced3 100755
--- a/local/scripts/test-xhci-device-lifecycle-qemu.sh
+++ b/local/scripts/test-xhci-device-lifecycle-qemu.sh
@@ -114,7 +114,7 @@ sleep 1
 rm -f "$log_file"
 
 expect <<EOF
-log_user 0
+log_user 1
 log_file -noappend $log_file
 set timeout 1800
 set send_slow {1 0.0}
@@ -125,6 +125,7 @@ send "root\r"
 expect "assword:"
 send "password\r"
 expect -re {Type 'help' for available commands\.}
+expect -re {# }
 
 send "rm -f /tmp/xhcid-test-hook\r"
 after 500
@@ -142,10 +143,8 @@ expect -re {Device on port [0-9\.]+ was attached}
 send "\r"
 expect -re {# }
 set hid_scheme "usb.pci-0000-00-01.0_xhci"
-send "H=/tmp/xhcid-test-hook\r"
-expect -re {# }
-send "P=/scheme/\$hid_scheme/port\$hid_port\r"
-expect -re {# }
+set H "/tmp/xhcid-test-hook"
+set P "/scheme/\$hid_scheme/port\$hid_port"
 
 send "echo x > \$P/suspend\r"
 expect -re {xhcid: suspended port [0-9\.]+}
diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml
index 994ee136..4428ef9f 100644
--- a/recipes/core/base-initfs/recipe.toml
+++ b/recipes/core/base-initfs/recipe.toml
@@ -5,6 +5,7 @@ same_as = "../base"
 template = "custom"
 dependencies = [
   "redoxfs",
+  "ion",
 ]
 script = """
 BINS=(
@@ -34,7 +35,7 @@ virt_bins()
 
 x86_common_bins()
 {
-    BINS+=(ahcid ided ps2d vesad)
+    BINS+=(ahcid ehcid ohcid uhcid ided ps2d usbhidd usbscsid usbhubd xhcid vesad)
     virt_bins
 }
 
@@ -93,6 +94,7 @@ do
 done
 
 cp "${COOKBOOK_SYSROOT}/usr/bin/redoxfs" "${COOKBOOK_BUILD}/initfs/bin"
+cp "${COOKBOOK_SYSROOT}/usr/bin/ion" "${COOKBOOK_BUILD}/initfs/bin"
 
 ARCH="$(echo "${GNU_TARGET}" | cut -d - -f1)"
 RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static -Clink-arg=-nostartfiles -Clink-arg=-nostdlib" cargo \
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index cb175a02..54e7f437 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -21,7 +21,10 @@ done
     --target "${TARGET}" \
     ${build_flags}
 cp -v \
-    "target/${TARGET}/${build_type}/smolnetd" \
+    "target/${TARGET}/${build_type}/netstack" \
+    "${COOKBOOK_STAGE}/usr/bin/netstack"
+cp -v \
+    "target/${TARGET}/${build_type}/netstack" \
     "${COOKBOOK_STAGE}/usr/bin/smolnetd"
 
 # Drivers that are built on all architectures, and NOT in drivers-initfs
@@ -34,6 +37,9 @@ BINS=(
     pcid-spawner
     rtl8139d
     rtl8168d
+    ehcid
+    ohcid
+    uhcid
     usbctl
     usbhidd
     usbhubd