From 333ba1f2ce5b5cdfe52ba8ce2a161afdd437d474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= <duje@dujemihanovic.xyz>
Date: Thu, 9 Apr 2026 19:20:54 +0200
Subject: [PATCH] firmware-samsung-pxa1908: install all firmware files
 unconditionally
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It has been found that the calibration files, while not mandatory, could
be useful with the mainline mwifiex driver as well. Install those on
mainline as well and leave the -downstream subpackage as a stub for
-downstream-openrc.

Also, switch from installing the firmware to /usr/lib instead of /lib to
suppress warnings.

Signed-off-by: Duje Mihanović <duje@dujemihanovic.xyz>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8311>
---
 .../firmware-samsung-pxa1908/APKBUILD         | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/device/community/firmware-samsung-pxa1908/APKBUILD b/device/community/firmware-samsung-pxa1908/APKBUILD
index e13559a37..b28bb45ce 100644
--- a/device/community/firmware-samsung-pxa1908/APKBUILD
+++ b/device/community/firmware-samsung-pxa1908/APKBUILD
@@ -1,7 +1,7 @@
 maintainer="Duje Mihanović <duje@dujemihanovic.xyz>"
 pkgname=firmware-samsung-pxa1908
-pkgver=2
-pkgrel=6
+pkgver=3
+pkgrel=0
 pkgdesc="Firmware for Samsung PXA1908 devices"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -13,8 +13,7 @@ source="
 	$pkgname-$_commit.tar.gz::https://github.com/xcover3/$_repo/archive/$_commit.tar.gz
 	sd8x-wlan.initd
 "
-_fw_file="sd8777_uapsta.bin"
-_misc_files="WlanCalData_ext.conf txpwrlimit_cfg.bin bt_cal_data.conf"
+_fw_files="sd8777_uapsta.bin WlanCalData_ext.conf txpwrlimit_cfg.bin bt_cal_data.conf"
 builddir="$srcdir/$_repo-$_commit"
 install="$pkgname-downstream-openrc.post-install"
 subpackages="
@@ -23,23 +22,18 @@ subpackages="
 	"
 
 package() {
-	cd proprietary/etc/firmware/mrvl/
-
-	install -Dm644 "$_fw_file" \
-		-t "$pkgdir/lib/firmware/postmarketos/mrvl"
+	cd "$builddir"/proprietary/etc/firmware/mrvl/
+	for _i in $_fw_files; do
+		install -Dm644 "$_i" \
+			-t "$pkgdir/usr/lib/firmware/postmarketos/mrvl"
+	done
 }
 
 downstream() {
-	pkgdesc="Extra firmware files needed by downstream driver"
+	pkgdesc="Stub to pull service for enabling WLAN"
 	depends="$pkgname"
 
 	mkdir "$subpkgdir"
-
-	cd "$builddir"/proprietary/etc/firmware/mrvl/
-	for _i in $_misc_files; do
-		install -Dm644 "$_i" \
-			-t "$subpkgdir/lib/firmware/postmarketos/mrvl"
-	done
 }
 
 downstream_openrc() {