From 68860e07af8906ab5380a6a36061bd56570d3fee Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Sun, 5 Jul 2026 11:56:18 +0200
Subject: [PATCH] xiaomi-polaris: remove nonfree-firmware subpackage

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8845>
---
 device/testing/device-xiaomi-polaris/APKBUILD | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/device/testing/device-xiaomi-polaris/APKBUILD b/device/testing/device-xiaomi-polaris/APKBUILD
index 767567958..007f7d864 100644
--- a/device/testing/device-xiaomi-polaris/APKBUILD
+++ b/device/testing/device-xiaomi-polaris/APKBUILD
@@ -3,18 +3,21 @@
 maintainer="Molly Sophia <mollysophia379@gmail.com>"
 pkgname=device-xiaomi-polaris
 pkgdesc="Xiaomi Mi Mix 2S"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-ucm-conf-sdm845
+	firmware-xiaomi-polaris
+	firmware-xiaomi-polaris-initramfs
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	alsa-ucm-conf-sdm845
 	soc-qcom
+	soc-qcom-modem
 "
 makedepends="devicepkg-dev"
 source="
@@ -23,10 +26,7 @@ source="
 	modules-initfs
 	phoc.ini
 "
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
-"
+subpackages="$pkgname-phosh"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -36,16 +36,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="
-		firmware-xiaomi-polaris
-		firmware-xiaomi-polaris-initramfs
-		soc-qcom-modem
-	"
-	mkdir "$subpkgdir"
-}
-
 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	replaces="phosh"