From 7f8d0302b7673eaa1c47cbf8b11680ba24d4b5ed Mon Sep 17 00:00:00 2001
From: mia <mia@grr.llc>
Date: Tue, 30 Jun 2026 19:58:23 -0400
Subject: [PATCH] kernel pkg: bundle ps5-stage-firmware service + modprobe.d
 (fixes wifi)

---
 docker/kernel-builder-arch/build.sh  | 8 ++++++++
 docker/kernel-builder/package-deb.sh | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/docker/kernel-builder-arch/build.sh b/docker/kernel-builder-arch/build.sh
index e3c2193..0fb9670 100644
--- a/docker/kernel-builder-arch/build.sh
+++ b/docker/kernel-builder-arch/build.sh
@@ -28,6 +28,14 @@ cp /out/staging/.config      "$STAGING/boot/config-$KVER"
 mkdir -p "$STAGING/usr/lib/modules"
 cp -a "/out/staging/lib/modules/$KVER" "$STAGING/usr/lib/modules/"
 
+# Userspace bits the kernel-builder staged at /out/staging/{etc,usr/local}:
+# ps5-stage-firmware service + script (bridges nxp blob from /boot/efi),
+# ps5-iw620 modprobe.d options. Without these the WLAN driver loads but
+# request_firmware() returns -2 and wlan_pcie probe fails.
+for d in etc usr/local; do
+    [ -d "/out/staging/$d" ] && { mkdir -p "$STAGING/$d"; cp -a "/out/staging/$d/." "$STAGING/$d/"; }
+done
+
 # Kernel headers (for out-of-tree module builds)
 if [ -d /out/staging/headers ]; then
     # UAPI headers (/usr/include/linux/, /usr/include/asm/, etc.)
diff --git a/docker/kernel-builder/package-deb.sh b/docker/kernel-builder/package-deb.sh
index 29b96cb..586cc00 100755
--- a/docker/kernel-builder/package-deb.sh
+++ b/docker/kernel-builder/package-deb.sh
@@ -18,6 +18,14 @@ cp "$STAGING/System.map"    "$PKG/boot/System.map-$KVER"
 cp "$STAGING/.config"       "$PKG/boot/config-$KVER"
 cp -a "$STAGING/lib/modules/$KVER" "$PKG/lib/modules/"
 
+# Userspace bits the kernel-builder staged at /out/staging/{etc,usr/local}:
+# ps5-stage-firmware service + script (bridges nxp blob from /boot/efi),
+# ps5-iw620 modprobe.d options. Without these the WLAN driver loads but
+# request_firmware() returns -2 and wlan_pcie probe fails.
+for d in etc usr/local; do
+    [ -d "$STAGING/$d" ] && { mkdir -p "$PKG/$d"; cp -a "$STAGING/$d/." "$PKG/$d/"; }
+done
+
 # Kernel headers (for out-of-tree module builds)
 if [ -d "$STAGING/headers" ]; then
     # $PKG/usr may already exist from other staged files, so merge contents