.gitlab/issue_templates/Default.md

@@ -22,7 +22,7 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v23.12`
-* [ ] `v23.06`
+* [ ] `v23.06` (supported until 2024-01-18)
 
 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
 

channels.cfg

@@ -9,13 +9,13 @@ branch_aports=master
 mirrordir_alpine=edge
 
 [v23.12]
-description=Upcoming stable release (DO NOT USE)
+description=Latest release / Recommended for best stability
 branch_pmaports=v23.12
 branch_aports=3.19-stable
 mirrordir_alpine=v3.19
 
 [v23.06]
-description=Latest release / Recommended for best stability
+description=Old release (supported until 2024-01-18)
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=16
+pkgrel=17
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-6287ccf7af6347f7b6fb5e49395a9a8bdfef584b4a2611d17d6132076902b057d787c098f563ab3640f770fca20864aff2a4762248ca405e58e032bad276fca5  busybox-static-1.36.1-r16-aarch64-edge.apk
+eaf06275f57ee27a34a2ca927ac65c13335666bce6d15a0b9f34556c0e452f4e763c16b95406b3f4eca39225545522634ef9dde4000b2d56a55bb7ecb98b353b  busybox-static-1.36.1-r17-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=16
+pkgrel=17
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-d216e65b0d08783eb1f6c8bb6eda441037a77530ac1069ff28b1a66846d219eed425b4390c56a3e2a7b9e080873533c3392782bb06b9e190ec004a3ae3ab7857  busybox-static-1.36.1-r16-armhf-edge.apk
+47f92a38e25876003607a2346e128ac49f3392565d0a663977f3795c405825b70c554943ccc52092c1532fac86129b9b9fee8415b8807b21fb32d71139d1e46d  busybox-static-1.36.1-r17-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=16
+pkgrel=17
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-f9280cf852098400859968249f51bfe16db47655c15f0e384891ba9574ad42d2cef753760e895dfa9d625f2e051e6982a16e459d792e573bde161b1bd563c020  busybox-static-1.36.1-r16-armv7-edge.apk
+3f98182174fefb003fe3c6b04ef905ff3694be4ab537a3c3e4ca39e8dc503b159ca92f030d086daaee990c43a6add2774f7e017bbf2360cf570f0bb7eebcffc5  busybox-static-1.36.1-r17-armv7-edge.apk
 "

device/.shared-patches/linux/linux5.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

+From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
+From: Nick Desaulniers <ndesaulniers@google.com>
+Date: Mon, 4 Nov 2019 19:31:45 +0100
+Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
+ directive
+
+It looks like a section directive was using "Solaris style" to declare
+the section flags. Replace this with the GNU style so that Clang's
+integrated assembler can assemble this directive.
+
+The modified instances were identified via:
+$ ag \.section | grep #
+
+Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
+Link: https://github.com/ClangBuiltLinux/linux/issues/744
+Link: https://bugs.llvm.org/show_bug.cgi?id=43759
+Link: https://reviews.llvm.org/D69296
+
+Acked-by: Nicolas Pitre <nico@fluxnic.net>
+Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
+Reviewed-by: Stefan Agner <stefan@agner.ch>
+Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
+Suggested-by: Fangrui Song <maskray@google.com>
+Suggested-by: Jian Cai <jiancai@google.com>
+Suggested-by: Peter Smith <peter.smith@linaro.org>
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+[ partial backport to 5.4 ]
+---
+ arch/arm/boot/bootp/init.S            | 2 +-
+ arch/arm/boot/compressed/big-endian.S | 2 +-
+ arch/arm/boot/compressed/head.S       | 2 +-
+ arch/arm/boot/compressed/piggy.lzma.S | 2 +-
+ arch/arm/mm/proc-v7.S                 | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
+index 78b508075161..868eeeaaa46e 100644
+--- a/arch/arm/boot/bootp/init.S
++++ b/arch/arm/boot/bootp/init.S
+@@ -16,7 +16,7 @@
+  *  size immediately following the kernel, we could build this into
+  *  a binary blob, and concatenate the zImage using the cat command.
+  */
+-		.section .start,#alloc,#execinstr
++		.section .start, "ax"
+ 		.type	_start, #function
+ 		.globl	_start
+ 
+diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
+index 25ab26f1c6f0..f22428e275f8 100644
+--- a/arch/arm/boot/compressed/big-endian.S
++++ b/arch/arm/boot/compressed/big-endian.S
+@@ -5,7 +5,7 @@
+  *  Author: Nicolas Pitre
+  */
+ 
+-	.section ".start", #alloc, #execinstr
++	.section ".start", "ax"
+ 
+ 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
+ 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
+diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
+index 77a716bdf4d3..b70606652d21 100644
+--- a/arch/arm/boot/compressed/head.S
++++ b/arch/arm/boot/compressed/head.S
+@@ -113,7 +113,7 @@
+ #endif
+ 		.endm
+ 
+-		.section ".start", #alloc, #execinstr
++		.section ".start", "ax"
+ /*
+  * sort out different calling conventions
+  */
+diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S
+index 0284f84dcf3804..27577644ee721a 100644
+--- a/arch/arm/boot/compressed/piggy.S
++++ b/arch/arm/boot/compressed/piggy.S
+@@ -1,5 +1,5 @@
+ /* SPDX-License-Identifier: GPL-2.0 */
+-	.section .piggydata,#alloc
++	.section .piggydata, "a"
+ 	.globl	input_data
+ input_data:
+ 	.incbin	"arch/arm/boot/compressed/piggy_data"
+diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
+index c4e8006a1a8cdd..48e0ef6f0dccfe 100644
+--- a/arch/arm/mm/proc-v7.S
++++ b/arch/arm/mm/proc-v7.S
+@@ -644,7 +644,7 @@ __v7_setup_stack:
+ 	string	cpu_elf_name, "v7"
+ 	.align
+ 
+-	.section ".proc.info.init", #alloc
++	.section ".proc.info.init", "a"
+ 
+ 	/*
+ 	 * Standard v7 proc info content
+-- 
+2.30.2
+

device/community/device-xiaomi-markw/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,7 @@ depends="
 	soc-qcom-msm8953
 "
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo modules-initfs modprobe.d_touchscreens-workaround.conf"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -24,6 +24,7 @@ build() {
 }
 
 package() {
+	install -D -m644 "$srcdir"/modprobe.d_touchscreens-workaround.conf "$pkgdir"/etc/modprobe.d/touchscreens-workaround.conf
 	devicepkg_package $startdir $pkgname
 }
 
@@ -40,5 +41,6 @@ nonfree_firmware() {
 
 sha512sums="
 0d393f07e551058781a67c096b1ad7f252c78e801a2da8752f893f4ea7c24f7aa65bc69f9c80c7be53e615269a7028eb151e7bc3fe79f0c260a4d28e97f10e7d  deviceinfo
-0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
+00f2a07de0aaedd3f3fee4aed6e1f591539cb56aa109c49d5b0a5de11c7f8c5d0a3cef8111b855d064bfe38901f3bbcddd9cf2c65ae811578d43319137f586ac  modules-initfs
+b6d005ac8be56b6eca402869fcf33f671f02000fb927af36ae9a860817c92a17329323408e94f4593d63e9f6a95881e270bc9dcd930ad4cf8312e1ac85ab4a20  modprobe.d_touchscreens-workaround.conf
 "

device/community/device-xiaomi-markw/modprobe.d_touchscreens-workaround.conf

+softdep atmel_mxt_ts pre: edt_ft5x06

device/community/device-xiaomi-markw/modules-initfs

-atmel_mxt_ts
-edt_ft5x06
 msm
 panel_mdss_nt35596_ebbg
 panel_mdss_r63350

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

@@ -2,9 +2,9 @@
 
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.4.2
-pkgrel=1
-pkgdesc="Mainline Kernel fork for SM6350 devices"
+pkgver=6.6.7
+pkgrel=0
+pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
 url="https://github.com/z3ntu/linux"
@@ -17,14 +17,14 @@ makedepends="bash bison findutils flex installkernel openssl-dev perl"
 
 _repo="linux"
 _config="config-$_flavor.$arch"
-_commit="f33e98821f41bc160a6985355c4a2d1dc5223afa"
+_tag="v$pkgver-sm6350"
 
 # Source
 source="
-	$_repo-$_commit.tar.gz::https://github.com/z3ntu/$_repo/archive/$_commit/$_repo-$_commit.tar.gz
+	https://github.com/z3ntu/$_repo/archive/$_tag/$_repo-$_tag.tar.gz
 	$_config
 "
-builddir="$srcdir/$_repo-$_commit"
+builddir="$srcdir/$_repo-$pkgver-sm6350"
 
 prepare() {
 	default_prepare
@@ -54,6 +54,6 @@ package() {
 }
 
 sha512sums="
-310907bca81377fd4753cf9365ffa5e7eeef13fb0d14c99487f14a8284a717fcf70aa360c7612aa6970498f7241f4606d1ebcef0b3f2477d147b51af983a92ac  linux-f33e98821f41bc160a6985355c4a2d1dc5223afa.tar.gz
-5999fbbc61d789b639a530105298b31308b31886143317bb033634b58f10151676518949f18318d63bbf188f52958be5df4fa7dbd1ab204431a50464870897f6  config-postmarketos-qcom-sm6350.aarch64
+8578c42bf70700808f8d95cbe294cee5df391cf149f33f87f09aaae649ff128d48d3501dd958345c6205cb91836b2b969118197ac4ca35bd9d55b78522e53d5f  linux-v6.6.7-sm6350.tar.gz
+cbea50bf65de74e12a507b6402f598329412ca7c15257307a7c5a4acd65a22e088a49ba792317f942dadc1a5ed1cf9bd6b6ce7a04c63a2a900d7a92584a2f367  config-postmarketos-qcom-sm6350.aarch64
 "

device/main/device-purism-librem5/APKBUILD

@@ -4,7 +4,7 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=device-purism-librem5
 pkgver=1.51
-pkgrel=0
+pkgrel=1
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -17,6 +17,7 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	bluez
+	bm818-tools
 	gnss-share
 	i2c-tools
 	iw

device/testing/device-huawei-berlin/APKBUILD

+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: markochk <markochk@proton.me>
+pkgname=device-huawei-berlin
+pkgdesc="Huawei Honor 6X"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-huawei-berlin
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-huawei-berlin hisi-wlan"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+21fc9dbd9c7da1549e9204e0512a3fa5b55348f671d40a7d4d1e22577605c48e1867bf0a96d637cbe2bb48b6b1dfcd9c113c8a3fde727fb7483e5e242d1d81b6  deviceinfo
+"

device/testing/device-huawei-berlin/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Huawei Honor 6X"
+deviceinfo_manufacturer="Huawei"
+deviceinfo_codename="huawei-berlin"
+deviceinfo_year="2016"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="loglevel=4 coherent_pool=512K page_tracker=on slub_min_objects=12 unmovable_isolate1=2:192M,3:224M,4:256M printktimer=0xfff0a000,0x534,0x538 androidboot.selinux=enforcing buildvariant=user"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_header_version="0"
+deviceinfo_flash_offset_base="0x00478000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x07b88000"
+deviceinfo_flash_offset_second="0x00e88000"
+deviceinfo_flash_offset_tags="0x07988000"

device/testing/device-linksys-jamaica/APKBUILD

+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-linksys-jamaica
+pkgdesc="Linksys EA9350 V3"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	dtc
+	linux-linksys-jamaica
+	postmarketos-base
+	u-boot-tools
+"
+makedepends="devicepkg-dev"
+source="
+	boot-image.its
+	initfs-hook.sh
+	deviceinfo
+"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	mkdir -p "$pkgdir/usr/share/u-boot/jamaica"
+	install -D -m644 "$srcdir/boot-image.its" \
+		"$pkgdir/usr/share/u-boot/jamaica"
+}
+
+nonfree_firmware() {
+	pkgdesc="Linksys EA9350 firmware"
+	depends="firmware-linksys-jamaica"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+c5c0f00a3da2e75b3670444e47ff6893597e7afb3ebc24abf90debc608e72d6cd1071c9435ffc7d64e44ec574c35862286662d882150ddaa33c6ea65181385ad  boot-image.its
+a172a3d613fd55b95f54b891f58a3f4f6289873a861f3c21186bcc5d85166a124960e578f475f419188c5ae7b084a16a7b8a1176e1f150c5ba65f1f554d29227  deviceinfo
+401f734389592e11fc9e6bb215f8fd708d27028a68bb770ddd5697a65df38552dd57c94a1edd95e0954e5458a80291895f1aa47dd21fe3e558dfb16aa49d21f8  initfs-hook.sh
+"

device/testing/device-linksys-jamaica/boot-image.its

+/dts-v1/;
+
+/ {
+        description = "a";
+        #address-cells = <1>;
+
+        images {
+                kernel {
+                        description = "Kernel";
+                        data = /incbin/("vmlinuz");
+                        type = "kernel";
+                        arch = "arm";
+                        os = "linux";
+                        compression = "none";
+                        load = <0x41208000>;
+                        entry = <0x41208000>;
+                };
+                fdt {
+                        description = "DTB";
+                        data = /incbin/("/boot/dtbs/ipq5018-linksys-jamaica.dtb");
+                        type = "flat_dt";
+                        arch = "arm";
+                        compression = "none";
+                };
+		initrd {
+			description = "Initramfs image";
+			data = /incbin/("initramfs");
+			type = "ramdisk";
+			arch = "arm";
+			os = "linux";
+		};
+
+        };
+
+        configurations {
+                default = "standard";
+                standard {
+                        description = "Standard Boot";
+                        kernel = "kernel";
+                        fdt = "fdt";
+			ramdisk = "initrd";
+                };
+        };
+
+};    

device/testing/device-linksys-jamaica/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Linksys EA9350 V3"
+deviceinfo_manufacturer="Linksys"
+deviceinfo_codename="linksys-jamaica"
+deviceinfo_year="2019"
+deviceinfo_arch="armv7"
+deviceinfo_dtb="ipq5018-linksys-jamaica"
+deviceinfo_uboot_boardname="jamaica"
+
+# Device related
+deviceinfo_chassis="embedded"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_gpu_accelerated="false"
+
+# Bootloader related
+deviceinfo_kernel_cmdline="bootopt=64S3,32N2,32N2"
+deviceinfo_generate_uboot_fit_images="true"
+deviceinfo_boot_filesystem="fat32"

device/testing/device-linksys-jamaica/initfs-hook.sh

+#!/bin/sh
+
+# Enable USB Power
+echo 482 > /sys/class/gpio/export
+echo "out" >/sys/class/gpio/gpio482/direction
+echo 0 >  /sys/class/gpio/gpio482/value
+# Wait 5 seconds to let the kernel detect the usb stick
+sleep 5

device/testing/firmware-fairphone-fp5/APKBUILD

 pkgname=firmware-fairphone-fp5
-pkgver=20230822
-pkgrel=1
+pkgver=20231122
+pkgrel=0
 pkgdesc="Firmware for Fairphone 5"
 subpackages="
 	$pkgname-adreno
@@ -15,11 +15,18 @@ subpackages="
 url="https://github.com/FairBlobs/FP5-firmware"
 arch="aarch64"
 license="proprietary"
+makedepends="pil-squasher"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="35845c6719f6394da1499a0ed3b5f20f372bdaec"
+_commit="3f529aecb4a9c61299c5f93d1137c6870daf93d3"
 source="https://github.com/FairBlobs/FP5-firmware/archive/$_commit/FP5-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP5-firmware-$_commit"
 
+build() {
+	for i in *.mdt; do
+		pil-squasher "$(basename "$i" .mdt)".mbn "$i"
+	done
+}
+
 package() {
 	# parent package is empty
 	mkdir -p "$pkgdir"
@@ -28,14 +35,18 @@ package() {
 adreno() {
 	pkgdesc="Fairphone 5 adreno firmware"
 
-	install -Dm644 "$builddir"/a660_zap.* -t \
+	install -Dm644 "$builddir"/a660_zap.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
+	ln -s a660_zap.mbn "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/a660_zap.mdt"
 }
 
 adsp() {
 	pkgdesc="Fairphone 5 adsp firmware"
 
-	install -Dm644 "$builddir"/adsp* -t \
+	install -Dm644 "$builddir"/adsp.mbn -t \
+		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
+	ln -s adsp.mbn "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/adsp.mdt"
+	install -Dm644 "$builddir"/adsp*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
 	install -Dm644 "$builddir"/battmgr.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
@@ -53,7 +64,10 @@ bluetooth() {
 cdsp() {
 	pkgdesc="Fairphone 5 cdsp firmware"
 
-	install -Dm644 "$builddir"/cdsp* -t \
+	install -Dm644 "$builddir"/cdsp.mbn -t \
+		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
+	ln -s cdsp.mbn "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/cdsp.mdt"
+	install -Dm644 "$builddir"/cdsp*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
 }
 
@@ -61,18 +75,21 @@ ipa() {
 	pkgdesc="Fairphone 5 ipa firmware"
 
 	cd "$builddir"
-	for i in yupik_ipa_fws.*; do
-		install -Dm644 $i \
-			"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/${i/yupik_/}"
-	done
+	install -Dm644 "$builddir"/yupik_ipa_fws.mbn \
+		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/ipa_fws.mbn"
+	ln -s ipa_fws.mbn "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/ipa_fws.mdt"
 }
 
 modem() {
 	pkgdesc="Fairphone 5 modem firmware"
 
-	# cp because of the modem_pr directory
-	mkdir -p "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
-	cp -r "$builddir"/modem* \
+	install -Dm644 "$builddir"/modem.mbn -t \
+		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
+	ln -s modem.mbn "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/modem.mdt"
+	install -Dm644 "$builddir"/modem*.jsn -t \
+		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
+
+	cp -r "$builddir"/modem_pr/ \
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
 	find "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/" \
 		-type f -exec chmod 0644 {} \;
@@ -88,10 +105,11 @@ venus() {
 wpss() {
 	pkgdesc="Fairphone 5 wpss firmware"
 
-	install -Dm644 "$builddir"/wpss* -t \
+	install -Dm644 "$builddir"/wpss.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
+	ln -s wpss.mbn "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/wpss.mdt"
 }
 
 sha512sums="
-562d245bee3a946e951ede7c30d0f6aecd8faa19a5a45dabf44904032ad3bb234bd96b68ef2553832b821aaf99d6ed4db72bb4d01daa75bba4cfc75c9722b046  FP5-firmware-35845c6719f6394da1499a0ed3b5f20f372bdaec.tar.gz
+a1f52a30858b85784298fc0da239ab764a53123670ee3c2fdda3ee760d9ad34a1122d6c4601ae6fa38aa93918ed9e53b4e46eaf8eb2c5f86590be836a199ee32  FP5-firmware-3f529aecb4a9c61299c5f93d1137c6870daf93d3.tar.gz
 "

device/testing/firmware-huawei-berlin/APKBUILD

+pkgname=firmware-huawei-berlin
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Huawei Honor 6X"
+url="https://gitlab.com/ignapk/warsaw-firmware"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"
+
+# Source
+_commit="ce27f92d3d2af58150cefe0877cf6940b865dc28"
+_repository="warsaw-firmware"
+_url="https://gitlab.com/ignapk"
+source="$_repository-$_commit.tar.gz::$_url/$_repository/-/archive/$_commit.tar.gz"
+
+package() {
+	# Wifi
+	install -Dm644 "$srcdir/$_repository-$_commit/CPU_RAM_SCHED.bin" \
+		"$pkgdir/lib/firmware/postmarketos/CPU_RAM_SCHED.bin"
+	install -Dm644 "$srcdir/$_repository-$_commit/CPU_RAM_WBS.bin" \
+		"$pkgdir/lib/firmware/postmarketos/CPU_RAM_WBS.bin"
+	install -Dm644 "$srcdir/$_repository-$_commit/bfgx_and_wifi_cfg" \
+		"$pkgdir/lib/firmware/postmarketos/bfgx_and_wifi_cfg"
+	install -Dm644 "$srcdir/$_repository-$_commit/bfgx_cfg" \
+		"$pkgdir/lib/firmware/postmarketos/bfgx_cfg"
+	install -Dm644 "$srcdir/$_repository-$_commit/cr4_asic.bin" \
+		"$pkgdir/lib/firmware/postmarketos/cr4_asic.bin"
+	install -Dm644 "$srcdir/$_repository-$_commit/wifi_cfg" \
+		"$pkgdir/lib/firmware/postmarketos/wifi_cfg"
+}
+
+sha512sums="
+f30151200f1c554445e1dc451cd8c7bfb5a9dbb1c048eb468da714b72d00caea273333ebd749a58e78ad526715782b02691a896c6d9de076bd106bcf41ffaf4a  warsaw-firmware-ce27f92d3d2af58150cefe0877cf6940b865dc28.tar.gz
+"