device/community/device-google-sargo/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=6
-pkgrel=3
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -48,7 +48,6 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
-	replaces="hexagonrpcd-openrc"
 	depends="
 		firmware-google-sargo
 		hexagonrpcd
@@ -64,10 +63,12 @@ nonfree_firmware() {
 }
 
 nonfree_firmware_openrc() {
+	replaces="hexagonrpcd-openrc"
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	# Enable HexagonRPCD by default, but not if the user installed this
 	# package then disabled it.
 	install="$subpkgname.post-install"
+	replaces="hexagonrpcd-openrc"
 	# The FastRPC service is only enabled when non-free firmware is installed.
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
 		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh

device/community/device-xiaomi-beryllium/APKBUILD

 # Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
-
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=11
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -48,7 +47,6 @@ nonfree_firmware() {
 		soc-qcom-sdm845-modem
 		hexagonrpcd
 	"
-	replaces="hexagonrpcd-openrc"
 	mkdir "$subpkgdir"
 
 	install -Dm644 81-libssc-xiaomi-beryllium.rules \
@@ -58,6 +56,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	replaces="hexagonrpcd-openrc"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

device/community/firmware-xiaomi-daisy/APKBUILD

 # Maintainer: Alejandro Tafalla <alikates@dnyon.com>
 pkgname=firmware-xiaomi-daisy
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware files for Xiaomi Mi A2 Lite"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -12,7 +12,7 @@ source="$pkgname-$_commit.tar.gz::https://github.com/alikates/firmware-xiaomi-da
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 builddir="$srcdir/firmware-xiaomi-daisy-$_commit/gpu"
 
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware/qcom/msm8953/xiaomi/daisy"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-markw/APKBUILD

@@ -2,7 +2,7 @@
 
 pkgname=firmware-xiaomi-markw
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware files for Xiaomi Redmi 4 Prime (markw)"
 url="https://gitlab.com/vipaoL/firmware-xiaomi-markw"
 arch="aarch64"
@@ -13,7 +13,7 @@ _commit="8cc7f7d9e56aa9fa0193403b694115d759eafaf2"
 
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware/qcom/msm8953/xiaomi/markw"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-mido/APKBUILD

 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-xiaomi-mido
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Xiaomi Redmi Note 4X"
 url="https://github.com/Kiciuk/proprietary_firmware_mido"
 arch="aarch64"
@@ -11,7 +11,7 @@ _commit="bc001cbb255a0ded2b58af07b93f712cd9322483"
 source="https://github.com/Kiciuk/proprietary_firmware_mido/archive/$_commit.zip"
 builddir="$srcdir/proprietary_firmware_mido-$_commit/apnhlos"
 
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware/qcom/msm8953/xiaomi/mido"
 
 package() {
 	# GPU firmware

device/community/firmware-xiaomi-tissot/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=firmware-xiaomi-tissot
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware files for Xiaomi Mi A1"
 url="https://gitlab.com/jiaxyga/firmware-xiaomi-tissot"
 arch="aarch64"
@@ -14,7 +14,7 @@ _commit="bf686895224cae33c2130932b4a5914fea415287"
 
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware/qcom/msm8953/xiaomi/tissot"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-vince/APKBUILD

 # Maintainer: m0rf30 <morf3089@gmail.com>
 pkgname=firmware-xiaomi-vince
 pkgver=4
-pkgrel=1
+pkgrel=2
 _commit="9acb58a25d66314700eeea15c69c4571154f19cc"
 pkgdesc="Firmware files for Xiaomi Redmi 5 Plus"
 url="https://postmarketos.org"
@@ -10,7 +10,7 @@ license="proprietary"
 source="vince-fw-$_commit.tar.gz::https://github.com/M0Rf30/postmarketos-vendor-xiaomi-vince/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 builddir="$srcdir/postmarketos-vendor-xiaomi-vince-$_commit/gpu"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware/qcom/msm8953/xiaomi/vince"
 
 package() {
 	# GPU firmwares

device/community/firmware-xiaomi-ysl/APKBUILD

 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-xiaomi-ysl
 pkgver=3
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware files for Xiaomi Redmi S2/Y2"
 url="https://gitlab.com/barni2000/$pkgname"
 arch="aarch64"
@@ -13,7 +13,7 @@ _commit="ccfd274b825aec2d80e834b16499a6d9ba96c3f5"
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
 
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware/qcom/msm8953/xiaomi/ysl"
 
 package() {
 	# GPU Firmware files

device/community/linux-google-veyron/APKBUILD

 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
 pkgver=6.1.39
-pkgrel=4
+pkgrel=5
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {
 
 sha512sums="
 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-3251546c093d41c3cd832d864a5f24b0de6da1e8ab2856bc7b168d450c450d66c82a141c0c4550ed124a3cf59745bdaef28eab6cef220e3fa8295889d222e1d3  config-google-veyron.armv7
+b41e30f8c2364b8945f899d47246ac84d8e55379dce1e8196753d2c07ea66453f1399e119ed8eafa546b7aa5090b1bf0a6ab5319bc7a248c8c8525bafa341a25  config-google-veyron.armv7
 2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
 b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
 b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch

device/community/linux-google-veyron/config-google-veyron.armv7

@@ -34,9 +34,9 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_INIT=""

device/community/linux-postmarketos-qcom-msm8953/APKBUILD

@@ -5,7 +5,7 @@
 
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.11.1
+pkgver=6.11.6
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -27,7 +27,7 @@ makedepends="
 	python3
 "
 
-_tag="$pkgver-r0"
+_tag="$pkgver-r1"
 
 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -61,6 +61,6 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 sha512sums="
-1a3778c6c6e05691cdee6358ad76f7b4853a02c2db1be655701db88cc7d68c3ae2355af1a962db052e7622bf7ab30e6b8b03b3e39f26d6e19d035e2a9e17195f  linux-postmarketos-qcom-msm8953-v6.11.1-r0.tar.gz
-49a4f6b018076411909267ac9f2f18544861f2b37e97b3af7828ffd6cf7d89179e43e0eefb5400279577083c471aaa418f79d0869699177265dc76ce4417cf79  config-postmarketos-qcom-msm8953.aarch64
+d88be9e01b728f18f7b588e217683e282ec69fd37d05089a44aac860ee1d22513a08ad8626b254dc3866dbb57c20dfa21d9458962ba1855e245ce7241a7b5716  linux-postmarketos-qcom-msm8953-v6.11.6-r1.tar.gz
+2f48f7c05b986f30d4cb8f84bc586d7e1fba654d0f17c6b8d7f52b4257a2d2354d6162cae28bb4a027b445c82119908bcf2023c2409891d4368aa2fbf0f54595  config-postmarketos-qcom-msm8953.aarch64
 "

device/community/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.1 Kernel Configuration
+# Linux/arm64 6.11.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -3329,7 +3329,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -3368,7 +3367,6 @@ CONFIG_VIDEO_QCOM_VENUS=m
 #
 # Raspberry Pi media platform drivers
 #
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
 
 #
 # Renesas media platform drivers
@@ -3746,6 +3744,7 @@ CONFIG_DRM_PANEL_HUAWEI_MILAN_TIANMA_OTM1906C=m
 CONFIG_DRM_PANEL_LENOVO_CD_18781Y_FT8201=m
 CONFIG_DRM_PANEL_LENOVO_CD_18781Y_HX83100A=m
 CONFIG_DRM_PANEL_LENOVO_CD_18781Y_JD9365=m
+CONFIG_DRM_PANEL_LENOVO_KUNTAO_549=m
 CONFIG_DRM_PANEL_MDSS_FT8716_FHD=m
 CONFIG_DRM_PANEL_MDSS_ILI7807_FHD=m
 CONFIG_DRM_PANEL_MDSS_ILI7807_FHDPLUS=m
@@ -4210,7 +4209,7 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TDA7419 is not set
 CONFIG_SND_SOC_TFA9872=m
 # CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TFA989X is not set
+CONFIG_SND_SOC_TFA989X=m
 # CONFIG_SND_SOC_TLV320ADC3XXX is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
@@ -5852,7 +5851,7 @@ CONFIG_IIO_ST_LSM6DSX_SPI=m
 # CONFIG_BH1780 is not set
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
+CONFIG_CM3323=m
 # CONFIG_CM3605 is not set
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP002 is not set
@@ -6499,6 +6498,9 @@ CONFIG_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_KEY_NOTIFICATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set

device/community/soc-qcom-msm8953/APKBUILD

 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=10
-pkgrel=1
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -15,7 +15,7 @@ subpackages="
 	$pkgname-ucm
 "
 
-_ucm_commit="b6860eae577ddea6f55834850fb4ed403f208d2f"
+_ucm_commit="f6dfc9b072e74b0ab2afcf452bc106242049ef28"
 source="
 	$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8953-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
 	90-feedbackd-pm8xxx-vib.rules
@@ -68,7 +68,7 @@ gpu() {
 }
 
 sha512sums="
-a7e6ca9fa3409403af780dfd97d2c5f502c54bf5877123739a893050a77d62ceeeafd73674fd34fe69eb7e1fffdb790f6df75633e6afd49b1c74da5f9c480047  soc-qcom-msm8953-b6860eae577ddea6f55834850fb4ed403f208d2f.tar.gz
+8aadc874c8a334e46c7bf630874c3035070aa7b9052deba1a28ae059ab9d63dd99dfb82c1a58d09da5063ad250de813e3974e040ce938a53347e390ce2e450eb  soc-qcom-msm8953-f6dfc9b072e74b0ab2afcf452bc106242049ef28.tar.gz
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 d546c99ca8d406b4e2e3901a417e4e461314a38f2f01c48525e44ca524ad57af7bfc280f416bda90573b0bfb1cca27d45cb0a0ed44e999ef8d406a380d1fdbb2  adreno-a506-quirks.sh

device/testing/device-asus-zenfone3/APKBUILD

@@ -2,13 +2,14 @@
 pkgname=device-asus-zenfone3
 pkgdesc="Asus Zenfone 3"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	firmware-asus-zenfone3
+	firmware-qcom-adreno-a530
 	lk2nd-msm8953
 	mkbootimg
 	msm-firmware-loader

device/testing/device-motorola-ocean/APKBUILD

@@ -3,21 +3,23 @@
 pkgname=device-motorola-ocean
 pkgdesc="Motorola Moto G7 Power"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-motorola-ocean
+	firmware-qcom-adreno-a530
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
+	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8916
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -27,12 +29,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Wifi, GPU, modem, and audio firmware"
-	depends="firmware-motorola-ocean"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 6c2c4244319a5c24b888c5c30c28b42a7514c2ffcdddcdb2d87bccb37da1eed6722fa66ff865d4d31855b9d9fca4ab6012532fb65127928a74becb228625d0a1  deviceinfo
 f627d473ccfc01f39ed7b1345c2795af0cd358b4738d202e53fbae07c605d239f9139b034c5a29411bafe368b92a44c756e2bd029246b385d6397f519af8ff7c  modules-initfs

device/testing/device-qcom-msm8953/APKBUILD

@@ -4,13 +4,14 @@
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	firmware-qcom-adreno-a530
+	firmware-qcom-msm8953
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg

device/testing/firmware-asus-zenfone3/APKBUILD

 # Maintainer: Antony Kurniawan S. <postmarketos@smankusors.com>
 pkgname=firmware-asus-zenfone3
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Asus Zenfone 3 ZE520KL/ZE552KL"
 url="https://gitlab.com/Smankusors/firmware-asus-zenfone3"
@@ -11,17 +11,21 @@ _commit="f1439210719b2a1597f6390f34ae93cb1470ddf4"
 builddir="$srcdir/$pkgname-$_commit/"
 source="
 	$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
-	firmware.files
 "
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"
 
 package() {
-	while IFS="" read -r fw; do
-		install -Dm644 "$fw" "$pkgdir/$_fwdir/$fw"
-	done < "$srcdir"/firmware.files
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/qcom/msm8953/asus/ze520kl"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/qcom/msm8953/asus/ze520kl"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/qcom/msm8953/asus/ze552kl"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/qcom/msm8953/asus/ze552kl"
+	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir/postmarketos/wlan/prima/"
+
+	for i in adsp.* venus.* wcnss.*; do
+		install -Dm644 $i -t "$pkgdir/$_fwdir/postmarketos"
+	done
 }
 
 sha512sums="
 a9980ae2ab0868d7e8e2d054e72525c030fe75d66aec6eebd2e17619d5d24455de2a158ea7ed0eb0db2f7a2f4bc07701672de217f8c7274599cd92c00cb2d04e  firmware-asus-zenfone3-f1439210719b2a1597f6390f34ae93cb1470ddf4.tar.gz
-2b5ba92ec40e84294e0c1feae167274d49990545cf28a1a916440a4604d03f5a213187d753fe02f98918f7283707e353e309a7169c44d4f69464a87afb67d2b8  firmware.files
 "

device/testing/firmware-asus-zenfone3/firmware.files

-qcom/a530_pfp.fw
-qcom/a530_pm4.fw
-wlan/prima/WCNSS_qcom_wlan_nv.bin
-a506_zap.b02
-a506_zap.mdt
-adsp.b00
-adsp.b01
-adsp.b02
-adsp.b03
-adsp.b04
-adsp.b05
-adsp.b06
-adsp.b07
-adsp.b08
-adsp.b09
-adsp.b10
-adsp.b11
-adsp.b12
-adsp.b13
-adsp.b14
-adsp.mdt
-venus.b00
-venus.b01
-venus.b02
-venus.b03
-venus.b04
-venus.mdt
-wcnss.b00
-wcnss.b01
-wcnss.b02
-wcnss.b04
-wcnss.b06
-wcnss.b09
-wcnss.b10
-wcnss.b11
-wcnss.b12
-wcnss.mdt

device/testing/firmware-fairphone-fp3/APKBUILD

 pkgname=firmware-fairphone-fp3
 pkgver=20210805
 _commit="ee529820bb874ab1b52873f0b144c3786f01ee4c"
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Fairphone 3"
 url="https://github.com/FairBlobs/FP3-firmware"
 arch="aarch64"
@@ -16,7 +16,7 @@ subpackages="
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="https://github.com/FairBlobs/FP3-firmware/archive/$_commit/FP3-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP3-firmware-$_commit"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"
 
 package() {
 	mkdir -p "$pkgdir"
@@ -26,45 +26,45 @@ adreno() {
 	pkgdesc="Fairphone 3 firmware for GPU"
 
 	install -Dm644 "$builddir"/a506_zap.mdt -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/qcom/msm8953/fairphone/fp3"
 	install -Dm644 "$builddir"/a506_zap.b* -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/qcom/msm8953/fairphone/fp3"
 	install -Dm644 "$builddir"/a530_pm4.fw -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/qcom/msm8953/fairphone/fp3"
 	install -Dm644 "$builddir"/a530_pfp.fw -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/qcom/msm8953/fairphone/fp3"
 }
 
 adsp() {
 	pkgdesc="Fairphone 3 firmware for the ADSP"
 
 	install -Dm644 "$builddir"/adsp.* -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/postmarketos"
 }
 
 modem() {
 	pkgdesc="Fairphone 3 firmware for the modem"
 
 	install -Dm644 "$builddir"/mba.mbn -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/postmarketos"
 	install -Dm644 "$builddir"/modem.* -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/postmarketos"
 }
 
 venus() {
 	pkgdesc="Fairphone 3 firmware for venus"
 
 	install -Dm644 "$builddir"/venus.* -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/postmarketos"
 }
 
 wcnss() {
 	pkgdesc="Fairphone 3 firmware for the Qualcomm Wireless Connectivity Subsystem (WCNSS)"
 
 	install -Dm644 "$builddir"/wcnss.* -t \
-		"$subpkgdir/$_fwdir"
+		"$subpkgdir/$_fwdir/postmarketos"
 	install -Dm644 "$builddir"/wlan/prima/* -t \
-		"$subpkgdir/$_fwdir"/wlan/prima
+		"$subpkgdir/$_fwdir/postmarketos"/wlan/prima
 }
 
 sha512sums="

device/testing/firmware-huawei-milan/APKBUILD

 # Maintainer: bzy-080408 <Bzy080408@outlook.com>
 pkgname=firmware-huawei-milan
 pkgver=0
-pkgrel=0
+pkgrel=1
 _commit="f417e07a32310ee4002ca67a3d57f9ba0a960297"
 pkgdesc="Firmware files for Huawei Maimang5 / G9 (Plus) / Nova (Plus)"
 url="https://postmarketos.org"
@@ -10,7 +10,7 @@ license="proprietary"
 source="milan-fw-$_commit.tar.gz::https://github.com/bzy-080408/postmarketos-vendor-huawei-milan/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 builddir="$srcdir/postmarketos-vendor-huawei-milan-$_commit/"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware/qcom/msm8953/huawei/milan"
 
 package() {
 	# GPU firmwares