From 7bbad72dad61938663719e64e7eaf60cad9456b0 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Sat, 29 Aug 2026 12:45:58 +0200
Subject: [PATCH] device-samsung-milletwifi: adopt and move to testing

Update modules-initfs while we're at it to provide everything we need
for debug-shell and USB setup during initramfs.

Remove the nonfree-firmware subpackage since we don't use those anymore.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9451>
---
 .../device-samsung-milletwifi/modules-initfs  |  2 --
 .../device-samsung-milletwifi/APKBUILD        | 19 +++++++------------
 .../device-samsung-milletwifi/deviceinfo      |  0
 .../kernel-cmdline.conf                       |  0
 .../device-samsung-milletwifi/modules-initfs  |  3 +++
 5 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 device/archived/device-samsung-milletwifi/modules-initfs
 rename device/{archived => testing}/device-samsung-milletwifi/APKBUILD (66%)
 rename device/{archived => testing}/device-samsung-milletwifi/deviceinfo (100%)
 rename device/{archived => testing}/device-samsung-milletwifi/kernel-cmdline.conf (100%)
 create mode 100644 device/testing/device-samsung-milletwifi/modules-initfs

diff --git a/device/archived/device-samsung-milletwifi/modules-initfs b/device/archived/device-samsung-milletwifi/modules-initfs
deleted file mode 100644
index 20ce930c0..000000000
--- a/device/archived/device-samsung-milletwifi/modules-initfs
+++ /dev/null
@@ -1,2 +0,0 @@
-mms114
-msm
diff --git a/device/archived/device-samsung-milletwifi/APKBUILD b/device/testing/device-samsung-milletwifi/APKBUILD
similarity index 66%
rename from device/archived/device-samsung-milletwifi/APKBUILD
rename to device/testing/device-samsung-milletwifi/APKBUILD
index c196812bc..c505f2d72 100644
--- a/device/archived/device-samsung-milletwifi/APKBUILD
+++ b/device/testing/device-samsung-milletwifi/APKBUILD
@@ -1,23 +1,24 @@
-# Archived: unmaintained
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
+maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-samsung-milletwifi
 pkgdesc="Samsung Galaxy Tab 4 8.0 Wi-Fi"
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
+	firmware-samsung-milletwifi-wcnss-nv
 	linux-postmarketos-qcom-msm8226
 	mkbootimg
+	msm-firmware-loader
+	msm-modem
 	postmarketos-base
 	soc-qcom-msm8226
 	"
 makedepends="devicepkg-dev"
 source="deviceinfo kernel-cmdline.conf modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -27,14 +28,8 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
-	depends="firmware-samsung-milletwifi-wcnss-nv msm-firmware-loader msm-modem"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 4edf64a78b451bbc24b4329f67a3951b781ce6206d68b7036317ca6e8842b0529ca74aa8437d2553d51e4c761e5955201a177757a50de24d907ea933adf9d9b0  deviceinfo
 a721d179181806fe39d26f48b2a1fe2e01fc6e775ad51c48739504e6221eab1a0c63e27b0753af0092131ca2b33c0cc042d743b2bcd842ea1ffbab1d81f6c7f1  kernel-cmdline.conf
-566fbcbd958c465fa546068095c51678b6635a247dd7ef1d6c7f4c5fd527a21f41ed4daf8f63a1342433f150d3437b102e523bfa63d17ff64a0ebe48eb7b9ae6  modules-initfs
+82f92c20fe49bd772da5d23e6bd09a3139df558329d76eb5f23e833ce077ec924e1b87ddeb52f7a6e6a1eed36646150a52bf493fb4be4c75ff2951070f97cf4c  modules-initfs
 "
diff --git a/device/archived/device-samsung-milletwifi/deviceinfo b/device/testing/device-samsung-milletwifi/deviceinfo
similarity index 100%
rename from device/archived/device-samsung-milletwifi/deviceinfo
rename to device/testing/device-samsung-milletwifi/deviceinfo
diff --git a/device/archived/device-samsung-milletwifi/kernel-cmdline.conf b/device/testing/device-samsung-milletwifi/kernel-cmdline.conf
similarity index 100%
rename from device/archived/device-samsung-milletwifi/kernel-cmdline.conf
rename to device/testing/device-samsung-milletwifi/kernel-cmdline.conf
diff --git a/device/testing/device-samsung-milletwifi/modules-initfs b/device/testing/device-samsung-milletwifi/modules-initfs
new file mode 100644
index 000000000..ccad2bee0
--- /dev/null
+++ b/device/testing/device-samsung-milletwifi/modules-initfs
@@ -0,0 +1,3 @@
+extcon_sm5502
+mms114
+simpledrm