From f8d87fa6aa7487cbb88b722c85969c61dd3481d1 Mon Sep 17 00:00:00 2001
From: Nikita Travkin <nikita@trvn.ru>
Date: Tue, 4 Aug 2026 19:11:41 +0500
Subject: [PATCH] firmware-qcom-db410c: Install firmware to /usr/lib/firmware

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9238>
---
 device/testing/firmware-qcom-db410c-wcnss/APKBUILD | 14 +++++++-------
 device/testing/firmware-qcom-db410c/APKBUILD       |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/device/testing/firmware-qcom-db410c-wcnss/APKBUILD b/device/testing/firmware-qcom-db410c-wcnss/APKBUILD
index 6d1910ba0..18537fd8a 100644
--- a/device/testing/firmware-qcom-db410c-wcnss/APKBUILD
+++ b/device/testing/firmware-qcom-db410c-wcnss/APKBUILD
@@ -1,21 +1,21 @@
 maintainer="Nikita Travkin <nikita@trvn.ru>"
 pkgname=firmware-qcom-db410c-wcnss
 pkgver=1034.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc="DragonBoard 410c WiFi/BT firmware"
-url="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/"
+url="https://builds.96boards.org/dragonboard410c/qualcomm/firmware/"
 subpackages="$pkgname-doc"
 arch="aarch64 armv7"
 license="custom"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 makedepends="mtools pil-squasher"
-source="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r$pkgver.zip"
+source="https://builds.96boards.org/dragonboard410c/qualcomm/firmware/linux-board-support-package-r$pkgver.zip"
 builddir="$srcdir/linux-board-support-package-r$pkgver"
 
 # This package is a replacement for linux-firmware-qcom (packaging only necessary
 # firmware plus some missing ones), so it's packaged in /qcom, not /postmarketos.
 replaces="linux-firmware-qcom"
-_fwdir="/lib/firmware/qcom"
+_fwdir="/usr/lib/firmware/qcom"
 
 unpack() {
 	default_unpack
@@ -40,9 +40,9 @@ package() {
 	install -Dm644 "$builddir"/wcnss.mbn -t "$pkgdir/$_fwdir"/apq8016/
 
 	# Still link to old location in case this is installed on other devices
-	mkdir -p "$pkgdir"/lib/firmware/postmarketos
-	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/lib/firmware/postmarketos/wcnss.mbn
-	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/lib/firmware/postmarketos/wcnss.mdt
+	mkdir -p "$pkgdir"/usr/lib/firmware/postmarketos
+	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/usr/lib/firmware/postmarketos/wcnss.mbn
+	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/usr/lib/firmware/postmarketos/wcnss.mdt
 }
 
 sha512sums="4b5d0250552ff3b0a55af9395e62064299a1240f22a5f50383de95723db964351412fa2b38f24fe73fdeb613366e0eb6b3c335600c238546db783ca84647e2d2  linux-board-support-package-r1034.2.1.zip"
diff --git a/device/testing/firmware-qcom-db410c/APKBUILD b/device/testing/firmware-qcom-db410c/APKBUILD
index a7ddf5139..2a65d22bd 100644
--- a/device/testing/firmware-qcom-db410c/APKBUILD
+++ b/device/testing/firmware-qcom-db410c/APKBUILD
@@ -1,9 +1,9 @@
 maintainer="Nikita Travkin <nikita@trvn.ru>"
 pkgname=firmware-qcom-db410c
 pkgver=1036.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Firmware for DragonBoard 410c"
-url="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/"
+url="https://builds.96boards.org/dragonboard410c/qualcomm/firmware/"
 subpackages="
 	$pkgname-doc
 	$pkgname-wcnss-nv:wcnss_nv
@@ -14,13 +14,13 @@ arch="aarch64 armv7"
 license="custom"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 makedepends="mtools pil-squasher"
-source="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r$pkgver.zip"
+source="https://builds.96boards.org/dragonboard410c/qualcomm/firmware/linux-board-support-package-r$pkgver.zip"
 builddir="$srcdir/linux-board-support-package-r$pkgver"
 
 # This package is a replacement for linux-firmware-qcom (packaging only necessary
 # firmware plus some missing ones), so it's packaged in /qcom, not /postmarketos.
 replaces="linux-firmware-qcom"
-_fwdir="/lib/firmware/qcom"
+_fwdir="/usr/lib/firmware/qcom"
 
 unpack() {
 	default_unpack